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=4f72902060051dd639ccea20f3e71b45d7f0ebb0;hp=a1fc2de9254bf888ae44e9b6f34976c1b9ae8793;hb=03c29a3838e23ed0b9731ca4d84cf58038c30dfe;hpb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae

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..4f72902 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/WebPageTest.kt
@@ -42,7 +42,7 @@ 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>()
@@ -89,11 +89,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 +164,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) {