projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
🚚 Move verification method to Guice helpers
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
WebInterfaceModuleTest.kt
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
index
2bb31c9
..
53dc19d
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/WebInterfaceModuleTest.kt
@@
-3,7
+3,6
@@
package net.pterodactylus.sone.web
import com.google.inject.Guice.*
import freenet.client.*
import freenet.clients.http.*
import com.google.inject.Guice.*
import freenet.client.*
import freenet.clients.http.*
-import freenet.l10n.*
import freenet.support.api.*
import net.pterodactylus.sone.core.*
import net.pterodactylus.sone.data.*
import freenet.support.api.*
import net.pterodactylus.sone.core.*
import net.pterodactylus.sone.data.*
@@
-21,9
+20,8
@@
import net.pterodactylus.util.template.*
import net.pterodactylus.util.web.*
import org.hamcrest.MatcherAssert.*
import org.hamcrest.Matchers.*
import net.pterodactylus.util.web.*
import org.hamcrest.MatcherAssert.*
import org.hamcrest.Matchers.*
-import org.junit.*
import java.util.*
import java.util.*
-import kotlin.test.
Test
+import kotlin.test.
*
class WebInterfaceModuleTest {
class WebInterfaceModuleTest {
@@
-258,9
+256,7
@@
class WebInterfaceModuleTest {
@Test
fun `template context factory is created as singleton`() {
@Test
fun `template context factory is created as singleton`() {
- val factory1 = injector.getInstance<TemplateContextFactory>()
- val factory2 = injector.getInstance<TemplateContextFactory>()
- assertThat(factory1, sameInstance(factory2))
+ injector.verifySingletonInstance<TemplateContextFactory>()
}
@Test
}
@Test
@@
-287,9
+283,7
@@
class WebInterfaceModuleTest {
@Test
fun `notification manager is created as singleton`() {
@Test
fun `notification manager is created as singleton`() {
- val firstNotificationManager = injector.getInstance<NotificationManager>()
- val secondNotificationManager = injector.getInstance<NotificationManager>()
- assertThat(firstNotificationManager, sameInstance(secondNotificationManager))
+ injector.verifySingletonInstance<NotificationManager>()
}
@Test
}
@Test
@@
-299,9
+293,7
@@
class WebInterfaceModuleTest {
@Test
fun `notification handler is created as singleton`() {
@Test
fun `notification handler is created as singleton`() {
- val firstNotificationHandler = injector.getInstance<NotificationHandler>()
- val secondNotificationHandler = injector.getInstance<NotificationHandler>()
- assertThat(firstNotificationHandler, sameInstance(secondNotificationHandler))
+ injector.verifySingletonInstance<NotificationHandler>()
}
}
}
}