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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPageTest.kt
index 01f3361..ec56267 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPageTest.kt
@@ -2,22 +2,21 @@ package net.pterodactylus.sone.web.pages
 
 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.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.CreateReplyPage
+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 [CreateReplyPage].
  */
-class CreateReplyPageTest: WebPageTest() {
-
-	private val page = CreateReplyPage(template, webInterface)
-	override fun getPage() = page
+class CreateReplyPageTest: WebPageTest(::CreateReplyPage) {
 
 	@Test
 	fun `page returns correct path`() {
@@ -31,7 +30,7 @@ class CreateReplyPageTest: WebPageTest() {
 
 	@Test
 	fun `reply is created correctly`() {
-		request("", POST)
+		setMethod(POST)
 		addHttpRequestPart("returnPage", "return.html")
 		addHttpRequestPart("post", "post-id")
 		addHttpRequestPart("text", "new text")
@@ -43,7 +42,7 @@ class CreateReplyPageTest: WebPageTest() {
 
 	@Test
 	fun `reply is filtered`() {
-		request("", POST)
+		setMethod(POST)
 		addHttpRequestPart("returnPage", "return.html")
 		addHttpRequestPart("post", "post-id")
 		addHttpRequestPart("text", "new http://localhost:12345/KSK@foo text")
@@ -56,7 +55,7 @@ class CreateReplyPageTest: WebPageTest() {
 
 	@Test
 	fun `reply is created with correct sender`() {
-		request("", POST)
+		setMethod(POST)
 		addHttpRequestPart("returnPage", "return.html")
 		addHttpRequestPart("post", "post-id")
 		addHttpRequestPart("text", "new text")
@@ -70,7 +69,7 @@ class CreateReplyPageTest: WebPageTest() {
 
 	@Test
 	fun `empty text sets parameters in template contexty`() {
-		request("", POST)
+		setMethod(POST)
 		addHttpRequestPart("returnPage", "return.html")
 		addHttpRequestPart("post", "post-id")
 		addHttpRequestPart("text", "  ")
@@ -83,11 +82,21 @@ class CreateReplyPageTest: WebPageTest() {
 
 	@Test
 	fun `user is redirected to no permissions page if post does not exist`() {
-		request("", POST)
+		setMethod(POST)
 		addHttpRequestPart("returnPage", "return.html")
 		addHttpRequestPart("post", "post-id")
 		addHttpRequestPart("text", "new text")
 		verifyRedirect("noPermission.html")
 	}
 
+	@Test
+	fun `page can be created by dependency injection`() {
+	    assertThat(baseInjector.getInstance<CreateReplyPage>(), notNullValue())
+	}
+
+	@Test
+	fun `page is annotated with correct template path`() {
+	    assertThat(page.templatePath, equalTo("/templates/createReply.html"))
+	}
+
 }