X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FDistrustPageTest.kt;h=b5af91a2d82feca7a042d335c2ad4c813a30b9cf;hb=8a6c37232a2b4973e31b4c0ea397d867c7e02c7a;hp=a0766ba79f7674a27e0a70ddfbadadcf3a41b24c;hpb=47c6bfa7ff59256ce9d4813d7f7a4d965de5bd32;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/DistrustPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/DistrustPageTest.kt
index a0766ba..b5af91a 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,31 +14,29 @@ class DistrustPageTest : WebPageTest() {
 
 	private val page = DistrustPage(template, webInterface)
 
+	override fun getPage() = page
+
 	@Test
 	fun `get request does not redirect`() {
-	    request("", GET)
+		request("", GET)
 		page.handleRequest(freenetRequest, templateContext)
 	}
 
 	@Test
 	fun `post request with invalid sone redirects to return page`() {
-	    request("", POST)
+		request("", POST)
 		addHttpRequestParameter("returnPage", "return.html")
-		expectedException.expect(redirectsTo("return.html"))
-		page.handleRequest(freenetRequest, templateContext)
+		verifyRedirect("return.html")
 	}
 
 	@Test
 	fun `post request with valid sone distrusts sone and redirects to return page`() {
-	    request("", POST)
+		request("", POST)
 		val remoteSone = mock<Sone>()
 		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)
 		}
 	}