X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FDeleteProfileFieldPageTest.kt;h=8f344eb282498eb01af962f95eca2f0d3ba48749;hp=39bd8af760a9ec0bba60f9153cf9fbf85ec8bdbf;hb=2dd40fba7031cffb35a5156435547a5d964535c9;hpb=05fb821e72072bde52f383bdc5a988da67f66d0c

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 39bd8af..8f344eb 100644
--- 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)
+		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,7 +57,7 @@ class DeleteProfileFieldPageTest: WebPageTest() {
 
 	@Test
 	fun `post request without confirm redirects to edit profile page`() {
-		request("", POST)
+		setMethod(POST)
 		addHttpRequestPart("field", field.id)
 		verifyRedirect("editProfile.html#profile-fields") {
 			verify(currentSone, never()).profile = any()
@@ -75,7 +66,7 @@ class DeleteProfileFieldPageTest: WebPageTest() {
 
 	@Test
 	fun `post request with confirm removes field and redirects to edit profile page`() {
-		request("", POST)
+		setMethod(POST)
 		addHttpRequestPart("field", field.id)
 		addHttpRequestPart("confirm", "true")
 		verifyRedirect("editProfile.html#profile-fields") {