Clean up some imports

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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPageTest.kt
index ff65e9d..c03afc8 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPageTest.kt
@@ -4,9 +4,6 @@ import net.pterodactylus.sone.data.PostReply
 import net.pterodactylus.sone.data.Sone
 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.DeleteReplyPage
-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,7 +42,6 @@ class DeleteReplyPageTest : WebPageTest() {
 
        @Test
        fun `get request sets reply ID and return page in template context`() {
-               request("", GET)
                addHttpRequestParameter("reply", "reply-id")
                addHttpRequestParameter("returnPage", "return.html")
                page.processTemplate(freenetRequest, templateContext)
@@ -55,10 +51,10 @@ class DeleteReplyPageTest : WebPageTest() {
 
        @Test
        fun `post request without any action sets reply ID and return page in template context`() {
-               request("", POST)
+               setMethod(POST)
                addPostReply("reply-id", reply)
-               addHttpRequestParameter("reply", "reply-id")
-               addHttpRequestParameter("returnPage", "return.html")
+               addHttpRequestPart("reply", "reply-id")
+               addHttpRequestPart("returnPage", "return.html")
                page.processTemplate(freenetRequest, templateContext)
                assertThat(templateContext["reply"], equalTo<Any>("reply-id"))
                assertThat(templateContext["returnPage"], equalTo<Any>("return.html"))
@@ -66,14 +62,14 @@ class DeleteReplyPageTest : WebPageTest() {
 
        @Test
        fun `trying to delete a reply with an invalid ID results in no permission page`() {
-               request("", POST)
+               setMethod(POST)
                verifyRedirect("noPermission.html")
        }
 
        @Test
        fun `trying to delete a reply from a non-local sone results in no permission page`() {
-               request("", POST)
-               addHttpRequestParameter("reply", "reply-id")
+               setMethod(POST)
+               addHttpRequestPart("reply", "reply-id")
                whenever(sone.isLocal).thenReturn(false)
                addPostReply("reply-id", reply)
                verifyRedirect("noPermission.html")
@@ -81,11 +77,11 @@ class DeleteReplyPageTest : WebPageTest() {
 
        @Test
        fun `confirming deletion of reply deletes the reply and redirects to return page`() {
-               request("", POST)
+               setMethod(POST)
                addPostReply("reply-id", reply)
-               addHttpRequestParameter("reply", "reply-id")
-               addHttpRequestParameter("returnPage", "return.html")
-               addHttpRequestParameter("confirmDelete", "true")
+               addHttpRequestPart("reply", "reply-id")
+               addHttpRequestPart("returnPage", "return.html")
+               addHttpRequestPart("confirmDelete", "true")
                verifyRedirect("return.html") {
                        verify(core).deleteReply(reply)
                }
@@ -93,11 +89,11 @@ class DeleteReplyPageTest : WebPageTest() {
 
        @Test
        fun `aborting deletion of reply redirects to return page`() {
-               request("", POST)
+               setMethod(POST)
                addPostReply("reply-id", reply)
-               addHttpRequestParameter("reply", "reply-id")
-               addHttpRequestParameter("returnPage", "return.html")
-               addHttpRequestParameter("abortDelete", "true")
+               addHttpRequestPart("reply", "reply-id")
+               addHttpRequestPart("returnPage", "return.html")
+               addHttpRequestPart("abortDelete", "true")
                verifyRedirect("return.html") {
                        verify(core, never()).deleteReply(reply)
                }