X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FDistrustPageTest.kt;h=d706e058f88539c6199d1832899bcb579d234b05;hp=45498c230dc33e0b9d28bdacc6bdb0418bb16b9f;hb=2e6be6f2fb6afede009dacc48b8e3318e30e5057;hpb=de7568a82eb4150bf6d2b0553841b7b69f84c968

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/DistrustPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/DistrustPageTest.kt
index 45498c2..d706e05 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/DistrustPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/DistrustPageTest.kt
@@ -1,25 +1,18 @@
 package net.pterodactylus.sone.web.pages
 
-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.DistrustPage
-import net.pterodactylus.util.web.Method.GET
-import net.pterodactylus.util.web.Method.POST
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.equalTo
-import org.junit.Test
-import org.mockito.Mockito.verify
+import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.test.*
+import net.pterodactylus.sone.web.*
+import net.pterodactylus.util.web.Method.*
+import org.hamcrest.MatcherAssert.*
+import org.hamcrest.Matchers.*
+import org.junit.*
+import org.mockito.Mockito.*
 
 /**
  * Unit test for [DistrustPage].
  */
-class DistrustPageTest: WebPageTest() {
-
-	private val page = DistrustPage(template, webInterface)
-
-	override fun getPage() = page
+class DistrustPageTest : WebPageTest(::DistrustPage) {
 
 	@Test
 	fun `page returns correct path`() {
@@ -34,32 +27,36 @@ class DistrustPageTest: WebPageTest() {
 	@Test
 	fun `page returns correct title`() {
 		whenever(l10n.getString("Page.Distrust.Title")).thenReturn("distrust page title")
-		assertThat(page.getPageTitle(freenetRequest), equalTo("distrust page title"))
+		assertThat(page.getPageTitle(soneRequest), equalTo("distrust page title"))
 	}
 
 	@Test
 	fun `get request does not redirect`() {
-		request("", GET)
 		page.processTemplate(freenetRequest, templateContext)
 	}
 
 	@Test
 	fun `post request with invalid sone redirects to return page`() {
-		request("", POST)
-		addHttpRequestParameter("returnPage", "return.html")
+		setMethod(POST)
+		addHttpRequestPart("returnPage", "return.html")
 		verifyRedirect("return.html")
 	}
 
 	@Test
 	fun `post request with valid sone distrusts sone and redirects to return page`() {
-		request("", POST)
+		setMethod(POST)
 		val remoteSone = mock<Sone>()
 		addSone("remote-sone-id", remoteSone)
-		addHttpRequestParameter("returnPage", "return.html")
-		addHttpRequestParameter("sone", "remote-sone-id")
+		addHttpRequestPart("returnPage", "return.html")
+		addHttpRequestPart("sone", "remote-sone-id")
 		verifyRedirect("return.html") {
 			verify(core).distrustSone(currentSone, remoteSone)
 		}
 	}
 
+	@Test
+	fun `page can be created by dependency injection`() {
+		assertThat(baseInjector.getInstance<DistrustPage>(), notNullValue())
+	}
+
 }