Move assertions to base class

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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPageTest.kt
index 1b40f98..c649e75 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPageTest.kt
@@ -15,15 +15,14 @@ class FollowSoneAjaxPageTest : JsonPageTest("followSone.ajax", pageSupplier = ::
 
        @Test
        fun `request without sone id results in invalid-sone-id`() {
 
        @Test
        fun `request without sone id results in invalid-sone-id`() {

-               assertThat(json.isSuccess, equalTo(false))
-               assertThat(json.error, equalTo("invalid-sone-id"))
+               assertThatJsonFailed("invalid-sone-id")

        }
 
        @Test
        fun `request with sone follows sone`() {
                addSone(mock<Sone>().apply { whenever(id).thenReturn("sone-id") })
                addRequestParameter("sone", "sone-id")
        }
 
        @Test
        fun `request with sone follows sone`() {
                addSone(mock<Sone>().apply { whenever(id).thenReturn("sone-id") })
                addRequestParameter("sone", "sone-id")

-               assertThat(json.isSuccess, equalTo(true))
+               assertThatJsonIsSuccessful()

                verify(core).followSone(currentSone, "sone-id")
        }
 
                verify(core).followSone(currentSone, "sone-id")
        }
 


@@ -32,7 +31,7 @@ class FollowSoneAjaxPageTest : JsonPageTest("followSone.ajax", pageSupplier = ::
                val sone = mock<Sone>()
                addSone(sone, "sone-id")
                addRequestParameter("sone", "sone-id")
                val sone = mock<Sone>()
                addSone(sone, "sone-id")
                addRequestParameter("sone", "sone-id")

-               assertThat(json.isSuccess, equalTo(true))
+               assertThatJsonIsSuccessful()

                verify(core).markSoneKnown(sone)
        }
 
                verify(core).markSoneKnown(sone)
        }