Set URI and request method separately in tests

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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeletePostPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeletePostPageTest.kt
index 152e70d..0dbcc43 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeletePostPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeletePostPageTest.kt
@@ -6,7 +6,6 @@ import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
 import net.pterodactylus.sone.web.pages.WebPageTest
 import net.pterodactylus.sone.web.pages.DeletePostPage
-import net.pterodactylus.util.web.Method.GET
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
@@ -45,13 +44,11 @@ class DeletePostPageTest : WebPageTest() {
 
        @Test
        fun `get request with invalid post redirects to no permission page`() {
-               request("", GET)
                verifyRedirect("noPermission.html")
        }
 
        @Test
        fun `get request with valid post sets post and return page in template context`() {
-               request("", GET)
                addPost("post-id", post)
                addHttpRequestParameter("post", "post-id")
                addHttpRequestParameter("returnPage", "return.html")
@@ -62,27 +59,27 @@ class DeletePostPageTest : WebPageTest() {
 
        @Test
        fun `post request with invalid post redirects to no permission page`() {
-               request("", POST)
+               setMethod(POST)
                verifyRedirect("noPermission.html")
        }
 
        @Test
        fun `post request with post from non-local sone redirects to no permission page`() {
-               request("", POST)
+               setMethod(POST)
                whenever(sone.isLocal).thenReturn(false)
                addPost("post-id", post)
-               addHttpRequestParameter("post", "post-id")
-               addHttpRequestParameter("returnPage", "return.html")
+               addHttpRequestPart("post", "post-id")
+               addHttpRequestPart("returnPage", "return.html")
                verifyRedirect("noPermission.html")
        }
 
        @Test
        fun `post request with confirmation deletes post and redirects to return page`() {
-               request("", POST)
+               setMethod(POST)
                addPost("post-id", post)
-               addHttpRequestParameter("post", "post-id")
-               addHttpRequestParameter("returnPage", "return.html")
-               addHttpRequestParameter("confirmDelete", "true")
+               addHttpRequestPart("post", "post-id")
+               addHttpRequestPart("returnPage", "return.html")
+               addHttpRequestPart("confirmDelete", "true")
                verifyRedirect("return.html") {
                        verify(core).deletePost(post)
                }
@@ -90,11 +87,11 @@ class DeletePostPageTest : WebPageTest() {
 
        @Test
        fun `post request with abort delete does not delete post and redirects to return page`() {
-               request("", POST)
+               setMethod(POST)
                addPost("post-id", post)
-               addHttpRequestParameter("post", "post-id")
-               addHttpRequestParameter("returnPage", "return.html")
-               addHttpRequestParameter("abortDelete", "true")
+               addHttpRequestPart("post", "post-id")
+               addHttpRequestPart("returnPage", "return.html")
+               addHttpRequestPart("abortDelete", "true")
                verifyRedirect("return.html") {
                        verify(core, never()).deletePost(post)
                }
@@ -102,10 +99,10 @@ class DeletePostPageTest : WebPageTest() {
 
        @Test
        fun `post request without delete or abort sets post in template context`() {
-               request("", POST)
+               setMethod(POST)
                addPost("post-id", post)
-               addHttpRequestParameter("post", "post-id")
-               addHttpRequestParameter("returnPage", "return.html")
+               addHttpRequestPart("post", "post-id")
+               addHttpRequestPart("returnPage", "return.html")
                page.processTemplate(freenetRequest, templateContext)
                assertThat(templateContext["post"], equalTo<Any>(post))
                assertThat(templateContext["returnPage"], equalTo<Any>("return.html"))