X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FDeletePostPageTest.kt;h=ab7851a04d863661e711f01413ce9f2e72605ef4;hb=9acbc5bdec4ccb752e0856a501568b0bb6161579;hp=dd42f5ed93beb7f698bb12022f214a7e7c584ffb;hpb=c9d89c8409d0db44af89a2a5a5aa79f195bde062;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/DeletePostPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/DeletePostPageTest.kt
index dd42f5e..ab7851a 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/DeletePostPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/DeletePostPageTest.kt
@@ -4,7 +4,6 @@ import net.pterodactylus.sone.data.Post
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.WebTestUtils.redirectsTo
 import net.pterodactylus.util.web.Method.GET
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
@@ -13,7 +12,6 @@ import org.junit.Before
 import org.junit.Test
 import org.mockito.Mockito.never
 import org.mockito.Mockito.verify
-import kotlin.test.fail
 
 /**
  * Unit test for [DeletePostPage].
@@ -25,6 +23,8 @@ class DeletePostPageTest : WebPageTest() {
 	private val post = mock<Post>()
 	private val sone = mock<Sone>()
 
+	override fun getPage() = page
+
 	@Before
 	fun setupPost() {
 		whenever(post.sone).thenReturn(sone)
@@ -32,10 +32,19 @@ class DeletePostPageTest : WebPageTest() {
 	}
 
 	@Test
+	fun `page returns correct path`() {
+	    assertThat(page.path, equalTo("deletePost.html"))
+	}
+
+	@Test
+	fun `page requires login`() {
+	    assertThat(page.requiresLogin(), equalTo(true))
+	}
+
+	@Test
 	fun `get request with invalid post redirects to no permission page`() {
 		request("", GET)
-		expectedException.expect(redirectsTo("noPermission.html"))
-		page.processTemplate(freenetRequest, templateContext)
+		verifyRedirect("noPermission.html")
 	}
 
 	@Test
@@ -52,8 +61,7 @@ class DeletePostPageTest : WebPageTest() {
 	@Test
 	fun `post request with invalid post redirects to no permission page`() {
 		request("", POST)
-		expectedException.expect(redirectsTo("noPermission.html"))
-		page.processTemplate(freenetRequest, templateContext)
+		verifyRedirect("noPermission.html")
 	}
 
 	@Test
@@ -63,8 +71,7 @@ class DeletePostPageTest : WebPageTest() {
 		addPost("post-id", post)
 		addHttpRequestParameter("post", "post-id")
 		addHttpRequestParameter("returnPage", "return.html")
-		expectedException.expect(redirectsTo("noPermission.html"))
-		page.processTemplate(freenetRequest, templateContext)
+		verifyRedirect("noPermission.html")
 	}
 
 	@Test
@@ -74,13 +81,8 @@ class DeletePostPageTest : WebPageTest() {
 		addHttpRequestParameter("post", "post-id")
 		addHttpRequestParameter("returnPage", "return.html")
 		addHttpRequestParameter("confirmDelete", "true")
-		expectedException.expect(redirectsTo("return.html"))
-		try {
-			page.processTemplate(freenetRequest, templateContext)
-			fail()
-		} catch (e: Exception) {
+		verifyRedirect("return.html") {
 			verify(core).deletePost(post)
-			throw e
 		}
 	}
 
@@ -91,13 +93,8 @@ class DeletePostPageTest : WebPageTest() {
 		addHttpRequestParameter("post", "post-id")
 		addHttpRequestParameter("returnPage", "return.html")
 		addHttpRequestParameter("abortDelete", "true")
-		expectedException.expect(redirectsTo("return.html"))
-		try {
-			page.processTemplate(freenetRequest, templateContext)
-			fail()
-		} catch (e: Exception) {
+		verifyRedirect("return.html") {
 			verify(core, never()).deletePost(post)
-			throw e
 		}
 	}