X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FCreateSonePageTest.kt;h=9cbf2c3139fdf6484f9db7576f9c961ebc6be9ba;hp=f14d536fc98074b5e480fca1e1978994f7a9c924;hb=2dd40fba7031cffb35a5156435547a5d964535c9;hpb=de7568a82eb4150bf6d2b0553841b7b69f84c968

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
--- 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])