X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FCreatePostAjaxPageTest.kt;h=8449453bbd24a82ffc7012ed1beabb3ea98a1f54;hp=8d7e52134094456ccd950b6688fe85537791ed2c;hb=43278c5468221baa16946a5206c3a4e97d543010;hpb=d58ef344b43543fdcfca13c07df87e194f004376 diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt index 8d7e521..8449453 100644 --- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt @@ -18,22 +18,19 @@ class CreatePostAjaxPageTest : JsonPageTest("createPost.ajax", pageSupplier = :: @Test fun `missing text parameter returns error`() { - assertThat(json.isSuccess, equalTo(false)) - assertThat(json.error, equalTo("text-required")) + assertThatJsonFailed("text-required") } @Test fun `empty text returns error`() { addRequestParameter("text", "") - assertThat(json.isSuccess, equalTo(false)) - assertThat(json.error, equalTo("text-required")) + assertThatJsonFailed("text-required") } @Test fun `whitespace-only text returns error`() { addRequestParameter("text", " ") - assertThat(json.isSuccess, equalTo(false)) - assertThat(json.error, equalTo("text-required")) + assertThatJsonFailed("text-required") } @Test @@ -41,7 +38,7 @@ class CreatePostAjaxPageTest : JsonPageTest("createPost.ajax", pageSupplier = :: addRequestParameter("text", "test") val post = createPost() whenever(core.createPost(currentSone, Optional.absent(), "test")).thenReturn(post) - assertThat(json.isSuccess, equalTo(true)) + assertThatJsonIsSuccessful() assertThat(json["postId"]?.asText(), equalTo("id")) assertThat(json["sone"]?.asText(), equalTo(currentSone.id)) assertThat(json["recipient"], nullValue()) @@ -53,7 +50,7 @@ class CreatePostAjaxPageTest : JsonPageTest("createPost.ajax", pageSupplier = :: addRequestParameter("recipient", "invalid") val post = createPost() whenever(core.createPost(currentSone, Optional.absent(), "test")).thenReturn(post) - assertThat(json.isSuccess, equalTo(true)) + assertThatJsonIsSuccessful() assertThat(json["postId"]?.asText(), equalTo("id")) assertThat(json["sone"]?.asText(), equalTo(currentSone.id)) assertThat(json["recipient"], nullValue()) @@ -67,7 +64,7 @@ class CreatePostAjaxPageTest : JsonPageTest("createPost.ajax", pageSupplier = :: addSone(recipient) val post = createPost("valid") whenever(core.createPost(currentSone, Optional.of(recipient), "test")).thenReturn(post) - assertThat(json.isSuccess, equalTo(true)) + assertThatJsonIsSuccessful() assertThat(json["postId"]?.asText(), equalTo("id")) assertThat(json["sone"]?.asText(), equalTo(currentSone.id)) assertThat(json["recipient"]?.asText(), equalTo("valid")) @@ -79,7 +76,7 @@ class CreatePostAjaxPageTest : JsonPageTest("createPost.ajax", pageSupplier = :: addRequestHeader("Host", "freenet.test:8888") val post = createPost() whenever(core.createPost(currentSone, Optional.absent(), "Link KSK@foo is filtered")).thenReturn(post) - assertThat(json.isSuccess, equalTo(true)) + assertThatJsonIsSuccessful() assertThat(json["postId"]?.asText(), equalTo("id")) assertThat(json["sone"]?.asText(), equalTo(currentSone.id)) assertThat(json["recipient"], nullValue())