X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FDeletePostPageTest.kt;h=383e38c6e6763093d79a601d155750a624075f1c;hb=e9719bd55f3b9e62e16643c697f286a84f6ccabb;hp=152e70dec595633eb267e54cea64f6f98b5a8f49;hpb=de7568a82eb4150bf6d2b0553841b7b69f84c968;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeletePostPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeletePostPageTest.kt
index 152e70d..383e38c 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeletePostPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeletePostPageTest.kt
@@ -4,9 +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.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.DeletePostPage
-import net.pterodactylus.util.web.Method.GET
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
@@ -18,15 +15,11 @@ import org.mockito.Mockito.verify
 /**
  * Unit test for [DeletePostPage].
  */
-class DeletePostPageTest : WebPageTest() {
-
-	private val page = DeletePostPage(template, webInterface)
+class DeletePostPageTest: WebPageTest2(::DeletePostPage) {
 
 	private val post = mock<Post>()
 	private val sone = mock<Sone>()
 
-	override fun getPage() = page
-
 	@Before
 	fun setupPost() {
 		whenever(post.sone).thenReturn(sone)
@@ -45,13 +38,11 @@ class DeletePostPageTest : WebPageTest() {
 
 	@Test
 	fun `get request with invalid post redirects to no permission page`() {
-		request("", GET)
 		verifyRedirect("noPermission.html")
 	}
 
 	@Test
 	fun `get request with valid post sets post and return page in template context`() {
-		request("", GET)
 		addPost("post-id", post)
 		addHttpRequestParameter("post", "post-id")
 		addHttpRequestParameter("returnPage", "return.html")
@@ -62,27 +53,27 @@ class DeletePostPageTest : WebPageTest() {
 
 	@Test
 	fun `post request with invalid post redirects to no permission page`() {
-		request("", POST)
+		setMethod(POST)
 		verifyRedirect("noPermission.html")
 	}
 
 	@Test
 	fun `post request with post from non-local sone redirects to no permission page`() {
-		request("", POST)
+		setMethod(POST)
 		whenever(sone.isLocal).thenReturn(false)
 		addPost("post-id", post)
-		addHttpRequestParameter("post", "post-id")
-		addHttpRequestParameter("returnPage", "return.html")
+		addHttpRequestPart("post", "post-id")
+		addHttpRequestPart("returnPage", "return.html")
 		verifyRedirect("noPermission.html")
 	}
 
 	@Test
 	fun `post request with confirmation deletes post and redirects to return page`() {
-		request("", POST)
+		setMethod(POST)
 		addPost("post-id", post)
-		addHttpRequestParameter("post", "post-id")
-		addHttpRequestParameter("returnPage", "return.html")
-		addHttpRequestParameter("confirmDelete", "true")
+		addHttpRequestPart("post", "post-id")
+		addHttpRequestPart("returnPage", "return.html")
+		addHttpRequestPart("confirmDelete", "true")
 		verifyRedirect("return.html") {
 			verify(core).deletePost(post)
 		}
@@ -90,11 +81,11 @@ class DeletePostPageTest : WebPageTest() {
 
 	@Test
 	fun `post request with abort delete does not delete post and redirects to return page`() {
-		request("", POST)
+		setMethod(POST)
 		addPost("post-id", post)
-		addHttpRequestParameter("post", "post-id")
-		addHttpRequestParameter("returnPage", "return.html")
-		addHttpRequestParameter("abortDelete", "true")
+		addHttpRequestPart("post", "post-id")
+		addHttpRequestPart("returnPage", "return.html")
+		addHttpRequestPart("abortDelete", "true")
 		verifyRedirect("return.html") {
 			verify(core, never()).deletePost(post)
 		}
@@ -102,10 +93,10 @@ class DeletePostPageTest : WebPageTest() {
 
 	@Test
 	fun `post request without delete or abort sets post in template context`() {
-		request("", POST)
+		setMethod(POST)
 		addPost("post-id", post)
-		addHttpRequestParameter("post", "post-id")
-		addHttpRequestParameter("returnPage", "return.html")
+		addHttpRequestPart("post", "post-id")
+		addHttpRequestPart("returnPage", "return.html")
 		page.processTemplate(freenetRequest, templateContext)
 		assertThat(templateContext["post"], equalTo<Any>(post))
 		assertThat(templateContext["returnPage"], equalTo<Any>("return.html"))