X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FOptionsPageTest.kt;h=7146f2e3551c2af359136a367e407212f150c3ac;hb=5ba707d40f9d2a20094aaabc21647aeec1feed46;hp=950a3fe9c1edcde6190a9d72ce51bf4d590a48c5;hpb=de7568a82eb4150bf6d2b0553841b7b69f84c968;p=Sone.git

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..7146f2e 100644
--- 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,7 +54,6 @@ 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))
@@ -81,7 +77,6 @@ class OptionsPageTest : WebPageTest() {
 
 	@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())
@@ -94,10 +89,10 @@ class OptionsPageTest : WebPageTest() {
 	}
 
 	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 +135,16 @@ class OptionsPageTest : WebPageTest() {
 
 	private fun verifyThatWrongValueForPreferenceIsDetected(name: String, value: String) {
 		unsetCurrentSone()
-		request("", POST)
-		addHttpRequestParameter(name, value)
+		setMethod(POST)
+		addHttpRequestPart(name, value)
 		page.handleRequest(freenetRequest, templateContext)
 		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))
 		}