X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FEditImagePageTest.kt;h=ac710d58bda9b362b1912c13cf33ccb922d61d50;hb=0c10757cf47fb6cff802eb138c44d5537b2ab87c;hp=810e1495b701cc370aa9a72e2b9010222ecb85b9;hpb=d42da49d38b464416be5d74c167ef6b02bd1ccc7;p=Sone.git

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 810e149..ac710d5 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt
@@ -3,7 +3,9 @@ package net.pterodactylus.sone.web.pages
 import net.pterodactylus.sone.data.Album
 import net.pterodactylus.sone.data.Image
 import net.pterodactylus.sone.data.Image.Modifier
+import net.pterodactylus.sone.data.Image.Modifier.ImageTitleMustNotBeEmpty
 import net.pterodactylus.sone.data.Sone
+import net.pterodactylus.sone.test.doThrow
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.mockBuilder
 import net.pterodactylus.sone.test.whenever
@@ -59,7 +61,7 @@ class EditImagePageTest : WebPageTest() {
 	@Test
 	fun `get request does not redirect`() {
 		request("", GET)
-		page.handleRequest(freenetRequest, templateContext)
+		page.processTemplate(freenetRequest, templateContext)
 	}
 
 	@Test
@@ -73,7 +75,7 @@ class EditImagePageTest : WebPageTest() {
 		request("", POST)
 		whenever(sone.isLocal).thenReturn(false)
 		addImage("image-id", image)
-		addHttpRequestParameter("image", "image-id")
+		addHttpRequestPart("image", "image-id")
 		verifyRedirect("noPermission.html")
 	}
 
@@ -81,9 +83,9 @@ class EditImagePageTest : WebPageTest() {
 	fun `post request with valid image and move left requested moves image left and redirects to return page`() {
 		request("", 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,9 +96,9 @@ class EditImagePageTest : WebPageTest() {
 	fun `post request with valid image and move right requested moves image right and redirects to return page`() {
 		request("", 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,9 +109,10 @@ class EditImagePageTest : WebPageTest() {
 	fun `post request with valid image but only whitespace in the title redirects to empty image title page`() {
 		request("", 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()
 		}
@@ -119,10 +122,10 @@ class EditImagePageTest : WebPageTest() {
 	fun `post request with valid image title and description modifies image and redirects to reutrn page`() {
 		request("", 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")
@@ -132,14 +135,14 @@ class EditImagePageTest : WebPageTest() {
 	}
 
 	@Test
-	fun `post request with image title and description modifies image with filtered description and redirects to reutrn page`() {
+	fun `post request with image title and description modifies image with filtered description and redirects to return page`() {
 		request("", 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")