Create Guava optional utility collection

[Sone.git] / src / test / kotlin / net / pterodactylus / sone / web / pages / CreatePostPageTest.kt

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..4cb6a8c 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt
@@ -2,10 +2,8 @@ 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.mock
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.CreatePostPage
+import net.pterodactylus.sone.utils.asOptional
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
@@ -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")