X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FSoneTemplatePageTest.kt;h=3cb08e630a5541072fb1a1a6fa2970e96a782687;hb=3cb0e2c78bb37f2d70ecde92ad4fcf642de788a3;hp=4cef5b0676d34367f65d22a5fa1bf8da5b34f7f9;hpb=6b29b49714912ff5e3e410d2484699cdf8041b90;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 4cef5b0..3cb08e6 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePageTest.kt
@@ -16,36 +16,11 @@ import org.hamcrest.Matchers.containsInAnyOrder
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.nullValue
 import org.junit.Test
-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) {}
-
-	@Test
-	fun `current sone is retrieved from web interface`() {
-		assertThat(page.getCurrentSone(toadletContext), equalTo(currentSone))
-	}
-
-	@Test
-	fun `retrieving current sone without creation is forwarded to web interface`() {
-		mock<Sone>().let {
-			whenever(webInterface.getCurrentSone(toadletContext, false)).thenReturn(it)
-			assertThat(page.getCurrentSone(toadletContext, false), equalTo(it))
-		}
-	}
-
-	@Test
-	fun `setting the current sone is forwarded to web interface`() {
-		mock<Sone>().let {
-			page.setCurrentSone(toadletContext, it)
-			verify(webInterface).setCurrentSone(toadletContext, it)
-		}
-	}
+class SoneTemplatePageTest : WebPageTest({ template, webInterface -> object : SoneTemplatePage("path.html", template, webInterface, true) {} }) {
 
 	@Test
 	fun `page title is empty string if no page title key was given`() {
@@ -83,20 +58,6 @@ class SoneTemplatePageTest : WebPageTest() {
 		assertThat(page.shortcutIcon, equalTo("images/icon.png"))
 	}
 
-	@Test
-	fun `page requires login if require login was specified in the constructor`() {
-		SoneTemplatePage("path.html", template, webInterface, true).let { page ->
-			assertThat(page.requiresLogin(), equalTo(true))
-		}
-	}
-
-	@Test
-	fun `page does not require login if require login was not specified in the constructor`() {
-		SoneTemplatePage("path.html", template, webInterface, false).let { page ->
-			assertThat(page.requiresLogin(), equalTo(false))
-		}
-	}
-
 	private fun verifyVariableIsSet(name: String, value: Any) = verifyVariableMatches(name, equalTo<Any>(value))
 
 	private fun <T> verifyVariableMatches(name: String, matcher: Matcher<T>) {
@@ -107,7 +68,7 @@ class SoneTemplatePageTest : WebPageTest() {
 
 	@Test
 	fun `preferences are set in template context`() {
-	    verifyVariableIsSet("preferences", preferences)
+		verifyVariableIsSet("preferences", preferences)
 	}
 
 	@Test
@@ -184,7 +145,7 @@ class SoneTemplatePageTest : WebPageTest() {
 	fun `handleRequest method is called`() {
 		var called = false
 		val page = object : SoneTemplatePage("path.html", template, webInterface, true) {
-			override fun handleRequest(request: FreenetRequest, templateContext: TemplateContext) {
+			override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
 				called = true
 			}
 		}
@@ -223,17 +184,6 @@ class SoneTemplatePageTest : WebPageTest() {
 	}
 
 	@Test
-	fun `full access requirement is correctly forwarded from the preferences if false`() {
-		assertThat(page.isFullAccessOnly, equalTo(false))
-	}
-
-	@Test
-	fun `full access requirement is correctly forwarded from the preferences if true`() {
-		core.preferences.isRequireFullAccess = true
-		assertThat(page.isFullAccessOnly, equalTo(true))
-	}
-
-	@Test
 	fun `page is disabled if full access is required but request does not have full access`() {
 		core.preferences.isRequireFullAccess = true
 		assertThat(page.isEnabled(toadletContext), equalTo(false))