Use verifyNoRedirect instead of calling the request handler directly

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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/ViewPostPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/ViewPostPageTest.kt
index bbc03bf..88ca34a 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/ViewPostPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/ViewPostPageTest.kt
@@ -4,7 +4,6 @@ import net.pterodactylus.sone.data.Post
 import net.pterodactylus.sone.data.Profile
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.ViewPostPage
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
 import org.hamcrest.Matchers.nullValue
@@ -27,26 +26,29 @@ class ViewPostPageTest : WebPageTest() {
 
        @Test
        fun `get request without parameters stores null in template context`() {
-               page.handleRequest(freenetRequest, templateContext)
-               assertThat(templateContext["post"], nullValue())
-               assertThat(templateContext["raw"] as? Boolean, equalTo(false))
+               verifyNoRedirect {
+                       assertThat(templateContext["post"], nullValue())
+                       assertThat(templateContext["raw"] as? Boolean, equalTo(false))
+               }
        }
 
        @Test
        fun `get request with invalid post id stores null in template context`() {
                addHttpRequestParameter("post", "invalid-post-id")
-               page.handleRequest(freenetRequest, templateContext)
-               assertThat(templateContext["post"], nullValue())
-               assertThat(templateContext["raw"] as? Boolean, equalTo(false))
+               verifyNoRedirect {
+                       assertThat(templateContext["post"], nullValue())
+                       assertThat(templateContext["raw"] as? Boolean, equalTo(false))
+               }
        }
 
        @Test
        fun `get request with valid post id stores post in template context`() {
                addPost("post-id", post)
                addHttpRequestParameter("post", "post-id")
-               page.handleRequest(freenetRequest, templateContext)
-               assertThat(templateContext["post"], equalTo<Any>(post))
-               assertThat(templateContext["raw"] as? Boolean, equalTo(false))
+               verifyNoRedirect {
+                       assertThat(templateContext["post"], equalTo<Any>(post))
+                       assertThat(templateContext["raw"] as? Boolean, equalTo(false))
+               }
        }
 
        @Test
@@ -54,9 +56,10 @@ class ViewPostPageTest : WebPageTest() {
                addPost("post-id", post)
                addHttpRequestParameter("post", "post-id")
                addHttpRequestParameter("raw", "true")
-               page.handleRequest(freenetRequest, templateContext)
-               assertThat(templateContext["post"], equalTo<Any>(post))
-               assertThat(templateContext["raw"] as? Boolean, equalTo(true))
+               verifyNoRedirect {
+                       assertThat(templateContext["post"], equalTo<Any>(post))
+                       assertThat(templateContext["raw"] as? Boolean, equalTo(true))
+               }
        }
 
        @Test