X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FSoneTemplatePageTest.kt;h=de551ce78a2f6ea19c938072f2416370b574c4a4;hp=3cb08e630a5541072fb1a1a6fa2970e96a782687;hb=110a933c2724aba6a604fc5eed6372ff1e1e6144;hpb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae

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 3cb08e6..de551ce 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePageTest.kt
@@ -4,7 +4,7 @@ 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.page.FreenetRequest
+import net.pterodactylus.sone.web.page.*
 import net.pterodactylus.util.notify.Notification
 import net.pterodactylus.util.template.TemplateContext
 import net.pterodactylus.util.version.Version
@@ -20,20 +20,24 @@ import org.junit.Test
 /**
  * Unit test for [SoneTemplatePage].
  */
-class SoneTemplatePageTest : WebPageTest({ template, webInterface -> object : SoneTemplatePage("path.html", template, webInterface, true) {} }) {
+class SoneTemplatePageTest : WebPageTest({ webInterface, loaders, templateRenderer -> object : SoneTemplatePage("path.html", webInterface, loaders, templateRenderer, requiresLogin = true) {} }) {
+
+	init {
+		request("index.html")
+	}
 
 	@Test
 	fun `page title is empty string if no page title key was given`() {
-		SoneTemplatePage("path.html", template, null, webInterface).let { page ->
-			assertThat(page.getPageTitle(freenetRequest), equalTo(""))
+		SoneTemplatePage("path.html", webInterface, loaders, templateRenderer, requiresLogin = false).let { page ->
+			assertThat(page.getPageTitle(soneRequest), equalTo(""))
 		}
 	}
 
 	@Test
 	fun `page title is retrieved from l10n if page title key is given`() {
-		SoneTemplatePage("path.html", template, "page.title", webInterface).let { page ->
+		SoneTemplatePage("path.html", webInterface, loaders, templateRenderer, pageTitleKey = "page.title", requiresLogin = false).let { page ->
 			whenever(l10n.getString("page.title")).thenReturn("Page Title")
-			assertThat(page.getPageTitle(freenetRequest), equalTo("Page Title"))
+			assertThat(page.getPageTitle(soneRequest), equalTo("Page Title"))
 		}
 	}
 
@@ -78,7 +82,7 @@ class SoneTemplatePageTest : WebPageTest({ template, webInterface -> object : So
 
 	@Test
 	fun `local sones are set in template context`() {
-		val localSones = listOf(mock<Sone>(), mock<Sone>())
+		val localSones = listOf(mock<Sone>(), mock())
 		whenever(core.localSones).thenReturn(localSones)
 		verifyVariableMatches("localSones", containsInAnyOrder(*localSones.toTypedArray()))
 	}
@@ -144,7 +148,7 @@ class SoneTemplatePageTest : WebPageTest({ template, webInterface -> object : So
 	@Test
 	fun `handleRequest method is called`() {
 		var called = false
-		val page = object : SoneTemplatePage("path.html", template, webInterface, true) {
+		val page = object : SoneTemplatePage("path.html", webInterface, loaders, templateRenderer, requiresLogin = true) {
 			override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
 				called = true
 			}
@@ -155,7 +159,7 @@ class SoneTemplatePageTest : WebPageTest({ template, webInterface -> object : So
 
 	@Test
 	fun `redirect does not happen if login is not required`() {
-		val page = SoneTemplatePage("page.html", template, webInterface, false)
+		val page = SoneTemplatePage("page.html", webInterface, loaders, templateRenderer, requiresLogin = false)
 		assertThat(page.getRedirectTarget(freenetRequest), nullValue())
 	}
 
@@ -167,14 +171,12 @@ class SoneTemplatePageTest : WebPageTest({ template, webInterface -> object : So
 	@Test
 	fun `redirect does happen if sone is not logged in`() {
 		unsetCurrentSone()
-		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")
 		addHttpRequestParameter("foo", "b=r")
 		addHttpRequestParameter("baz", "q&o")
 		assertThat(page.getRedirectTarget(freenetRequest), anyOf(
@@ -185,7 +187,7 @@ class SoneTemplatePageTest : WebPageTest({ template, webInterface -> object : So
 
 	@Test
 	fun `page is disabled if full access is required but request does not have full access`() {
-		core.preferences.isRequireFullAccess = true
+		core.preferences.newRequireFullAccess = true
 		assertThat(page.isEnabled(toadletContext), equalTo(false))
 	}
 
@@ -202,16 +204,28 @@ class SoneTemplatePageTest : WebPageTest({ template, webInterface -> object : So
 
 	@Test
 	fun `page is enabled if full access is required and request has full access and login is required and there is a current sone`() {
-		core.preferences.isRequireFullAccess = true
+		core.preferences.newRequireFullAccess = true
 		whenever(toadletContext.isAllowedFullAccess).thenReturn(true)
 		assertThat(page.isEnabled(toadletContext), equalTo(true))
 	}
 
 	@Test
 	fun `page is enabled if no full access is required and login is not required`() {
-		SoneTemplatePage("path.html", template, webInterface, false).let { page ->
+		SoneTemplatePage("path.html", webInterface, loaders, templateRenderer, requiresLogin = false).let { page ->
 			assertThat(page.isEnabled(toadletContext), equalTo(true))
 		}
 	}
 
+	@Test
+	fun `handle request with sone request is called`() {
+		var called = false
+	    val page = object : SoneTemplatePage("path.html", webInterface, loaders, templateRenderer) {
+		    override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
+			    called = true
+		    }
+	    }
+		page.processTemplate(freenetRequest, templateContext)
+		assertThat(called, equalTo(true))
+	}
+
 }