X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FEditImageAjaxPageTest.kt;h=dad6c02917d7ff7bc615396a59ab43a005183173;hb=9db5ef551b000dc6e9b6f6683a2cce3b8e2f5223;hp=6a3d89ca12662348aa4b74d85fab1a4b8abb01f4;hpb=51b58fad3a00b2d9cae45345ac066e89233ba0b5;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditImageAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditImageAjaxPageTest.kt
index 6a3d89c..dad6c02 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditImageAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditImageAjaxPageTest.kt
@@ -29,8 +29,7 @@ class EditImageAjaxPageTest : JsonPageTest("editImage.ajax") {
 
 	@Test
 	fun `request without image results in invalid-image-id`() {
-		assertThat(json.isSuccess, equalTo(false))
-		assertThat(json.error, equalTo("invalid-image-id"))
+		assertThatJsonFailed("invalid-image-id")
 	}
 
 	@Test
@@ -40,8 +39,7 @@ class EditImageAjaxPageTest : JsonPageTest("editImage.ajax") {
 		whenever(image.sone).thenReturn(sone)
 		addImage(image, "image-id")
 		addRequestParameter("image", "image-id")
-		assertThat(json.isSuccess, equalTo(false))
-		assertThat(json.error, equalTo("not-authorized"))
+		assertThatJsonFailed("not-authorized")
 	}
 
 	@Test
@@ -56,9 +54,9 @@ class EditImageAjaxPageTest : JsonPageTest("editImage.ajax") {
 		addImage(image)
 		addRequestParameter("image", "image-id")
 		addRequestParameter("moveLeft", "true")
-		assertThat(json.isSuccess, equalTo(true))
-		assertThat(json["sourceImageId"].asText(), equalTo("image-id"))
-		assertThat(json["destinationImageId"].asText(), equalTo("swapped"))
+		assertThatJsonIsSuccessful()
+		assertThat(json["sourceImageId"]?.asText(), equalTo("image-id"))
+		assertThat(json["destinationImageId"]?.asText(), equalTo("swapped"))
 		verify(core).touchConfiguration()
 	}
 
@@ -74,9 +72,9 @@ class EditImageAjaxPageTest : JsonPageTest("editImage.ajax") {
 		addImage(image)
 		addRequestParameter("image", "image-id")
 		addRequestParameter("moveRight", "true")
-		assertThat(json.isSuccess, equalTo(true))
-		assertThat(json["sourceImageId"].asText(), equalTo("image-id"))
-		assertThat(json["destinationImageId"].asText(), equalTo("swapped"))
+		assertThatJsonIsSuccessful()
+		assertThat(json["sourceImageId"]?.asText(), equalTo("image-id"))
+		assertThat(json["destinationImageId"]?.asText(), equalTo("swapped"))
 		verify(core).touchConfiguration()
 	}
 
@@ -87,8 +85,7 @@ class EditImageAjaxPageTest : JsonPageTest("editImage.ajax") {
 		whenever(image.sone).thenReturn(sone)
 		addImage(image)
 		addRequestParameter("image", "image-id")
-		assertThat(json.isSuccess, equalTo(false))
-		assertThat(json.error, equalTo("invalid-image-title"))
+		assertThatJsonFailed("invalid-image-title")
 	}
 
 	@Test
@@ -106,10 +103,10 @@ class EditImageAjaxPageTest : JsonPageTest("editImage.ajax") {
 		addRequestParameter("title", "some title")
 		addRequestParameter("description", "some http://127.0.0.1:8888/KSK@foo link")
 		addRequestHeader("Host", "127.0.0.1:8888")
-		assertThat(json.isSuccess, equalTo(true))
-		assertThat(json["title"].asText(), equalTo("some title"))
-		assertThat(json["description"].asText(), equalTo("some KSK@foo link"))
-		assertThat(json["parsedDescription"].asText(), equalTo("rendered description"))
+		assertThatJsonIsSuccessful()
+		assertThat(json["title"]?.asText(), equalTo("some title"))
+		assertThat(json["description"]?.asText(), equalTo("some KSK@foo link"))
+		assertThat(json["parsedDescription"]?.asText(), equalTo("rendered description"))
 		verify(core).touchConfiguration()
 		val parameterCaptor = argumentCaptor<MutableMap<String, Any?>>()
 		verify(parserFilter).format(any(), any(), parameterCaptor.capture())