Replace JSON return object with Kotlin version

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

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 0588b6a..8d7e521 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt
@@ -14,29 +14,7 @@ import org.junit.Test
 /**
  * Unit test for [CreatePostAjaxPage].
  */
-class CreatePostAjaxPageTest : JsonPageTest(::CreatePostAjaxPage) {
-
-       @Test
-       fun `page returns correct path`() {
-               assertThat(page.path, equalTo("createPost.ajax"))
-       }
-
-       @Test
-       fun `page needs form password`() {
-               assertThat(page.needsFormPassword(), equalTo(true))
-       }
-
-       @Test
-       fun `page requires login`() {
-               assertThat(page.requiresLogin(), equalTo(true))
-       }
-
-       @Test
-       fun `page requires a current sone`() {
-               unsetCurrentSone()
-               assertThat(json.isSuccess, equalTo(false))
-               assertThat(json.error, equalTo("auth-required"))
-       }
+class CreatePostAjaxPageTest : JsonPageTest("createPost.ajax", pageSupplier = ::CreatePostAjaxPage) {
 
        @Test
        fun `missing text parameter returns error`() {
@@ -64,8 +42,8 @@ class CreatePostAjaxPageTest : JsonPageTest(::CreatePostAjaxPage) {
                val post = createPost()
                whenever(core.createPost(currentSone, Optional.absent(), "test")).thenReturn(post)
                assertThat(json.isSuccess, equalTo(true))
-               assertThat(json["postId"].asText(), equalTo("id"))
-               assertThat(json["sone"].asText(), equalTo(currentSone.id))
+               assertThat(json["postId"]?.asText(), equalTo("id"))
+               assertThat(json["sone"]?.asText(), equalTo(currentSone.id))
                assertThat(json["recipient"], nullValue())
        }
 
@@ -76,8 +54,8 @@ class CreatePostAjaxPageTest : JsonPageTest(::CreatePostAjaxPage) {
                val post = createPost()
                whenever(core.createPost(currentSone, Optional.absent(), "test")).thenReturn(post)
                assertThat(json.isSuccess, equalTo(true))
-               assertThat(json["postId"].asText(), equalTo("id"))
-               assertThat(json["sone"].asText(), equalTo(currentSone.id))
+               assertThat(json["postId"]?.asText(), equalTo("id"))
+               assertThat(json["sone"]?.asText(), equalTo(currentSone.id))
                assertThat(json["recipient"], nullValue())
        }
 
@@ -90,9 +68,9 @@ class CreatePostAjaxPageTest : JsonPageTest(::CreatePostAjaxPage) {
                val post = createPost("valid")
                whenever(core.createPost(currentSone, Optional.of(recipient), "test")).thenReturn(post)
                assertThat(json.isSuccess, equalTo(true))
-               assertThat(json["postId"].asText(), equalTo("id"))
-               assertThat(json["sone"].asText(), equalTo(currentSone.id))
-               assertThat(json["recipient"].asText(), equalTo("valid"))
+               assertThat(json["postId"]?.asText(), equalTo("id"))
+               assertThat(json["sone"]?.asText(), equalTo(currentSone.id))
+               assertThat(json["recipient"]?.asText(), equalTo("valid"))
        }
 
        @Test
@@ -102,8 +80,8 @@ class CreatePostAjaxPageTest : JsonPageTest(::CreatePostAjaxPage) {
                val post = createPost()
                whenever(core.createPost(currentSone, Optional.absent(), "Link KSK@foo is filtered")).thenReturn(post)
                assertThat(json.isSuccess, equalTo(true))
-               assertThat(json["postId"].asText(), equalTo("id"))
-               assertThat(json["sone"].asText(), equalTo(currentSone.id))
+               assertThat(json["postId"]?.asText(), equalTo("id"))
+               assertThat(json["sone"]?.asText(), equalTo(currentSone.id))
                assertThat(json["recipient"], nullValue())
        }