X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FOptionsPageTest.kt;h=cb8a3e5525903c8b12784ae3d9a50fbcb36cfa12;hp=c79b497a62740d67ac0c1d2c467ac5d487fa3d17;hb=9acbc5bdec4ccb752e0856a501568b0bb6161579;hpb=c6c7a34e3efae7aba8ff637fa647b699cf580031

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/OptionsPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/OptionsPageTest.kt
index c79b497..cb8a3e5 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/OptionsPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/OptionsPageTest.kt
@@ -6,7 +6,6 @@ import net.pterodactylus.sone.data.SoneOptions.LoadExternalContent.TRUSTED
 import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired
 import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.WRITING
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.WebTestUtils.redirectsTo
 import net.pterodactylus.util.web.Method.GET
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
@@ -23,6 +22,8 @@ class OptionsPageTest : WebPageTest() {
 
 	private val page = OptionsPage(template, webInterface)
 
+	override fun getPage() = page
+
 	@Before
 	fun setupPreferences() {
 		core.preferences.insertionDelay = 1
@@ -91,13 +92,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")
-		addHttpRequestParameter(option, setValue.toString())
-		expectedException.expect(redirectsTo("options.html"))
-		try {
-			page.handleRequest(freenetRequest, templateContext)
-		} finally {
+		verifyRedirect("options.html") {
 			assertThat(getter(), equalTo(expectedValue))
 		}
 	}
@@ -149,10 +147,7 @@ class OptionsPageTest : WebPageTest() {
 		unsetCurrentSone()
 		request("", POST)
 		addHttpRequestParameter(name, setValue)
-		expectedException.expect(redirectsTo("options.html"))
-		try {
-			page.handleRequest(freenetRequest, templateContext)
-		} finally {
+		verifyRedirect("options.html") {
 			assertThat(getter(), equalTo(expectedValue))
 		}
 	}