Move assertions to base class

[Sone.git] / src / test / kotlin / net / pterodactylus / sone / web / ajax / GetPostAjaxPageTest.kt

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetPostAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetPostAjaxPageTest.kt
index 768a186..8d33542 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetPostAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetPostAjaxPageTest.kt
@@ -21,8 +21,7 @@ class GetPostAjaxPageTest : JsonPageTest("getPost.ajax", needsFormPassword = fal
 
        @Test
        fun `request with missing post results in invalid-post-id`() {
-               assertThat(json.isSuccess, equalTo(false))
-               assertThat(json.error, equalTo("invalid-post-id"))
+               assertThatJsonFailed("invalid-post-id")
        }
 
        @Test
@@ -38,12 +37,12 @@ class GetPostAjaxPageTest : JsonPageTest("getPost.ajax", needsFormPassword = fal
                webInterface.templateContextFactory.addAccessor(Any::class.java, ReflectionAccessor())
                addPost(post)
                addRequestParameter("post", "post-id")
-               assertThat(json.isSuccess, equalTo(true))
-               assertThat(json["post"]["id"].asText(), equalTo("post-id"))
-               assertThat(json["post"]["time"].asLong(), equalTo(1000L))
-               assertThat(json["post"]["sone"].asText(), equalTo("sone-id"))
-               assertThat(json["post"]["recipient"].asText(), equalTo("recipient-id"))
-               assertThat(json["post"]["html"].asText(), equalTo(listOf(
+               assertThatJsonIsSuccessful()
+               assertThat(json["post"]!!["id"].asText(), equalTo("post-id"))
+               assertThat(json["post"]!!["time"].asLong(), equalTo(1000L))
+               assertThat(json["post"]!!["sone"].asText(), equalTo("sone-id"))
+               assertThat(json["post"]!!["recipient"].asText(), equalTo("recipient-id"))
+               assertThat(json["post"]!!["html"].asText(), equalTo(listOf(
                                core.toString(),
                                freenetRequest.toString(),
                                "post text",