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

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..dfb9aca 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
@@ -32,21 +31,22 @@ class UploadImagePageTest : WebPageTest() {
 
 	@Test
 	fun `get request does not redirect or upload anything`() {
-		page.handleRequest(freenetRequest, templateContext)
-		verify(core, never()).createTemporaryImage(any(), any())
-		verify(core, never()).createImage(any(), any(), any())
+		verifyNoRedirect {
+			verify(core, never()).createTemporaryImage(any(), any())
+			verify(core, never()).createImage(any(), any(), any())
+		}
 	}
 
 	@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,32 +54,33 @@ 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())
-		assertThat(templateContext["messages"] as String?, equalTo<String>("Page.UploadImage.Error.InvalidImage"))
+		verifyNoRedirect {
+			verify(core, never()).createTemporaryImage(any(), any())
+			assertThat(templateContext["messages"] as String?, equalTo<String>("Page.UploadImage.Error.InvalidImage"))
+		}
 	}
 
 	@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>()