X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FEditImagePageTest.kt;h=e763a75b4b9d0540315245ee1796ec0d6455aca1;hp=4a39cdffa27667006145efeb777cf274f264cecb;hb=6b29b49714912ff5e3e410d2484699cdf8041b90;hpb=d070aabe9a9e2fc525022fb1ab24bdb6d3d4b2c3

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt
index 4a39cdf..e763a75 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt
@@ -9,7 +9,6 @@ import net.pterodactylus.sone.test.doThrow
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.mockBuilder
 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
@@ -60,32 +59,31 @@ class EditImagePageTest : WebPageTest() {
 
 	@Test
 	fun `get request does not redirect`() {
-		request("", GET)
 		page.processTemplate(freenetRequest, templateContext)
 	}
 
 	@Test
 	fun `post request with invalid image redirects to invalid page`() {
-		request("", POST)
+		setMethod(POST)
 		verifyRedirect("invalid.html")
 	}
 
 	@Test
 	fun `post request with valid image from non-local sone redirects to no permission page`() {
-		request("", POST)
+		setMethod(POST)
 		whenever(sone.isLocal).thenReturn(false)
 		addImage("image-id", image)
-		addHttpRequestParameter("image", "image-id")
+		addHttpRequestPart("image", "image-id")
 		verifyRedirect("noPermission.html")
 	}
 
 	@Test
 	fun `post request with valid image and move left requested moves image left and redirects to return page`() {
-		request("", POST)
+		setMethod(POST)
 		addImage("image-id", image)
-		addHttpRequestParameter("image", "image-id")
-		addHttpRequestParameter("returnPage", "return.html")
-		addHttpRequestParameter("moveLeft", "true")
+		addHttpRequestPart("image", "image-id")
+		addHttpRequestPart("returnPage", "return.html")
+		addHttpRequestPart("moveLeft", "true")
 		verifyRedirect("return.html") {
 			verify(album).moveImageUp(image)
 			verify(core).touchConfiguration()
@@ -94,11 +92,11 @@ class EditImagePageTest : WebPageTest() {
 
 	@Test
 	fun `post request with valid image and move right requested moves image right and redirects to return page`() {
-		request("", POST)
+		setMethod(POST)
 		addImage("image-id", image)
-		addHttpRequestParameter("image", "image-id")
-		addHttpRequestParameter("returnPage", "return.html")
-		addHttpRequestParameter("moveRight", "true")
+		addHttpRequestPart("image", "image-id")
+		addHttpRequestPart("returnPage", "return.html")
+		addHttpRequestPart("moveRight", "true")
 		verifyRedirect("return.html") {
 			verify(album).moveImageDown(image)
 			verify(core).touchConfiguration()
@@ -107,11 +105,11 @@ class EditImagePageTest : WebPageTest() {
 
 	@Test
 	fun `post request with valid image but only whitespace in the title redirects to empty image title page`() {
-		request("", POST)
+		setMethod(POST)
 		addImage("image-id", image)
-		addHttpRequestParameter("image", "image-id")
-		addHttpRequestParameter("returnPage", "return.html")
-		addHttpRequestParameter("title", "   ")
+		addHttpRequestPart("image", "image-id")
+		addHttpRequestPart("returnPage", "return.html")
+		addHttpRequestPart("title", "   ")
 		whenever(modifier.update()).doThrow<ImageTitleMustNotBeEmpty>()
 		verifyRedirect("emptyImageTitle.html") {
 			verify(core, never()).touchConfiguration()
@@ -120,12 +118,12 @@ class EditImagePageTest : WebPageTest() {
 
 	@Test
 	fun `post request with valid image title and description modifies image and redirects to reutrn page`() {
-		request("", POST)
+		setMethod(POST)
 		addImage("image-id", image)
-		addHttpRequestParameter("image", "image-id")
-		addHttpRequestParameter("returnPage", "return.html")
-		addHttpRequestParameter("title", "Title")
-		addHttpRequestParameter("description", "Description")
+		addHttpRequestPart("image", "image-id")
+		addHttpRequestPart("returnPage", "return.html")
+		addHttpRequestPart("title", "Title")
+		addHttpRequestPart("description", "Description")
 		verifyRedirect("return.html") {
 			verify(modifier).setTitle("Title")
 			verify(modifier).setDescription("Description")
@@ -136,13 +134,13 @@ class EditImagePageTest : WebPageTest() {
 
 	@Test
 	fun `post request with image title and description modifies image with filtered description and redirects to return page`() {
-		request("", POST)
+		setMethod(POST)
 		addImage("image-id", image)
-		addHttpRequestParameter("image", "image-id")
-		addHttpRequestParameter("returnPage", "return.html")
-		addHttpRequestParameter("title", "Title")
+		addHttpRequestPart("image", "image-id")
+		addHttpRequestPart("returnPage", "return.html")
+		addHttpRequestPart("title", "Title")
 		addHttpRequestHeader("Host", "www.te.st")
-		addHttpRequestParameter("description", "Get http://www.te.st/KSK@GPL.txt")
+		addHttpRequestPart("description", "Get http://www.te.st/KSK@GPL.txt")
 		verifyRedirect("return.html") {
 			verify(modifier).setTitle("Title")
 			verify(modifier).setDescription("Get KSK@GPL.txt")