X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FDistrustPageTest.kt;h=1b51a4f9575c690bc5b7d7d0b590f31943e9c4cd;hp=a0766ba79f7674a27e0a70ddfbadadcf3a41b24c;hb=a9c1c1770651720ec3b271464a4b490ea4a1334f;hpb=7eac5c60bdb241d7b98e548cf974d41e22af1b5c

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/DistrustPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/DistrustPageTest.kt
index a0766ba..1b51a4f 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/DistrustPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/DistrustPageTest.kt
@@ -2,12 +2,9 @@ package net.pterodactylus.sone.web
 
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.web.WebTestUtils.redirectsTo
-import net.pterodactylus.util.web.Method
 import net.pterodactylus.util.web.Method.GET
 import net.pterodactylus.util.web.Method.POST
 import org.junit.Test
-import org.mockito.Mockito
 import org.mockito.Mockito.verify
 
 /**
@@ -17,6 +14,8 @@ class DistrustPageTest : WebPageTest() {
 
 	private val page = DistrustPage(template, webInterface)
 
+	override fun getPage() = page
+
 	@Test
 	fun `get request does not redirect`() {
 	    request("", GET)
@@ -27,8 +26,7 @@ class DistrustPageTest : WebPageTest() {
 	fun `post request with invalid sone redirects to return page`() {
 	    request("", POST)
 		addHttpRequestParameter("returnPage", "return.html")
-		expectedException.expect(redirectsTo("return.html"))
-		page.handleRequest(freenetRequest, templateContext)
+		verifyRedirect("return.html")
 	}
 
 	@Test
@@ -38,10 +36,7 @@ class DistrustPageTest : WebPageTest() {
 		addSone("remote-sone-id", remoteSone)
 		addHttpRequestParameter("returnPage", "return.html")
 		addHttpRequestParameter("sone", "remote-sone-id")
-		expectedException.expect(redirectsTo("return.html"))
-		try {
-			page.handleRequest(freenetRequest, templateContext)
-		} finally {
+		verifyRedirect("return.html") {
 			verify(core).distrustSone(currentSone, remoteSone)
 		}
 	}