Set URI and request method separately in tests

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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/FollowSonePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/FollowSonePageTest.kt
index 0cd8444..581390c 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/FollowSonePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/FollowSonePageTest.kt
@@ -3,7 +3,6 @@ package net.pterodactylus.sone.web.pages
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.util.web.Method.GET
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
@@ -41,17 +40,16 @@ class FollowSonePageTest : WebPageTest() {
 
        @Test
        fun `get request does not redirect`() {
-               request("", GET)
                page.processTemplate(freenetRequest, templateContext)
        }
 
        @Test
        fun `a single sone can be followed`() {
-               request("", POST)
+               setMethod(POST)
                val sone = mock<Sone>()
                addSone("sone-id", sone)
-               addHttpRequestParameter("sone", "sone-id")
-               addHttpRequestParameter("returnPage", "return.html")
+               addHttpRequestPart("sone", "sone-id")
+               addHttpRequestPart("returnPage", "return.html")
                verifyRedirect("return.html") {
                        verify(core).followSone(currentSone, "sone-id")
                        verify(core).markSoneKnown(sone)
@@ -60,13 +58,13 @@ class FollowSonePageTest : WebPageTest() {
 
        @Test
        fun `multiple sones can be followed`() {
-               request("", POST)
+               setMethod(POST)
                val firstSone = mock<Sone>()
                addSone("sone-id1", firstSone)
                val secondSone = mock<Sone>()
                addSone("sone-id2", secondSone)
-               addHttpRequestParameter("sone", "sone-id1,sone-id2")
-               addHttpRequestParameter("returnPage", "return.html")
+               addHttpRequestPart("sone", "sone-id1,sone-id2")
+               addHttpRequestPart("returnPage", "return.html")
                verifyRedirect("return.html") {
                        verify(core).followSone(currentSone, "sone-id1")
                        verify(core).followSone(currentSone, "sone-id2")
@@ -77,9 +75,9 @@ class FollowSonePageTest : WebPageTest() {
 
        @Test
        fun `a non-existing sone is not followed`() {
-               request("", POST)
-               addHttpRequestParameter("sone", "sone-id")
-               addHttpRequestParameter("returnPage", "return.html")
+               setMethod(POST)
+               addHttpRequestPart("sone", "sone-id")
+               addHttpRequestPart("returnPage", "return.html")
                verifyRedirect("return.html") {
                        verify(core, never()).followSone(ArgumentMatchers.eq(currentSone), anyString())
                        verify(core, never()).markSoneKnown(any<Sone>())