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=45a2451ba2ac5a03f5e8146088755f323c775969;hb=110a933c2724aba6a604fc5eed6372ff1e1e6144;hpb=de7568a82eb4150bf6d2b0553841b7b69f84c968

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 45a2451..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`() {
@@ -33,16 +31,16 @@ class CreatePostPageTest: WebPageTest() {
 
 	@Test
 	fun `return page is set in template context`() {
-		addHttpRequestParameter("returnPage", "return.html")
+		addHttpRequestPart("returnPage", "return.html")
 		page.processTemplate(freenetRequest, templateContext)
 		assertThat(templateContext["returnPage"], equalTo<Any>("return.html"))
 	}
 
 	@Test
 	fun `post is created correctly`() {
-		request("", POST)
-		addHttpRequestParameter("returnPage", "return.html")
-		addHttpRequestParameter("text", "post text")
+		setMethod(POST)
+		addHttpRequestPart("returnPage", "return.html")
+		addHttpRequestPart("text", "post text")
 		verifyRedirect("return.html") {
 			verify(core).createPost(currentSone, absent(), "post text")
 		}
@@ -50,19 +48,19 @@ class CreatePostPageTest: WebPageTest() {
 
 	@Test
 	fun `creating an empty post is denied`() {
-		request("", POST)
-		addHttpRequestParameter("returnPage", "return.html")
-		addHttpRequestParameter("text", "  ")
+		setMethod(POST)
+		addHttpRequestPart("returnPage", "return.html")
+		addHttpRequestPart("text", "  ")
 		page.processTemplate(freenetRequest, templateContext)
 		assertThat(templateContext["errorTextEmpty"], equalTo<Any>(true))
 	}
 
 	@Test
 	fun `a sender can be selected`() {
-		request("", POST)
-		addHttpRequestParameter("returnPage", "return.html")
-		addHttpRequestParameter("text", "post text")
-		addHttpRequestParameter("sender", "sender-id")
+		setMethod(POST)
+		addHttpRequestPart("returnPage", "return.html")
+		addHttpRequestPart("text", "post text")
+		addHttpRequestPart("sender", "sender-id")
 		val sender = mock<Sone>()
 		addLocalSone("sender-id", sender)
 		verifyRedirect("return.html") {
@@ -72,10 +70,10 @@ class CreatePostPageTest: WebPageTest() {
 
 	@Test
 	fun `a recipient can be selected`() {
-		request("", POST)
-		addHttpRequestParameter("returnPage", "return.html")
-		addHttpRequestParameter("text", "post text")
-		addHttpRequestParameter("recipient", "recipient-id")
+		setMethod(POST)
+		addHttpRequestPart("returnPage", "return.html")
+		addHttpRequestPart("text", "post text")
+		addHttpRequestPart("recipient", "recipient-id")
 		val recipient = mock<Sone>()
 		addSone("recipient-id", recipient)
 		verifyRedirect("return.html") {
@@ -85,13 +83,23 @@ class CreatePostPageTest: WebPageTest() {
 
 	@Test
 	fun `text is filtered correctly`() {
-		request("", POST)
-		addHttpRequestParameter("returnPage", "return.html")
-		addHttpRequestParameter("text", "post http://localhost:12345/KSK@foo text")
+		setMethod(POST)
+		addHttpRequestPart("returnPage", "return.html")
+		addHttpRequestPart("text", "post http://localhost:12345/KSK@foo text")
 		addHttpRequestHeader("Host", "localhost:12345")
 		verifyRedirect("return.html") {
 			verify(core).createPost(currentSone, absent(), "post KSK@foo text")
 		}
 	}
 
+	@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"))
+	}
+
 }