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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/DeleteSonePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/DeleteSonePageTest.kt
index 535aba3..9a5d1d5 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/DeleteSonePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/DeleteSonePageTest.kt
@@ -1,11 +1,9 @@
 package net.pterodactylus.sone.web
 
-import net.pterodactylus.sone.web.WebTestUtils.redirectsTo
 import net.pterodactylus.util.web.Method.GET
 import net.pterodactylus.util.web.Method.POST
 import org.junit.Test
 import org.mockito.Mockito.verify
-import kotlin.test.fail
 
 /**
  * Unit test for [DeleteSonePage].
@@ -14,6 +12,8 @@ class DeleteSonePageTest : WebPageTest() {
 
 	private val page = DeleteSonePage(template, webInterface)
 
+	override fun getPage() = page
+
 	@Test
 	fun `get request does not redirect`() {
 		request("", GET)
@@ -23,19 +23,14 @@ class DeleteSonePageTest : WebPageTest() {
 	@Test
 	fun `post request without delete confirmation redirects to index`() {
 		request("", POST)
-		expectedException.expect(redirectsTo("index.html"))
-		page.handleRequest(freenetRequest, templateContext)
+		verifyRedirect("index.html")
 	}
 
 	@Test
 	fun `post request with delete confirmation deletes sone and redirects to index`() {
 		request("", POST)
 		addHttpRequestParameter("deleteSone", "true")
-		expectedException.expect(redirectsTo("index.html"))
-		try {
-			page.handleRequest(freenetRequest, templateContext)
-			fail()
-		} finally {
+		verifyRedirect("index.html") {
 			verify(core).deleteSone(currentSone)
 		}
 	}