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=a1fc2de9254bf888ae44e9b6f34976c1b9ae8793;hb=110a933c2724aba6a604fc5eed6372ff1e1e6144;hpb=626a2e839efe6c5c912bc6efa1a0cc6c9c8576c2

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 a1fc2de..20e6cb6 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest.kt
@@ -1,7 +1,7 @@
 package net.pterodactylus.sone.web.pages
 
 import com.google.common.eventbus.EventBus
-import freenet.clients.http.ToadletContext
+import freenet.clients.http.*
 import freenet.support.SimpleReadOnlyArrayBucket
 import freenet.support.api.HTTPRequest
 import freenet.support.api.HTTPUploadedFile
@@ -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
@@ -20,10 +21,9 @@ import net.pterodactylus.sone.test.whenever
 import net.pterodactylus.sone.utils.asList
 import net.pterodactylus.sone.utils.asOptional
 import net.pterodactylus.sone.web.WebInterface
-import net.pterodactylus.sone.web.page.FreenetRequest
+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,19 +42,28 @@ import kotlin.text.Charsets.UTF_8
 /**
  * Base class for web page tests.
  */
-open class WebPageTest(pageSupplier: (Template, WebInterface) -> SoneTemplatePage = { _, _ -> mock<SoneTemplatePage>() }) {
+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>()
 	val preferences = Preferences(eventBus)
 	val l10n = webInterface.l10n!!
+	val sessionManager = mock<SessionManager>()
+
+	val page by lazy { pageSupplier(webInterface, loaders, templateRenderer) }
 
-	val page by lazy { pageSupplier(template, webInterface) }
 	val httpRequest = mock<HTTPRequest>()
 	val freenetRequest = mock<FreenetRequest>()
+	init {
+		whenever(freenetRequest.l10n).thenReturn(l10n)
+		whenever(freenetRequest.sessionManager).thenReturn(sessionManager)
+		whenever(freenetRequest.uri).thenReturn(mock())
+	}
+	val soneRequest by lazy { freenetRequest.toSoneRequest(core, webInterface) }
 	val templateContext = TemplateContext()
 	val toadletContext = deepMock<ToadletContext>()
 	val responseContent = ByteArrayOutputStream()
@@ -89,11 +98,11 @@ open class WebPageTest(pageSupplier: (Template, WebInterface) -> SoneTemplatePag
 		whenever(core.preferences).thenReturn(preferences)
 		whenever(core.identityManager.allOwnIdentities).then { ownIdentities }
 		whenever(core.sones).then { allSones.values }
-		whenever(core.getSone(anyString())).then { allSones[it[0]].asOptional() }
+		whenever(core.getSone(anyString())).then { allSones[it[0]] }
 		whenever(core.localSones).then { localSones.values }
 		whenever(core.getLocalSone(anyString())).then { localSones[it[0]] }
-		whenever(core.getPost(anyString())).then { allPosts[it[0]].asOptional() }
-		whenever(core.getPostReply(anyString())).then { allPostReplies[it[0]].asOptional() }
+		whenever(core.getPost(anyString())).then { allPosts[it[0]] }
+		whenever(core.getPostReply(anyString())).then { allPostReplies[it[0]] }
 		whenever(core.getReplies(anyString())).then { perPostReplies[it[0]].asList() }
 		whenever(core.getAlbum(anyString())).then { allAlbums[it[0]] }
 		whenever(core.getImage(anyString())).then { allImages[it[0]]}
@@ -102,6 +111,7 @@ open class WebPageTest(pageSupplier: (Template, WebInterface) -> SoneTemplatePag
 	}
 
 	private fun setupWebInterface() {
+		whenever(webInterface.sessionManager).thenReturn(sessionManager)
 		whenever(webInterface.getCurrentSoneCreatingSession(eq(toadletContext))).thenReturn(currentSone)
 		whenever(webInterface.getCurrentSone(eq(toadletContext), anyBoolean())).thenReturn(currentSone)
 		whenever(webInterface.getCurrentSoneWithoutCreatingSession(eq(toadletContext))).thenReturn(currentSone)
@@ -164,7 +174,7 @@ open class WebPageTest(pageSupplier: (Template, WebInterface) -> SoneTemplatePag
 	}
 
 	fun addHttpRequestParameter(name: String, value: String) {
-		getRequestParameters[name] = getRequestParameters.getOrElse(name) { mutableListOf<String>() }.apply { add(value) }
+		getRequestParameters[name] = getRequestParameters.getOrElse(name) { mutableListOf() }.apply { add(value) }
 	}
 
 	fun addHttpRequestPart(name: String, value: String) {