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=a6f5d9d4a49290a32b34ff6a2f8b214fb94b4817;hp=35ec59732ac8683886a0b4ffe323ec9cb1fd4ae2;hb=64740709990291688170ebd1f192af5eb9090618;hpb=9e1c68c8c58356cf9299ab608a981d4a5b34bc92

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 35ec597..a6f5d9d 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt
@@ -1,19 +1,19 @@
 package net.pterodactylus.sone.web.pages
 
-import com.google.common.base.Optional.absent
-import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.utils.asOptional
-import net.pterodactylus.util.web.Method.POST
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.equalTo
-import org.junit.Test
-import org.mockito.Mockito.verify
+import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.test.*
+import net.pterodactylus.sone.web.*
+import net.pterodactylus.sone.web.page.*
+import net.pterodactylus.util.web.Method.*
+import org.hamcrest.MatcherAssert.*
+import org.hamcrest.Matchers.*
+import org.junit.*
+import org.mockito.Mockito.*
 
 /**
  * Unit test for [CreatePostPage].
  */
-class CreatePostPageTest: WebPageTest2(::CreatePostPage) {
+class CreatePostPageTest : WebPageTest(::CreatePostPage) {
 
 	@Test
 	fun `page returns correct path`() {
@@ -38,7 +38,7 @@ class CreatePostPageTest: WebPageTest2(::CreatePostPage) {
 		addHttpRequestPart("returnPage", "return.html")
 		addHttpRequestPart("text", "post text")
 		verifyRedirect("return.html") {
-			verify(core).createPost(currentSone, absent(), "post text")
+			verify(core).createPost(currentSone, null, "post text")
 		}
 	}
 
@@ -60,7 +60,7 @@ class CreatePostPageTest: WebPageTest2(::CreatePostPage) {
 		val sender = mock<Sone>()
 		addLocalSone("sender-id", sender)
 		verifyRedirect("return.html") {
-			verify(core).createPost(sender, absent(), "post text")
+			verify(core).createPost(sender, null, "post text")
 		}
 	}
 
@@ -73,7 +73,7 @@ class CreatePostPageTest: WebPageTest2(::CreatePostPage) {
 		val recipient = mock<Sone>()
 		addSone("recipient-id", recipient)
 		verifyRedirect("return.html") {
-			verify(core).createPost(currentSone, recipient.asOptional(), "post text")
+			verify(core).createPost(currentSone, recipient, "post text")
 		}
 	}
 
@@ -84,8 +84,18 @@ class CreatePostPageTest: WebPageTest2(::CreatePostPage) {
 		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")
+			verify(core).createPost(currentSone, null, "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"))
+	}
+
 }