X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FCreatePostPageTest.kt;h=ef541728a685228ae7925096e99dc3e993f1ec73;hp=14f4fa3e56e5a12fb84990de3b3e53bdcd836abb;hb=bce70170ce5ddaa142e67fcc67985215e1eadac2;hpb=05fb821e72072bde52f383bdc5a988da67f66d0c

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt
index 14f4fa3..ef54172 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt
@@ -2,24 +2,22 @@ package net.pterodactylus.sone.web.pages
 
 import com.google.common.base.Optional.absent
 import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.test.asOptional
+import net.pterodactylus.sone.test.getInstance
 import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.CreatePostPage
+import net.pterodactylus.sone.utils.asOptional
+import net.pterodactylus.sone.web.baseInjector
+import net.pterodactylus.sone.web.page.*
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.notNullValue
 import org.junit.Test
 import org.mockito.Mockito.verify
 
 /**
  * Unit test for [CreatePostPage].
  */
-class CreatePostPageTest: WebPageTest() {
-
-	private val page = CreatePostPage(template, webInterface)
-
-	override fun getPage() = page
+class CreatePostPageTest: WebPageTest(::CreatePostPage) {
 
 	@Test
 	fun `page returns correct path`() {
@@ -40,7 +38,7 @@ class CreatePostPageTest: WebPageTest() {
 
 	@Test
 	fun `post is created correctly`() {
-		request("", POST)
+		setMethod(POST)
 		addHttpRequestPart("returnPage", "return.html")
 		addHttpRequestPart("text", "post text")
 		verifyRedirect("return.html") {
@@ -50,7 +48,7 @@ class CreatePostPageTest: WebPageTest() {
 
 	@Test
 	fun `creating an empty post is denied`() {
-		request("", POST)
+		setMethod(POST)
 		addHttpRequestPart("returnPage", "return.html")
 		addHttpRequestPart("text", "  ")
 		page.processTemplate(freenetRequest, templateContext)
@@ -59,7 +57,7 @@ class CreatePostPageTest: WebPageTest() {
 
 	@Test
 	fun `a sender can be selected`() {
-		request("", POST)
+		setMethod(POST)
 		addHttpRequestPart("returnPage", "return.html")
 		addHttpRequestPart("text", "post text")
 		addHttpRequestPart("sender", "sender-id")
@@ -72,7 +70,7 @@ class CreatePostPageTest: WebPageTest() {
 
 	@Test
 	fun `a recipient can be selected`() {
-		request("", POST)
+		setMethod(POST)
 		addHttpRequestPart("returnPage", "return.html")
 		addHttpRequestPart("text", "post text")
 		addHttpRequestPart("recipient", "recipient-id")
@@ -85,7 +83,7 @@ class CreatePostPageTest: WebPageTest() {
 
 	@Test
 	fun `text is filtered correctly`() {
-		request("", POST)
+		setMethod(POST)
 		addHttpRequestPart("returnPage", "return.html")
 		addHttpRequestPart("text", "post http://localhost:12345/KSK@foo text")
 		addHttpRequestHeader("Host", "localhost:12345")
@@ -94,4 +92,14 @@ class CreatePostPageTest: WebPageTest() {
 		}
 	}
 
+	@Test
+	fun `page can be created by dependency injection`() {
+	    assertThat(baseInjector.getInstance<CreatePostPage>(), notNullValue())
+	}
+
+	@Test
+	fun `page is annotated with correct template path`() {
+	    assertThat(page.templatePath, equalTo("/templates/createPost.html"))
+	}
+
 }