Replace web page test base with Kotlin version

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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateSonePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateSonePageTest.kt
index f14d536..9cbf2c3 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateSonePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateSonePageTest.kt
@@ -5,8 +5,6 @@ import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.freenet.wot.OwnIdentity
 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.CreateSonePage
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.contains
@@ -18,10 +16,7 @@ import org.mockito.Mockito.verify
 /**
  * Unit test for [CreateSonePage].
  */
-class CreateSonePageTest: WebPageTest() {
-
-       private val page = CreateSonePage(template, webInterface)
-       override fun getPage() = page
+class CreateSonePageTest: WebPageTest(::CreateSonePage) {
 
        private val localSones_ = listOf(
                        createSone("local-sone1"),
@@ -85,8 +80,8 @@ class CreateSonePageTest: WebPageTest() {
        @Test
        fun `sone is created and logged in`() {
                addExistingOwnIdentities()
-               request("", POST)
-               addHttpRequestParameter("identity", "own-id-3")
+               setMethod(POST)
+               addHttpRequestPart("identity", "own-id-3")
                val newSone = mock<Sone>()
                whenever(core.createSone(ownIdentities_[2])).thenReturn(newSone)
                verifyRedirect("index.html") {
@@ -96,7 +91,7 @@ class CreateSonePageTest: WebPageTest() {
 
        @Test
        fun `on invalid identity id a flag is set in the template context`() {
-               request("", POST)
+               setMethod(POST)
                addHttpRequestParameter("identity", "own-id-3")
                page.processTemplate(freenetRequest, templateContext)
                assertThat(templateContext["errorNoIdentity"], equalTo<Any>(true))
@@ -105,8 +100,8 @@ class CreateSonePageTest: WebPageTest() {
        @Test
        fun `if sone is not created user is still redirected to index`() {
                addExistingOwnIdentities()
-               request("", POST)
-               addHttpRequestParameter("identity", "own-id-3")
+               setMethod(POST)
+               addHttpRequestPart("identity", "own-id-3")
                whenever(core.createSone(ownIdentities_[2])).thenReturn(null)
                verifyRedirect("index.html") {
                        verify(core).createSone(ownIdentities_[2])