Use verifyNoRedirect instead of calling the request handler directly

[Sone.git] / src / test / kotlin / net / pterodactylus / sone / web / pages / OptionsPageTest.kt

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt
index 950a3fe..a4df75d 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt
@@ -3,13 +3,10 @@ package net.pterodactylus.sone.web.pages
 import net.pterodactylus.sone.data.SoneOptions.DefaultSoneOptions
 import net.pterodactylus.sone.data.SoneOptions.LoadExternalContent.FOLLOWED
 import net.pterodactylus.sone.data.SoneOptions.LoadExternalContent.TRUSTED
-import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired
 import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.ALWAYS
 import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.NO
 import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.WRITING
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.OptionsPage
-import net.pterodactylus.util.web.Method.GET
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
@@ -57,47 +54,47 @@ class OptionsPageTest : WebPageTest() {
 
        @Test
        fun `get request stores all preferences in the template context`() {
-               request("", GET)
-               page.handleRequest(freenetRequest, templateContext)
-               assertThat(templateContext["auto-follow"], equalTo<Any>(true))
-               assertThat(templateContext["show-notification-new-sones"], equalTo<Any>(true))
-               assertThat(templateContext["show-notification-new-posts"], equalTo<Any>(true))
-               assertThat(templateContext["show-notification-new-replies"], equalTo<Any>(true))
-               assertThat(templateContext["enable-sone-insert-notifications"], equalTo<Any>(true))
-               assertThat(templateContext["load-linked-images"], equalTo<Any>("FOLLOWED"))
-               assertThat(templateContext["show-custom-avatars"], equalTo<Any>("FOLLOWED"))
-               assertThat(templateContext["insertion-delay"], equalTo<Any>(1))
-               assertThat(templateContext["characters-per-post"], equalTo<Any>(50))
-               assertThat(templateContext["fcp-full-access-required"], equalTo<Any>(1))
-               assertThat(templateContext["images-per-page"], equalTo<Any>(4))
-               assertThat(templateContext["fcp-interface-active"], equalTo<Any>(true))
-               assertThat(templateContext["require-full-access"], equalTo<Any>(true))
-               assertThat(templateContext["negative-trust"], equalTo<Any>(7))
-               assertThat(templateContext["positive-trust"], equalTo<Any>(8))
-               assertThat(templateContext["post-cut-off-length"], equalTo<Any>(51))
-               assertThat(templateContext["posts-per-page"], equalTo<Any>(10))
-               assertThat(templateContext["trust-comment"], equalTo<Any>("11"))
+               verifyNoRedirect {
+                       assertThat(templateContext["auto-follow"], equalTo<Any>(true))
+                       assertThat(templateContext["show-notification-new-sones"], equalTo<Any>(true))
+                       assertThat(templateContext["show-notification-new-posts"], equalTo<Any>(true))
+                       assertThat(templateContext["show-notification-new-replies"], equalTo<Any>(true))
+                       assertThat(templateContext["enable-sone-insert-notifications"], equalTo<Any>(true))
+                       assertThat(templateContext["load-linked-images"], equalTo<Any>("FOLLOWED"))
+                       assertThat(templateContext["show-custom-avatars"], equalTo<Any>("FOLLOWED"))
+                       assertThat(templateContext["insertion-delay"], equalTo<Any>(1))
+                       assertThat(templateContext["characters-per-post"], equalTo<Any>(50))
+                       assertThat(templateContext["fcp-full-access-required"], equalTo<Any>(1))
+                       assertThat(templateContext["images-per-page"], equalTo<Any>(4))
+                       assertThat(templateContext["fcp-interface-active"], equalTo<Any>(true))
+                       assertThat(templateContext["require-full-access"], equalTo<Any>(true))
+                       assertThat(templateContext["negative-trust"], equalTo<Any>(7))
+                       assertThat(templateContext["positive-trust"], equalTo<Any>(8))
+                       assertThat(templateContext["post-cut-off-length"], equalTo<Any>(51))
+                       assertThat(templateContext["posts-per-page"], equalTo<Any>(10))
+                       assertThat(templateContext["trust-comment"], equalTo<Any>("11"))
+               }
        }
 
        @Test
        fun `get request without sone does not store sone-specific preferences in the template context`() {
-               request("", GET)
                unsetCurrentSone()
-               page.handleRequest(freenetRequest, templateContext)
-               assertThat(templateContext["auto-follow"], nullValue())
-               assertThat(templateContext["show-notification-new-sones"], nullValue())
-               assertThat(templateContext["show-notification-new-posts"], nullValue())
-               assertThat(templateContext["show-notification-new-replies"], nullValue())
-               assertThat(templateContext["enable-sone-insert-notifications"], nullValue())
-               assertThat(templateContext["load-linked-images"], nullValue())
-               assertThat(templateContext["show-custom-avatars"], nullValue())
+               verifyNoRedirect {
+                       assertThat(templateContext["auto-follow"], nullValue())
+                       assertThat(templateContext["show-notification-new-sones"], nullValue())
+                       assertThat(templateContext["show-notification-new-posts"], nullValue())
+                       assertThat(templateContext["show-notification-new-replies"], nullValue())
+                       assertThat(templateContext["enable-sone-insert-notifications"], nullValue())
+                       assertThat(templateContext["load-linked-images"], nullValue())
+                       assertThat(templateContext["show-custom-avatars"], nullValue())
+               }
        }
 
        private fun <T> verifyThatOptionCanBeSet(option: String, setValue: Any?, expectedValue: T, getter: () -> T) {
-               request("", POST)
-               addHttpRequestParameter(option, setValue.toString())
-               addHttpRequestParameter("show-custom-avatars", "ALWAYS")
-               addHttpRequestParameter("load-linked-images", "ALWAYS")
+               setMethod(POST)
+               addHttpRequestPart("show-custom-avatars", "ALWAYS")
+               addHttpRequestPart("load-linked-images", "ALWAYS")
+               addHttpRequestPart(option, setValue.toString())
                verifyRedirect("options.html") {
                        assertThat(getter(), equalTo(expectedValue))
                }
@@ -140,16 +137,17 @@ class OptionsPageTest : WebPageTest() {
 
        private fun verifyThatWrongValueForPreferenceIsDetected(name: String, value: String) {
                unsetCurrentSone()
-               request("", POST)
-               addHttpRequestParameter(name, value)
-               page.handleRequest(freenetRequest, templateContext)
-               assertThat(templateContext["fieldErrors"] as Iterable<*>, hasItem(name))
+               setMethod(POST)
+               addHttpRequestPart(name, value)
+               verifyNoRedirect {
+                       assertThat(templateContext["fieldErrors"] as Iterable<*>, hasItem(name))
+               }
        }
 
        private fun <T> verifyThatPreferencesCanBeSet(name: String, setValue: String?, expectedValue: T, getter: () -> T) {
                unsetCurrentSone()
-               request("", POST)
-               addHttpRequestParameter(name, setValue)
+               setMethod(POST)
+               addHttpRequestPart(name, setValue)
                verifyRedirect("options.html") {
                        assertThat(getter(), equalTo(expectedValue))
                }