Use verifyNoRedirect instead of calling the request handler directly

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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/UntrustPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/UntrustPageTest.kt
index 0a59453..5848c49 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/UntrustPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/UntrustPageTest.kt
@@ -2,7 +2,6 @@ package net.pterodactylus.sone.web.pages
 
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.web.pages.UntrustPage
 import net.pterodactylus.util.web.Method.POST
 import org.junit.Test
 import org.mockito.ArgumentMatchers.any
@@ -21,14 +20,15 @@ class UntrustPageTest : WebPageTest() {
 
        @Test
        fun `get request does not redirect`() {
-               page.handleRequest(freenetRequest, templateContext)
-               verify(core, never()).untrustSone(eq(currentSone), any())
+               verifyNoRedirect {
+                       verify(core, never()).untrustSone(eq(currentSone), any())
+               }
        }
 
        @Test
        fun `post request without sone parameter does not untrust but redirects`() {
-               request("", POST)
-               addHttpRequestParameter("returnPage", "return.html")
+               setMethod(POST)
+               addHttpRequestPart("returnPage", "return.html")
                verifyRedirect("return.html") {
                        verify(core, never()).untrustSone(eq(currentSone), any())
                }
@@ -36,9 +36,9 @@ class UntrustPageTest : WebPageTest() {
 
        @Test
        fun `post request with invalid sone parameter does not untrust but redirects`() {
-               request("", POST)
-               addHttpRequestParameter("returnPage", "return.html")
-               addHttpRequestParameter("sone", "no-sone")
+               setMethod(POST)
+               addHttpRequestPart("returnPage", "return.html")
+               addHttpRequestPart("sone", "no-sone")
                verifyRedirect("return.html") {
                        verify(core, never()).untrustSone(eq(currentSone), any())
                }
@@ -46,9 +46,9 @@ class UntrustPageTest : WebPageTest() {
 
        @Test
        fun `post request with valid sone parameter untrusts and redirects`() {
-               request("", POST)
-               addHttpRequestParameter("returnPage", "return.html")
-               addHttpRequestParameter("sone", "sone-id")
+               setMethod(POST)
+               addHttpRequestPart("returnPage", "return.html")
+               addHttpRequestPart("sone", "sone-id")
                val sone = mock<Sone>()
                addSone("sone-id", sone)
                verifyRedirect("return.html") {