X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FWebPageTest.kt;h=20e6cb6e00c3c112e0ca07005bce48d351e955eb;hp=5c842df4e41472253ae53ef102ea434753db3917;hb=110a933c2724aba6a604fc5eed6372ff1e1e6144;hpb=125dab18d4412f547334f4fa2b27e5f7676eec5c

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest.kt
index 5c842df..20e6cb6 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest.kt
@@ -13,6 +13,7 @@ import net.pterodactylus.sone.data.PostReply
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.data.TemporaryImage
 import net.pterodactylus.sone.freenet.wot.OwnIdentity
+import net.pterodactylus.sone.main.*
 import net.pterodactylus.sone.test.deepMock
 import net.pterodactylus.sone.test.get
 import net.pterodactylus.sone.test.mock
@@ -23,7 +24,6 @@ import net.pterodactylus.sone.web.WebInterface
 import net.pterodactylus.sone.web.page.*
 import net.pterodactylus.sone.web.page.FreenetTemplatePage.RedirectException
 import net.pterodactylus.util.notify.Notification
-import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
 import net.pterodactylus.util.web.Method
 import net.pterodactylus.util.web.Method.GET
@@ -42,10 +42,11 @@ import kotlin.text.Charsets.UTF_8
 /**
  * Base class for web page tests.
  */
-open class WebPageTest(pageSupplier: (Template, WebInterface) -> SoneTemplatePage = { _, _ -> mock() }) {
+open class WebPageTest(pageSupplier: (WebInterface, Loaders, TemplateRenderer) -> SoneTemplatePage = { _, _, _ -> mock() }) {
 
 	val currentSone = mock<Sone>()
-	val template = mock<Template>()
+	val loaders = mock<Loaders>()
+	val templateRenderer = mock<TemplateRenderer>()
 	val webInterface = deepMock<WebInterface>()
 	val core = webInterface.core
 	val eventBus = mock<EventBus>()
@@ -53,8 +54,7 @@ open class WebPageTest(pageSupplier: (Template, WebInterface) -> SoneTemplatePag
 	val l10n = webInterface.l10n!!
 	val sessionManager = mock<SessionManager>()
 
-	val page by lazy { pageSupplier(template, webInterface) }
-	val SoneTemplatePage.menuName get() = javaClass.getAnnotation(MenuName::class.java)?.value
+	val page by lazy { pageSupplier(webInterface, loaders, templateRenderer) }
 
 	val httpRequest = mock<HTTPRequest>()
 	val freenetRequest = mock<FreenetRequest>()