X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FMarkAsKnownPageTest.kt;h=c44bbd437d7dcca6e530e304680bed6561a13342;hp=e586e679d49ea54b1c69f688fcf6417d3a62d12f;hb=a9c1c1770651720ec3b271464a4b490ea4a1334f;hpb=7eac5c60bdb241d7b98e548cf974d41e22af1b5c

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/MarkAsKnownPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/MarkAsKnownPageTest.kt
index e586e67..c44bbd4 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/MarkAsKnownPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/MarkAsKnownPageTest.kt
@@ -4,7 +4,6 @@ import net.pterodactylus.sone.data.Post
 import net.pterodactylus.sone.data.PostReply
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.web.WebTestUtils.redirectsTo
 import org.junit.Test
 import org.mockito.Mockito.verify
 
@@ -15,6 +14,8 @@ class MarkAsKnownPageTest : WebPageTest() {
 
 	private val page = MarkAsKnownPage(template, webInterface)
 
+	override fun getPage() = page
+
 	@Test
 	fun `posts can be marked as known`() {
 		addHttpRequestParameter("returnPage", "return.html")
@@ -23,10 +24,7 @@ class MarkAsKnownPageTest : WebPageTest() {
 		val posts = listOf(mock<Post>(), mock<Post>())
 		addPost("post1", posts[0])
 		addPost("post3", posts[1])
-		expectedException.expect(redirectsTo("return.html"))
-		try {
-			page.handleRequest(freenetRequest, templateContext)
-		} finally {
+		verifyRedirect("return.html") {
 			verify(core).markPostKnown(posts[0])
 			verify(core).markPostKnown(posts[1])
 		}
@@ -40,10 +38,7 @@ class MarkAsKnownPageTest : WebPageTest() {
 		val replies = listOf(mock<PostReply>(), mock<PostReply>())
 		addPostReply("reply1", replies[0])
 		addPostReply("reply3", replies[1])
-		expectedException.expect(redirectsTo("return.html"))
-		try {
-			page.handleRequest(freenetRequest, templateContext)
-		} finally {
+		verifyRedirect("return.html") {
 			verify(core).markReplyKnown(replies[0])
 			verify(core).markReplyKnown(replies[1])
 		}
@@ -57,10 +52,7 @@ class MarkAsKnownPageTest : WebPageTest() {
 		val sones = listOf(mock<Sone>(), mock<Sone>())
 		addSone("sone1", sones[0])
 		addSone("sone3", sones[1])
-		expectedException.expect(redirectsTo("return.html"))
-		try {
-			page.handleRequest(freenetRequest, templateContext)
-		} finally {
+		verifyRedirect("return.html") {
 			verify(core).markSoneKnown(sones[0])
 			verify(core).markSoneKnown(sones[1])
 		}
@@ -69,8 +61,7 @@ class MarkAsKnownPageTest : WebPageTest() {
 	@Test
 	fun `different type redirects to invalid page`() {
 		addHttpRequestParameter("type", "foo")
-		expectedException.expect(redirectsTo("invalid.html"))
-		page.handleRequest(freenetRequest, templateContext)
+		verifyRedirect("invalid.html")
 	}
 
 }