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

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..6c31ea8 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt
@@ -9,7 +9,6 @@ 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 +56,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 +79,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 +91,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 +137,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))
 		}