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=d654b09850da47e935750cc0b9dbb7007bf124eb;hp=fc59639028ae906381f0cf4033f241b8935cd71d;hb=cd1f93dc057bdc6e89baeb41db0f749f2287224e;hpb=2dd40fba7031cffb35a5156435547a5d964535c9

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 fc59639..d654b09 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest.kt
@@ -20,7 +20,7 @@ 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
@@ -42,12 +42,12 @@ 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: (Template, WebInterface) -> SoneTemplatePage = { _, _ -> mock() }) {
 
 	val currentSone = mock<Sone>()
 	val template = mock<Template>()
 	val webInterface = deepMock<WebInterface>()
-	val core = webInterface.core!!
+	val core = webInterface.core
 	val eventBus = mock<EventBus>()
 	val preferences = Preferences(eventBus)
 	val l10n = webInterface.l10n!!
@@ -55,6 +55,10 @@ open class WebPageTest(pageSupplier: (Template, WebInterface) -> SoneTemplatePag
 	val page by lazy { pageSupplier(template, webInterface) }
 	val httpRequest = mock<HTTPRequest>()
 	val freenetRequest = mock<FreenetRequest>()
+	init {
+		whenever(freenetRequest.l10n).thenReturn(l10n)
+		whenever(freenetRequest.uri).thenReturn(mock())
+	}
 	val templateContext = TemplateContext()
 	val toadletContext = deepMock<ToadletContext>()
 	val responseContent = ByteArrayOutputStream()
@@ -89,11 +93,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]]}
@@ -164,7 +168,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) {