X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FSoneTemplatePageTest.kt;h=c872b0842b38d648b849b6feb0cdc9a18e81c4c8;hb=5f1c5eb4f05cc9c73aa2a9749e68b5cab68dcc2a;hp=42d66766d57f546801b02fd18cd261cdfed5da6d;hpb=de7568a82eb4150bf6d2b0553841b7b69f84c968;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePageTest.kt
index 42d6676..c872b08 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePageTest.kt
@@ -4,12 +4,10 @@ import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.main.SonePlugin
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
 import net.pterodactylus.sone.web.page.FreenetRequest
 import net.pterodactylus.util.notify.Notification
 import net.pterodactylus.util.template.TemplateContext
 import net.pterodactylus.util.version.Version
-import net.pterodactylus.util.web.Method.GET
 import org.hamcrest.Matcher
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.anyOf
@@ -23,10 +21,7 @@ import org.mockito.Mockito.verify
 /**
  * Unit test for [SoneTemplatePage].
  */
-class SoneTemplatePageTest : WebPageTest() {
-
-	private val preferences by lazy { core.preferences!! }
-	private val page = object : SoneTemplatePage("path.html", template, webInterface, true) {}
+class SoneTemplatePageTest: WebPageTest2({ template, webInterface -> object : SoneTemplatePage("path.html", template, webInterface, true) {}}) {
 
 	@Test
 	fun `current sone is retrieved from web interface`() {
@@ -36,8 +31,8 @@ class SoneTemplatePageTest : WebPageTest() {
 	@Test
 	fun `retrieving current sone without creation is forwarded to web interface`() {
 		mock<Sone>().let {
-			whenever(webInterface.getCurrentSoneWithoutCreatingSession(toadletContext)).thenReturn(it)
-			assertThat(page.getCurrentSoneWithoutCreatingSession(toadletContext), equalTo(it))
+			whenever(webInterface.getCurrentSone(toadletContext, false)).thenReturn(it)
+			assertThat(page.getCurrentSone(toadletContext, false), equalTo(it))
 		}
 	}
 
@@ -208,14 +203,14 @@ class SoneTemplatePageTest : WebPageTest() {
 	@Test
 	fun `redirect does happen if sone is not logged in`() {
 		unsetCurrentSone()
-		request("index.html", GET)
+		request("index.html")
 		assertThat(page.getRedirectTarget(freenetRequest), equalTo("login.html?target=index.html"))
 	}
 
 	@Test
 	fun `redirect does happen with parameters encoded correctly if sone is not logged in`() {
 		unsetCurrentSone()
-		request("index.html", GET)
+		request("index.html")
 		addHttpRequestParameter("foo", "b=r")
 		addHttpRequestParameter("baz", "q&o")
 		assertThat(page.getRedirectTarget(freenetRequest), anyOf(