Move assertions to base class

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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetReplyAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetReplyAjaxPageTest.kt
index 8fe16e2..6af8776 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetReplyAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/GetReplyAjaxPageTest.kt
@@ -20,8 +20,7 @@ class GetReplyAjaxPageTest : JsonPageTest("getReply.ajax", needsFormPassword = f
 
        @Test
        fun `request without reply id results in invalid-reply-id`() {
-               assertThat(json.isSuccess, equalTo(false))
-               assertThat(json.error, equalTo("invalid-reply-id"))
+               assertThatJsonFailed("invalid-reply-id")
        }
 
        @Test
@@ -37,12 +36,12 @@ class GetReplyAjaxPageTest : JsonPageTest("getReply.ajax", needsFormPassword = f
                webInterface.templateContextFactory.addAccessor(Any::class.java, ReflectionAccessor())
                addReply(reply)
                addRequestParameter("reply", "reply-id")
-               assertThat(json.isSuccess, equalTo(true))
-               assertThat(json["reply"]["id"].asText(), equalTo("reply-id"))
-               assertThat(json["reply"]["soneId"].asText(), equalTo("sone-id"))
-               assertThat(json["reply"]["postId"].asText(), equalTo("post-id"))
-               assertThat(json["reply"]["time"].asLong(), equalTo(1000L))
-               assertThat(json["reply"]["html"].asText(), equalTo(listOf(
+               assertThatJsonIsSuccessful()
+               assertThat(json["reply"]!!["id"].asText(), equalTo("reply-id"))
+               assertThat(json["reply"]!!["soneId"].asText(), equalTo("sone-id"))
+               assertThat(json["reply"]!!["postId"].asText(), equalTo("post-id"))
+               assertThat(json["reply"]!!["time"].asLong(), equalTo(1000L))
+               assertThat(json["reply"]!!["html"].asText(), equalTo(listOf(
                                core.toString(),
                                freenetRequest.toString(),
                                "reply text",