Use new redirect verification

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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/LoginPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/LoginPageTest.kt
index fbfeabe..a4dea43 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/LoginPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/LoginPageTest.kt
@@ -6,7 +6,6 @@ import net.pterodactylus.sone.freenet.wot.OwnIdentity
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.thenReturnMock
 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
@@ -27,6 +26,8 @@ class LoginPageTest : WebPageTest() {
 
        private val sones = listOf(createSone("Sone", "Test"), createSone("Test"), createSone("Sone"))
 
+       override fun getPage() = page
+
        private fun createSone(vararg contexts: String) = mock<Sone>().apply {
                whenever(id).thenReturn(hashCode().toString())
                val identity = mock<OwnIdentity>().apply {
@@ -69,10 +70,7 @@ class LoginPageTest : WebPageTest() {
        fun `post request with valid sone and redirects to index page`() {
                request("", POST)
                addHttpRequestParameter("sone-id", "sone2")
-               expectedException.expect(redirectsTo("index.html"))
-               try {
-                       page.handleRequest(freenetRequest, templateContext)
-               } finally {
+               verifyRedirect("index.html") {
                        verify(webInterface).setCurrentSone(toadletContext, sones[1])
                }
        }
@@ -82,10 +80,7 @@ class LoginPageTest : WebPageTest() {
                request("", POST)
                addHttpRequestParameter("sone-id", "sone2")
                addHttpRequestParameter("target", "foo.html")
-               expectedException.expect(redirectsTo("foo.html"))
-               try {
-                       page.handleRequest(freenetRequest, templateContext)
-               } finally {
+               verifyRedirect("foo.html") {
                        verify(webInterface).setCurrentSone(toadletContext, sones[1])
                }
        }