X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FViewSonePageTest.kt;h=6850cf17d1c8345798be7065804249dbb9649a7b;hb=5a54ea664e862c910b1766d8ba0dd5efb6ea0151;hp=641e73e1acbbfdf179ae862a62b7162adb53b3da;hpb=de7568a82eb4150bf6d2b0553841b7b69f84c968;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/ViewSonePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/ViewSonePageTest.kt
index 641e73e..6850cf1 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/ViewSonePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/ViewSonePageTest.kt
@@ -4,10 +4,9 @@ import net.pterodactylus.sone.data.Post
 import net.pterodactylus.sone.data.PostReply
 import net.pterodactylus.sone.data.Profile
 import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.test.asOptional
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.ViewSonePage
+import net.pterodactylus.sone.utils.asOptional
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.contains
 import org.hamcrest.Matchers.equalTo
@@ -43,17 +42,19 @@ class ViewSonePageTest : WebPageTest() {
 
 	@Test
 	fun `get request without sone parameter stores null in template context`() {
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(templateContext["sone"], nullValue())
-		assertThat(templateContext["soneId"], equalTo<Any>(""))
+		verifyNoRedirect {
+			assertThat(templateContext["sone"], nullValue())
+			assertThat(templateContext["soneId"], equalTo<Any>(""))
+		}
 	}
 
 	@Test
 	fun `get request with invalid sone parameter stores null in template context`() {
 		addHttpRequestParameter("sone", "invalid-sone-id")
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(templateContext["sone"], nullValue())
-		assertThat(templateContext["soneId"], equalTo<Any>("invalid-sone-id"))
+		verifyNoRedirect {
+			assertThat(templateContext["sone"], nullValue())
+			assertThat(templateContext["soneId"], equalTo<Any>("invalid-sone-id"))
+		}
 	}
 
 	@Test
@@ -62,9 +63,10 @@ class ViewSonePageTest : WebPageTest() {
 		whenever(core.getDirectedPosts("sone-id")).thenReturn(emptyList())
 		addHttpRequestParameter("sone", "sone-id")
 		addSone("sone-id", currentSone)
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(templateContext["sone"], equalTo<Any>(currentSone))
-		assertThat(templateContext["soneId"], equalTo<Any>("sone-id"))
+		verifyNoRedirect {
+			assertThat(templateContext["sone"], equalTo<Any>(currentSone))
+			assertThat(templateContext["soneId"], equalTo<Any>("sone-id"))
+		}
 	}
 
 	private fun createPost(id: String, text: String, time: Long, sender: Sone? = null, recipient: Sone? = null) = mock<Post>().apply {
@@ -82,8 +84,9 @@ class ViewSonePageTest : WebPageTest() {
 	fun `request with valid sone stores posts and directed posts in template context`() {
 		addSone("sone-id", currentSone)
 		addHttpRequestParameter("sone", "sone-id")
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(templateContext["posts"] as Iterable<Post>, contains(directed2, post2))
+		verifyNoRedirect {
+			assertThat(templateContext["posts"] as Iterable<Post>, contains(directed2, post2))
+		}
 	}
 
 	@Test
@@ -92,8 +95,9 @@ class ViewSonePageTest : WebPageTest() {
 		addSone("sone-id", currentSone)
 		addHttpRequestParameter("sone", "sone-id")
 		addHttpRequestParameter("postPage", "1")
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(templateContext["posts"] as Iterable<Post>, contains(directed1, post1))
+		verifyNoRedirect {
+			assertThat(templateContext["posts"] as Iterable<Post>, contains(directed1, post1))
+		}
 	}
 
 	private fun createReply(text: String, time: Long, post: Post?) = mock<PostReply>().apply {
@@ -121,8 +125,9 @@ class ViewSonePageTest : WebPageTest() {
 		whenever(core.getReplies("post3")).thenReturn(listOf(reply6))
 		addSone("sone-id", currentSone)
 		addHttpRequestParameter("sone", "sone-id")
-		page.handleRequest(freenetRequest, templateContext)
-		assertThat(templateContext["repliedPosts"] as Iterable<Post>, contains(foreignPost2,  foreignPost1))
+		verifyNoRedirect {
+			assertThat(templateContext["repliedPosts"] as Iterable<Post>, contains(foreignPost2,  foreignPost1))
+		}
 	}
 
 	@Test