Replace web page test base with Kotlin version

[Sone.git] / src / test / kotlin / net / pterodactylus / sone / web / pages / DistrustPageTest.kt

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..3261df6 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/DistrustPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/DistrustPageTest.kt
@@ -3,9 +3,6 @@ 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
@@ -15,11 +12,7 @@ import org.mockito.Mockito.verify
 /**
  * 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`() {
@@ -39,24 +32,23 @@ class DistrustPageTest: WebPageTest() {
 
        @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)
                }