X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FAboutPageTest.kt;h=0e8e6b3540607537e59fcdddc85aa3402ae82c6d;hp=a0a9014a780920c359a82964cec702cd396f4beb;hb=05cb6903f37f8166eab0ca2244b2cac7f06a6a52;hpb=b8c5dfe4e47780586c8dd77619a09ffe43d33011 diff --git a/src/test/kotlin/net/pterodactylus/sone/web/AboutPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/AboutPageTest.kt index a0a9014..0e8e6b3 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/AboutPageTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/AboutPageTest.kt @@ -1,12 +1,10 @@ package net.pterodactylus.sone.web -import com.google.inject.Guice import net.pterodactylus.sone.main.SonePlugin.PluginHomepage import net.pterodactylus.sone.main.SonePlugin.PluginVersion import net.pterodactylus.sone.main.SonePlugin.PluginYear import net.pterodactylus.sone.test.getInstance import net.pterodactylus.sone.test.isProvidedByMock -import net.pterodactylus.util.template.Template import org.hamcrest.MatcherAssert.assertThat import org.hamcrest.Matchers.equalTo import org.hamcrest.Matchers.notNullValue @@ -22,9 +20,7 @@ class AboutPageTest : WebPageTest() { private val year = 1234 private val homepage = "home://page" private val page = AboutPage(template, webInterface, PluginVersion(version), PluginYear(year), PluginHomepage(homepage)) - private val injector = Guice.createInjector( - Template::class.isProvidedByMock(), - WebInterface::class.isProvidedByMock(), + private val childInjector = injector.createChildInjector( PluginVersion::class.isProvidedByMock(), PluginYear::class.isProvidedByMock(), PluginHomepage::class.isProvidedByMock() @@ -60,13 +56,13 @@ class AboutPageTest : WebPageTest() { @Test fun `page can be created by guice`() { - assertThat(injector.getInstance(), notNullValue()) + assertThat(childInjector.getInstance(), notNullValue()) } @Test fun `page is created as singleton`() { - val firstInstance = injector.getInstance() - val secondInstance = injector.getInstance() + val firstInstance = childInjector.getInstance() + val secondInstance = childInjector.getInstance() assertThat(firstInstance, sameInstance(secondInstance)) }