X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FDeleteImagePageTest.kt;h=1b90c4a908c7e480e179a20850b1f7698d2f56bc;hp=78000a161decae6577d8094eb7c7264e0d7f39f4;hb=2dd40fba7031cffb35a5156435547a5d964535c9;hpb=de7568a82eb4150bf6d2b0553841b7b69f84c968

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePageTest.kt
index 78000a1..1b90c4a 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePageTest.kt
@@ -5,9 +5,6 @@ import net.pterodactylus.sone.data.Image
 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.DeleteImagePage
-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,14 +15,11 @@ import org.mockito.Mockito.verify
 /**
  * Unit test for [DeleteImagePage].
  */
-class DeleteImagePageTest: WebPageTest() {
+class DeleteImagePageTest: WebPageTest(::DeleteImagePage) {
 
-	private val page = DeleteImagePage(template, webInterface)
 	private val image = mock<Image>()
 	private val sone = mock<Sone>()
 
-	override fun getPage() = page
-
 	@Before
 	fun setupImage() {
 		val album = mock<Album>()
@@ -48,13 +42,11 @@ class DeleteImagePageTest: WebPageTest() {
 
 	@Test
 	fun `get request with invalid image redirects to invalid page`() {
-		request("", GET)
 		verifyRedirect("invalid.html")
 	}
 
 	@Test
 	fun `get request with image from non-local sone redirects to no permissions page`() {
-		request("", GET)
 		whenever(sone.isLocal).thenReturn(false)
 		addImage("image-id", image)
 		addHttpRequestParameter("image", "image-id")
@@ -63,7 +55,6 @@ class DeleteImagePageTest: WebPageTest() {
 
 	@Test
 	fun `get request with image from local sone sets image in template context`() {
-		request("", GET)
 		addImage("image-id", image)
 		addHttpRequestParameter("image", "image-id")
 		page.processTemplate(freenetRequest, templateContext)
@@ -72,18 +63,18 @@ class DeleteImagePageTest: WebPageTest() {
 
 	@Test
 	fun `post request with abort delete flag set redirects to image browser`() {
-		request("", POST)
+		setMethod(POST)
 		addImage("image-id", image)
-		addHttpRequestParameter("image", "image-id")
-		addHttpRequestParameter("abortDelete", "true")
+		addHttpRequestPart("image", "image-id")
+		addHttpRequestPart("abortDelete", "true")
 		verifyRedirect("imageBrowser.html?image=image-id")
 	}
 
 	@Test
 	fun `post request deletes image and redirects to image browser`() {
-		request("", POST)
+		setMethod(POST)
 		addImage("image-id", image)
-		addHttpRequestParameter("image", "image-id")
+		addHttpRequestPart("image", "image-id")
 		verifyRedirect("imageBrowser.html?album=album-id") {
 			verify(webInterface.core).deleteImage(image)
 		}