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=4dab09edd64f93ae9c7d0954449c024f9d9d5327;hb=64740709990291688170ebd1f192af5eb9090618;hpb=a76956e389fcfe6282ad4ca7156bbf76327bb0c0

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 4dab09e..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,9 +1,7 @@
 package net.pterodactylus.sone.web.pages
 
-import com.google.common.base.Optional.*
 import net.pterodactylus.sone.data.*
 import net.pterodactylus.sone.test.*
-import net.pterodactylus.sone.utils.*
 import net.pterodactylus.sone.web.*
 import net.pterodactylus.sone.web.page.*
 import net.pterodactylus.util.web.Method.*
@@ -15,7 +13,7 @@ import org.mockito.Mockito.*
 /**
  * Unit test for [CreatePostPage].
  */
-class CreatePostPageTest: WebPageTest(::CreatePostPage) {
+class CreatePostPageTest : WebPageTest(::CreatePostPage) {
 
 	@Test
 	fun `page returns correct path`() {
@@ -40,7 +38,7 @@ class CreatePostPageTest: WebPageTest(::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")
 		}
 	}
 
@@ -62,7 +60,7 @@ class CreatePostPageTest: WebPageTest(::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")
 		}
 	}
 
@@ -75,7 +73,7 @@ class CreatePostPageTest: WebPageTest(::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")
 		}
 	}
 
@@ -86,18 +84,18 @@ class CreatePostPageTest: WebPageTest(::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())
+		assertThat(baseInjector.getInstance<CreatePostPage>(), notNullValue())
 	}
 
 	@Test
 	fun `page is annotated with correct template path`() {
-	    assertThat(page.templatePath, equalTo("/templates/createPost.html"))
+		assertThat(page.templatePath, equalTo("/templates/createPost.html"))
 	}
 
 }