Use new redirect verification

[Sone.git] / src / test / kotlin / net / pterodactylus / sone / web / DeleteSonePageTest.kt

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 (file)
--- 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)
                }
        }