X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FFreenetModuleTest.kt;fp=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FFreenetModuleTest.kt;h=2f55d52805609ce9554547282e316780fe36b0c8;hp=d0dc7c4ac714fae5c08b13381535a2b25830f197;hb=03cec6a6772c2d836d94864adddaf544cbe9d72f;hpb=6f1f26e3998cfef155b0cf59152827accea70d30

diff --git a/src/test/kotlin/net/pterodactylus/sone/main/FreenetModuleTest.kt b/src/test/kotlin/net/pterodactylus/sone/main/FreenetModuleTest.kt
index d0dc7c4..2f55d52 100644
--- a/src/test/kotlin/net/pterodactylus/sone/main/FreenetModuleTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/main/FreenetModuleTest.kt
@@ -1,18 +1,15 @@
 package net.pterodactylus.sone.main
 
-import com.google.inject.Guice
-import freenet.client.HighLevelSimpleClient
-import freenet.clients.http.SessionManager
-import freenet.node.Node
-import freenet.pluginmanager.PluginRespirator
-import net.pterodactylus.sone.test.deepMock
-import net.pterodactylus.sone.test.getInstance
-import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.test.whenever
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.sameInstance
-import org.junit.Test
-import org.mockito.Mockito.verify
+import com.google.inject.*
+import freenet.client.*
+import freenet.clients.http.*
+import freenet.node.*
+import freenet.pluginmanager.*
+import net.pterodactylus.sone.test.*
+import org.hamcrest.MatcherAssert.*
+import org.hamcrest.Matchers.*
+import org.junit.*
+import org.mockito.Mockito.*
 
 /**
  * Unit test for [FreenetModule].
@@ -25,10 +22,12 @@ class FreenetModuleTest {
 	}
 	private val node = pluginRespirator.node!!
 	private val highLevelSimpleClient = pluginRespirator.hlSimpleClient!!
+	private val toadletContainer: ToadletContainer = pluginRespirator.toadletContainer
+	private val pageMaker: PageMaker = pluginRespirator.pageMaker
 	private val module = FreenetModule(pluginRespirator)
 	private val injector = Guice.createInjector(module)
 
-	private inline fun <reified T: Any> verifySingletonInstance() {
+	private inline fun <reified T : Any> verifySingletonInstance() {
 		val firstInstance = injector.getInstance<T>()
 		val secondInstance = injector.getInstance<T>()
 		assertThat(firstInstance, sameInstance(secondInstance))
@@ -36,7 +35,7 @@ class FreenetModuleTest {
 
 	@Test
 	fun `plugin respirator is returned correctly`() {
-		assertThat(injector.getInstance<PluginRespirator>(), sameInstance(pluginRespirator))
+		assertThat(injector.getInstance(), sameInstance(pluginRespirator))
 	}
 
 	@Test
@@ -46,7 +45,7 @@ class FreenetModuleTest {
 
 	@Test
 	fun `node is returned correctly`() {
-		assertThat(injector.getInstance<Node>(), sameInstance(node))
+		assertThat(injector.getInstance(), sameInstance(node))
 	}
 
 	@Test
@@ -56,7 +55,7 @@ class FreenetModuleTest {
 
 	@Test
 	fun `high level simply client is returned correctly`() {
-		assertThat(injector.getInstance<HighLevelSimpleClient>(), sameInstance(highLevelSimpleClient))
+		assertThat(injector.getInstance(), sameInstance(highLevelSimpleClient))
 	}
 
 	@Test
@@ -66,7 +65,7 @@ class FreenetModuleTest {
 
 	@Test
 	fun `session manager is returned correctly`() {
-		assertThat(injector.getInstance<SessionManager>(), sameInstance(sessionManager))
+		assertThat(injector.getInstance(), sameInstance(sessionManager))
 	}
 
 	@Test
@@ -75,4 +74,24 @@ class FreenetModuleTest {
 		verify(pluginRespirator).getSessionManager("Sone")
 	}
 
+	@Test
+	fun `toadlet container is returned correctly`() {
+		assertThat(injector.getInstance(), sameInstance(toadletContainer))
+	}
+
+	@Test
+	fun `toadlet container is returned as singleten`() {
+		verifySingletonInstance<ToadletContainer>()
+	}
+
+	@Test
+	fun `page maker is returned correctly`() {
+		assertThat(injector.getInstance(), sameInstance(pageMaker))
+	}
+
+	@Test
+	fun `page maker is returned as singleten`() {
+		verifySingletonInstance<PageMaker>()
+	}
+
 }