Replace web page test base with Kotlin version

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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPageTest.kt
index ebfadcc..8f344eb 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPageTest.kt
@@ -2,9 +2,6 @@ package net.pterodactylus.sone.web.pages
 
 import net.pterodactylus.sone.data.Profile
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.DeleteProfileFieldPage
-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 [DeleteProfileFieldPage].
  */
-class DeleteProfileFieldPageTest: WebPageTest() {
-
-       private val page = DeleteProfileFieldPage(template, webInterface)
+class DeleteProfileFieldPageTest: WebPageTest(::DeleteProfileFieldPage) {
 
        private val profile = Profile(currentSone)
        private val field = profile.addField("name")
 
-       override fun getPage() = page
-
        @Before
        fun setupProfile() {
                whenever(currentSone.profile).thenReturn(profile)
@@ -45,20 +38,18 @@ class DeleteProfileFieldPageTest: WebPageTest() {
 
        @Test
        fun `get request with invalid field name redirects to invalid page`() {
-               request("", GET)
                verifyRedirect("invalid.html")
        }
 
        @Test
        fun `post request with invalid field name redirects to invalid page`() {
-               request("", POST)
-               addHttpRequestParameter("field", "wrong-id")
+               setMethod(POST)
+               addHttpRequestPart("field", "wrong-id")
                verifyRedirect("invalid.html")
        }
 
        @Test
        fun `get request with valid field name sets field in template context`() {
-               request("", GET)
                addHttpRequestParameter("field", field.id)
                page.processTemplate(freenetRequest, templateContext)
                assertThat(templateContext["field"], equalTo<Any>(field))
@@ -66,8 +57,8 @@ class DeleteProfileFieldPageTest: WebPageTest() {
 
        @Test
        fun `post request without confirm redirects to edit profile page`() {
-               request("", POST)
-               addHttpRequestParameter("field", field.id)
+               setMethod(POST)
+               addHttpRequestPart("field", field.id)
                verifyRedirect("editProfile.html#profile-fields") {
                        verify(currentSone, never()).profile = any()
                }
@@ -75,9 +66,9 @@ class DeleteProfileFieldPageTest: WebPageTest() {
 
        @Test
        fun `post request with confirm removes field and redirects to edit profile page`() {
-               request("", POST)
-               addHttpRequestParameter("field", field.id)
-               addHttpRequestParameter("confirm", "true")
+               setMethod(POST)
+               addHttpRequestPart("field", field.id)
+               addHttpRequestPart("confirm", "true")
                verifyRedirect("editProfile.html#profile-fields") {
                        assertThat(profile.getFieldById(field.id), nullValue())
                        verify(currentSone).profile = profile