X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FUploadImagePageTest.kt;h=8bea89e6975f09f9cbc62736855a9efbbecd5abe;hb=5ba707d40f9d2a20094aaabc21647aeec1feed46;hp=232601b6a71117043fd876d19af6efc1635e49e5;hpb=de7568a82eb4150bf6d2b0553841b7b69f84c968;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/UploadImagePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/UploadImagePageTest.kt
index 232601b..8bea89e 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/UploadImagePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/UploadImagePageTest.kt
@@ -8,7 +8,6 @@ import net.pterodactylus.sone.data.TemporaryImage
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.mockBuilder
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.UploadImagePage
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
@@ -39,14 +38,14 @@ class UploadImagePageTest : WebPageTest() {
 
 	@Test
 	fun `post request without parent results in no permission error page`() {
-		request("", POST)
+		setMethod(POST)
 		verifyRedirect("noPermission.html")
 	}
 
 	@Test
 	fun `post request with parent that is not the current sone results in no permission error page`() {
-		request("", POST)
-		addHttpRequestParameter("parent", "parent-id")
+		setMethod(POST)
+		addHttpRequestPart("parent", "parent-id")
 		whenever(parentAlbum.sone).thenReturn(mock<Sone>())
 		addAlbum("parent-id", parentAlbum)
 		verifyRedirect("noPermission.html")
@@ -54,19 +53,19 @@ class UploadImagePageTest : WebPageTest() {
 
 	@Test
 	fun `post request with empty name redirects to error page`() {
-		request("", POST)
+		setMethod(POST)
 		addAlbum("parent-id", parentAlbum)
-		addHttpRequestParameter("parent", "parent-id")
-		addHttpRequestParameter("title", " ")
+		addHttpRequestPart("parent", "parent-id")
+		addHttpRequestPart("title", " ")
 		verifyRedirect("emptyImageTitle.html")
 	}
 
 	@Test
 	fun `uploading an invalid image results in no redirect and message set in template context`() {
-		request("", POST)
+		setMethod(POST)
 		addAlbum("parent-id", parentAlbum)
-		addHttpRequestParameter("parent", "parent-id")
-		addHttpRequestParameter("title", "title")
+		addHttpRequestPart("parent", "parent-id")
+		addHttpRequestPart("title", "title")
 		addUploadedFile("image", "image.png", "image/png", "no-image.png")
 		page.handleRequest(freenetRequest, templateContext)
 		verify(core, never()).createTemporaryImage(any(), any())
@@ -75,11 +74,11 @@ class UploadImagePageTest : WebPageTest() {
 
 	@Test
 	fun `uploading a valid image uploads image and redirects to album browser`() {
-		request("", POST)
+		setMethod(POST)
 		addAlbum("parent-id", parentAlbum)
-		addHttpRequestParameter("parent", "parent-id")
-		addHttpRequestParameter("title", "Title")
-		addHttpRequestParameter("description", "Description")
+		addHttpRequestPart("parent", "parent-id")
+		addHttpRequestPart("title", "Title")
+		addHttpRequestPart("description", "Description")
 		addUploadedFile("image", "image.png", "image/png", "image.png")
 		val temporaryImage = TemporaryImage("temp-image")
 		val imageModifier = mockBuilder<Modifier>()