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
/
main
/
FreenetModuleTest.kt
diff --git
a/src/test/kotlin/net/pterodactylus/sone/main/FreenetModuleTest.kt
b/src/test/kotlin/net/pterodactylus/sone/main/FreenetModuleTest.kt
index
e94e34e
..
c6aed88
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/main/FreenetModuleTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/main/FreenetModuleTest.kt
@@
-34,12
+34,6
@@
class FreenetModuleTest {
private val module = FreenetModule(pluginRespirator)
private val injector = Guice.createInjector(module)
private val module = FreenetModule(pluginRespirator)
private val injector = Guice.createInjector(module)
- private inline fun <reified T : Any> verifySingletonInstance() {
- val firstInstance = injector.getInstance<T>()
- val secondInstance = injector.getInstance<T>()
- assertThat(firstInstance, sameInstance(secondInstance))
- }
-
@Test
fun `plugin respirator is not bound`() {
expectedException.expect(Exception::class.java)
@Test
fun `plugin respirator is not bound`() {
expectedException.expect(Exception::class.java)
@@
-53,7
+47,7
@@
class FreenetModuleTest {
@Test
fun `node is returned as singleton`() {
@Test
fun `node is returned as singleton`() {
- verifySingletonInstance<Node>()
+
injector.
verifySingletonInstance<Node>()
}
@Test
}
@Test
@@
-63,7
+57,7
@@
class FreenetModuleTest {
@Test
fun `high level simply client is returned as singleton`() {
@Test
fun `high level simply client is returned as singleton`() {
- verifySingletonInstance<HighLevelSimpleClient>()
+
injector.
verifySingletonInstance<HighLevelSimpleClient>()
}
@Test
}
@Test
@@
-73,7
+67,7
@@
class FreenetModuleTest {
@Test
fun `session manager is returned as singleton`() {
@Test
fun `session manager is returned as singleton`() {
- verifySingletonInstance<SessionManager>()
+
injector.
verifySingletonInstance<SessionManager>()
verify(pluginRespirator).getSessionManager("Sone")
}
verify(pluginRespirator).getSessionManager("Sone")
}
@@
-84,7
+78,7
@@
class FreenetModuleTest {
@Test
fun `toadlet container is returned as singleten`() {
@Test
fun `toadlet container is returned as singleten`() {
- verifySingletonInstance<ToadletContainer>()
+
injector.
verifySingletonInstance<ToadletContainer>()
}
@Test
}
@Test
@@
-94,7
+88,7
@@
class FreenetModuleTest {
@Test
fun `page maker is returned as singleton`() {
@Test
fun `page maker is returned as singleton`() {
- verifySingletonInstance<PageMaker>()
+
injector.
verifySingletonInstance<PageMaker>()
}
@Test
}
@Test
@@
-106,7
+100,7
@@
class FreenetModuleTest {
@Test
fun `plugin respirator facade is returned as singleton`() {
@Test
fun `plugin respirator facade is returned as singleton`() {
- verifySingletonInstance<PluginRespiratorFacade>()
+
injector.
verifySingletonInstance<PluginRespiratorFacade>()
}
@Test
}
@Test
@@
-116,7
+110,7
@@
class FreenetModuleTest {
@Test
fun `plugin connector facade is returned as singleton`() {
@Test
fun `plugin connector facade is returned as singleton`() {
- verifySingletonInstance<PluginConnector>()
+
injector.
verifySingletonInstance<PluginConnector>()
}
}
}
}