X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FFreenetModuleTest.kt;h=c6aed88894286113089f51e2a218b1ec6e81c404;hp=d3a2a3c2f36ddee886a9f4c51ca23987b1811899;hb=HEAD;hpb=8788d5ab31bba7dd145c25b979f99a8bc640c37e

diff --git a/src/test/kotlin/net/pterodactylus/sone/main/FreenetModuleTest.kt b/src/test/kotlin/net/pterodactylus/sone/main/FreenetModuleTest.kt
index d3a2a3c..c6aed88 100644
--- 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 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)
@@ -53,7 +47,7 @@ class FreenetModuleTest {
 
 	@Test
 	fun `node is returned as singleton`() {
-		verifySingletonInstance<Node>()
+		injector.verifySingletonInstance<Node>()
 	}
 
 	@Test
@@ -63,7 +57,7 @@ class FreenetModuleTest {
 
 	@Test
 	fun `high level simply client is returned as singleton`() {
-		verifySingletonInstance<HighLevelSimpleClient>()
+		injector.verifySingletonInstance<HighLevelSimpleClient>()
 	}
 
 	@Test
@@ -73,7 +67,7 @@ class FreenetModuleTest {
 
 	@Test
 	fun `session manager is returned as singleton`() {
-		verifySingletonInstance<SessionManager>()
+		injector.verifySingletonInstance<SessionManager>()
 		verify(pluginRespirator).getSessionManager("Sone")
 	}
 
@@ -84,7 +78,7 @@ class FreenetModuleTest {
 
 	@Test
 	fun `toadlet container is returned as singleten`() {
-		verifySingletonInstance<ToadletContainer>()
+		injector.verifySingletonInstance<ToadletContainer>()
 	}
 
 	@Test
@@ -93,8 +87,8 @@ class FreenetModuleTest {
 	}
 
 	@Test
-	fun `page maker is returned as singleten`() {
-		verifySingletonInstance<PageMaker>()
+	fun `page maker is returned as singleton`() {
+		injector.verifySingletonInstance<PageMaker>()
 	}
 
 	@Test
@@ -106,7 +100,7 @@ class FreenetModuleTest {
 
 	@Test
 	fun `plugin respirator facade is returned as singleton`() {
-		verifySingletonInstance<PluginRespiratorFacade>()
+		injector.verifySingletonInstance<PluginRespiratorFacade>()
 	}
 
 	@Test
@@ -116,7 +110,7 @@ class FreenetModuleTest {
 
 	@Test
 	fun `plugin connector facade is returned as singleton`() {
-		verifySingletonInstance<PluginConnector>()
+		injector.verifySingletonInstance<PluginConnector>()
 	}
 
 }