Move assertions to base class

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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPageTest.kt
index 6b110ae..829167e 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPageTest.kt
@@ -16,8 +16,7 @@ class CreateReplyAjaxPageTest : JsonPageTest("createReply.ajax", pageSupplier =
 
        @Test
        fun `invalid post ID results in error message`() {
-           assertThat(json.isSuccess, equalTo(false))
-               assertThat(json.error, equalTo("invalid-post-id"))
+               assertThatJsonFailed("invalid-post-id")
        }
 
        @Test
@@ -27,9 +26,9 @@ class CreateReplyAjaxPageTest : JsonPageTest("createReply.ajax", pageSupplier =
                val reply = mock<PostReply>().apply { whenever(id).thenReturn("reply-id") }
                whenever(core.createReply(currentSone, post, "")).thenReturn(reply)
            addRequestParameter("post", "post-id")
-               assertThat(json.isSuccess, equalTo(true))
-               assertThat(json["reply"].asText(), equalTo("reply-id"))
-               assertThat(json["sone"].asText(), equalTo("soneId"))
+               assertThatJsonIsSuccessful()
+               assertThat(json["reply"]?.asText(), equalTo("reply-id"))
+               assertThat(json["sone"]?.asText(), equalTo("soneId"))
        }
 
        @Test
@@ -41,15 +40,15 @@ class CreateReplyAjaxPageTest : JsonPageTest("createReply.ajax", pageSupplier =
                addRequestParameter("post", "post-id")
                addRequestParameter("text", "Text with http://127.0.0.1:8888/KSK@foo.bar link")
                addRequestHeader("Host", "127.0.0.1:8888")
-               assertThat(json.isSuccess, equalTo(true))
-               assertThat(json["reply"].asText(), equalTo("reply-id"))
-               assertThat(json["sone"].asText(), equalTo("soneId"))
+               assertThatJsonIsSuccessful()
+               assertThat(json["reply"]?.asText(), equalTo("reply-id"))
+               assertThat(json["sone"]?.asText(), equalTo("soneId"))
        }
 
        @Test
        fun `sender can be chosen from local sones`() {
            val sone = mock<Sone>().apply { whenever(id).thenReturn("local-sone") }
-               addLocalSone("local-sone", sone)
+               addLocalSone(sone)
                val post = mock<Post>()
                addPost(post, "post-id")
                val reply = mock<PostReply>().apply { whenever(id).thenReturn("reply-id") }
@@ -57,9 +56,9 @@ class CreateReplyAjaxPageTest : JsonPageTest("createReply.ajax", pageSupplier =
                addRequestParameter("post", "post-id")
                addRequestParameter("text", "Text")
                addRequestParameter("sender", "local-sone")
-               assertThat(json.isSuccess, equalTo(true))
-               assertThat(json["reply"].asText(), equalTo("reply-id"))
-               assertThat(json["sone"].asText(), equalTo("local-sone"))
+               assertThatJsonIsSuccessful()
+               assertThat(json["reply"]?.asText(), equalTo("reply-id"))
+               assertThat(json["sone"]?.asText(), equalTo("local-sone"))
        }
 
 }