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=821198fe4fea924a6322bba13ebb8f54967dd933;hp=8d7e52134094456ccd950b6688fe85537791ed2c;hb=ea7ad5e87074576d17b7df74365a726bd95d7665;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..821198f 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/CreatePostAjaxPageTest.kt
@@ -3,11 +3,14 @@ package net.pterodactylus.sone.web.ajax
 import com.google.common.base.Optional
 import net.pterodactylus.sone.data.Post
 import net.pterodactylus.sone.data.Sone
+import net.pterodactylus.sone.test.getInstance
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
 import net.pterodactylus.sone.utils.asOptional
+import net.pterodactylus.sone.web.baseInjector
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.notNullValue
 import org.hamcrest.Matchers.nullValue
 import org.junit.Test
 
@@ -18,22 +21,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 +41,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 +53,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 +67,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 +79,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())
@@ -92,4 +92,9 @@ class CreatePostAjaxPageTest : JsonPageTest("createPost.ajax", pageSupplier = ::
 				whenever(this.recipientId).thenReturn(recipientId.asOptional())
 			}
 
+	@Test
+	fun `page can be created by dependency injection`() {
+	    assertThat(baseInjector.getInstance<CreatePostAjaxPage>(), notNullValue())
+	}
+
 }