X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FDeleteImagePageTest.kt;h=22751088e323f0ab998be5285a6b039eb849ef95;hb=6a3f1fede0cda5cd6ed56204aa1dd37a19813cb9;hp=89e287925f7037cf744426067c1d4f819ec513ad;hpb=05fb821e72072bde52f383bdc5a988da67f66d0c;p=Sone.git

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 89e2879..2275108 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePageTest.kt
@@ -3,14 +3,14 @@ package net.pterodactylus.sone.web.pages
 import net.pterodactylus.sone.data.Album
 import net.pterodactylus.sone.data.Image
 import net.pterodactylus.sone.data.Sone
+import net.pterodactylus.sone.test.getInstance
 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.sone.web.baseInjector
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.notNullValue
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mockito.verify
@@ -18,14 +18,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 +45,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 +58,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,7 +66,7 @@ class DeleteImagePageTest: WebPageTest() {
 
 	@Test
 	fun `post request with abort delete flag set redirects to image browser`() {
-		request("", POST)
+		setMethod(POST)
 		addImage("image-id", image)
 		addHttpRequestPart("image", "image-id")
 		addHttpRequestPart("abortDelete", "true")
@@ -81,7 +75,7 @@ class DeleteImagePageTest: WebPageTest() {
 
 	@Test
 	fun `post request deletes image and redirects to image browser`() {
-		request("", POST)
+		setMethod(POST)
 		addImage("image-id", image)
 		addHttpRequestPart("image", "image-id")
 		verifyRedirect("imageBrowser.html?album=album-id") {
@@ -89,4 +83,9 @@ class DeleteImagePageTest: WebPageTest() {
 		}
 	}
 
+	@Test
+	fun `page can be created by dependency injection`() {
+	    assertThat(baseInjector.getInstance<DeleteImagePage>(), notNullValue())
+	}
+
 }