X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FEditAlbumAjaxPageTest.kt;h=098185b98edb6be431ee1a8ad9e7122f7bd3ae70;hb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae;hp=2d1836676247392895157b28330ae151891c3235;hpb=b6dc376162d13042d430c0cdccc7e53c92e4a690;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPageTest.kt
index 2d18366..098185b 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPageTest.kt
@@ -22,8 +22,7 @@ class EditAlbumAjaxPageTest : JsonPageTest("editAlbum.ajax", pageSupplier = ::Ed
 
 	@Test
 	fun `request without album results in invalid-album-id`() {
-		assertThat(json.isSuccess, equalTo(false))
-		assertThat(json.error, equalTo("invalid-album-id"))
+		assertThatJsonFailed("invalid-album-id")
 	}
 
 	@Test
@@ -31,8 +30,7 @@ class EditAlbumAjaxPageTest : JsonPageTest("editAlbum.ajax", pageSupplier = ::Ed
 		whenever(album.sone).thenReturn(sone)
 		addAlbum(album)
 		addRequestParameter("album", "album-id")
-		assertThat(json.isSuccess, equalTo(false))
-		assertThat(json.error, equalTo("not-authorized"))
+		assertThatJsonFailed("not-authorized")
 	}
 
 	@Test
@@ -45,9 +43,9 @@ class EditAlbumAjaxPageTest : JsonPageTest("editAlbum.ajax", pageSupplier = ::Ed
 		addAlbum(album)
 		addRequestParameter("album", "album-id")
 		addRequestParameter("moveLeft", "true")
-		assertThat(json.isSuccess, equalTo(true))
-		assertThat(json["sourceAlbumId"].asText(), equalTo("album-id"))
-		assertThat(json["destinationAlbumId"].asText(), equalTo("swapped"))
+		assertThatJsonIsSuccessful()
+		assertThat(json["sourceAlbumId"]?.asText(), equalTo("album-id"))
+		assertThat(json["destinationAlbumId"]?.asText(), equalTo("swapped"))
 	}
 
 	@Test
@@ -60,9 +58,9 @@ class EditAlbumAjaxPageTest : JsonPageTest("editAlbum.ajax", pageSupplier = ::Ed
 		addAlbum(album)
 		addRequestParameter("album", "album-id")
 		addRequestParameter("moveRight", "true")
-		assertThat(json.isSuccess, equalTo(true))
-		assertThat(json["sourceAlbumId"].asText(), equalTo("album-id"))
-		assertThat(json["destinationAlbumId"].asText(), equalTo("swapped"))
+		assertThatJsonIsSuccessful()
+		assertThat(json["sourceAlbumId"]?.asText(), equalTo("album-id"))
+		assertThat(json["destinationAlbumId"]?.asText(), equalTo("swapped"))
 	}
 
 	@Test
@@ -72,8 +70,7 @@ class EditAlbumAjaxPageTest : JsonPageTest("editAlbum.ajax", pageSupplier = ::Ed
 		whenever(album.modify().setTitle("")).thenThrow(AlbumTitleMustNotBeEmpty::class.java)
 		addAlbum(album)
 		addRequestParameter("album", "album-id")
-		assertThat(json.isSuccess, equalTo(false))
-		assertThat(json.error, equalTo("invalid-album-title"))
+		assertThatJsonFailed("invalid-album-title")
 	}
 
 	@Test
@@ -84,10 +81,10 @@ class EditAlbumAjaxPageTest : JsonPageTest("editAlbum.ajax", pageSupplier = ::Ed
 		addRequestParameter("title", "new title")
 		addRequestParameter("description", "foo http://127.0.0.1:8888/KSK@foo.html link")
 		addRequestHeader("Host", "127.0.0.1:8888")
-		assertThat(json.isSuccess, equalTo(true))
-		assertThat(json["albumId"].asText(), equalTo("album-id"))
-		assertThat(json["title"].asText(), equalTo("new title"))
-		assertThat(json["description"].asText(), equalTo("foo KSK@foo.html link"))
+		assertThatJsonIsSuccessful()
+		assertThat(json["albumId"]?.asText(), equalTo("album-id"))
+		assertThat(json["title"]?.asText(), equalTo("new title"))
+		assertThat(json["description"]?.asText(), equalTo("foo KSK@foo.html link"))
 	}
 
 }