X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FGetReplyAjaxPageTest.kt;h=6af8776a51ee8bc7d9fbdf1037515246f25d830e;hp=8fe16e2c361671f61264e0a5aea637c311fa218e;hb=43278c5468221baa16946a5206c3a4e97d543010;hpb=4ef415ab45a6c4c7410b0a0f9c3f393ffad53da9 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 --- 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",