Create injector in test base class

diff --git a/src/test/java/net/pterodactylus/sone/web/WebPageTest.java b/src/test/java/net/pterodactylus/sone/web/WebPageTest.java
index bd6ff9d..a1af8cc 100644 (file)
--- a/src/test/java/net/pterodactylus/sone/web/WebPageTest.java
+++ b/src/test/java/net/pterodactylus/sone/web/WebPageTest.java
@@ -1,5 +1,6 @@
 package net.pterodactylus.sone.web;
 
+import static net.pterodactylus.sone.test.GuiceKt.supply;
 import static net.pterodactylus.sone.web.WebTestUtils.redirectsTo;
 import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -60,6 +61,8 @@ import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.eventbus.EventBus;
 import com.google.common.io.ByteStreams;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.rules.ExpectedException;
@@ -103,6 +106,11 @@ public abstract class WebPageTest {
        protected final List<Sone> localSones = new ArrayList<>();
        private final ListMultimap<String, PostReply> postReplies = ArrayListMultimap.create();
 
+       protected final Injector injector = Guice.createInjector(
+                       supply(WebInterface.class).byInstance(webInterface),
+                       supply(Template.class).byInstance(template)
+       );
+
        protected WebPageTest() {
                try {
                        responseInputStream = new PipedInputStream(responseOutputStream);

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 (file)
--- 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<AboutPage>(), notNullValue())
+               assertThat(childInjector.getInstance<AboutPage>(), notNullValue())
        }
 
        @Test
        fun `page is created as singleton`() {
-           val firstInstance = injector.getInstance<AboutPage>()
-               val secondInstance = injector.getInstance<AboutPage>()
+           val firstInstance = childInjector.getInstance<AboutPage>()
+               val secondInstance = childInjector.getInstance<AboutPage>()
                assertThat(firstInstance, sameInstance(secondInstance))
        }