X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FCreatePostAjaxPageTest.kt;h=8449453bbd24a82ffc7012ed1beabb3ea98a1f54;hb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae;hp=b153093fd29e85e505bbc69192ba7f3506a74f9a;hpb=a57c17c9a431eeb5925cc8a4e7500c53c9b3f412;p=Sone.git

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 b153093..8449453 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt
@@ -17,30 +17,20 @@ import org.junit.Test
 class CreatePostAjaxPageTest : JsonPageTest("createPost.ajax", pageSupplier = ::CreatePostAjaxPage) {
 
 	@Test
-	fun `page requires a current sone`() {
-		unsetCurrentSone()
-		assertThat(json.isSuccess, equalTo(false))
-		assertThat(json.error, equalTo("auth-required"))
-	}
-
-	@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
@@ -48,9 +38,9 @@ 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))
-		assertThat(json["postId"].asText(), equalTo("id"))
-		assertThat(json["sone"].asText(), equalTo(currentSone.id))
+		assertThatJsonIsSuccessful()
+		assertThat(json["postId"]?.asText(), equalTo("id"))
+		assertThat(json["sone"]?.asText(), equalTo(currentSone.id))
 		assertThat(json["recipient"], nullValue())
 	}
 
@@ -60,9 +50,9 @@ 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))
-		assertThat(json["postId"].asText(), equalTo("id"))
-		assertThat(json["sone"].asText(), equalTo(currentSone.id))
+		assertThatJsonIsSuccessful()
+		assertThat(json["postId"]?.asText(), equalTo("id"))
+		assertThat(json["sone"]?.asText(), equalTo(currentSone.id))
 		assertThat(json["recipient"], nullValue())
 	}
 
@@ -74,10 +64,10 @@ 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))
-		assertThat(json["postId"].asText(), equalTo("id"))
-		assertThat(json["sone"].asText(), equalTo(currentSone.id))
-		assertThat(json["recipient"].asText(), equalTo("valid"))
+		assertThatJsonIsSuccessful()
+		assertThat(json["postId"]?.asText(), equalTo("id"))
+		assertThat(json["sone"]?.asText(), equalTo(currentSone.id))
+		assertThat(json["recipient"]?.asText(), equalTo("valid"))
 	}
 
 	@Test
@@ -86,9 +76,9 @@ 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))
-		assertThat(json["postId"].asText(), equalTo("id"))
-		assertThat(json["sone"].asText(), equalTo(currentSone.id))
+		assertThatJsonIsSuccessful()
+		assertThat(json["postId"]?.asText(), equalTo("id"))
+		assertThat(json["sone"]?.asText(), equalTo(currentSone.id))
 		assertThat(json["recipient"], nullValue())
 	}