X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FEditProfilePageTest.kt;h=f76786acd42e82e4822397cba83471dd2b837a21;hp=282dbc2466b1fc4d7324defe96e4eadc97794aef;hb=2dd40fba7031cffb35a5156435547a5d964535c9;hpb=cc0e665862e8cd6646ce439d5d1f1d44efc17d84

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfilePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfilePageTest.kt
index 282dbc2..f76786a 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfilePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfilePageTest.kt
@@ -4,9 +4,6 @@ import net.pterodactylus.sone.data.Image
 import net.pterodactylus.sone.data.Profile
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.EditProfilePage
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.util.web.Method.GET
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.contains
@@ -20,16 +17,12 @@ import org.mockito.Mockito.verify
 /**
  * Unit test for [EditProfilePage].
  */
-class EditProfilePageTest : WebPageTest() {
-
-	private val page = EditProfilePage(template, webInterface)
+class EditProfilePageTest: WebPageTest(::EditProfilePage) {
 
 	private val profile = Profile(currentSone)
 	private val firstField = profile.addField("First Field")
 	private val secondField = profile.addField("Second Field")
 
-	override fun getPage() = page
-
 	@Before
 	fun setupProfile() {
 		val avatar = mock<Image>()
@@ -63,7 +56,6 @@ class EditProfilePageTest : WebPageTest() {
 
 	@Test
 	fun `get request stores fields of current sone’s profile in template context`() {
-		request("", GET)
 		page.processTemplate(freenetRequest, templateContext)
 		assertThat(templateContext["firstName"], equalTo<Any>("First"))
 		assertThat(templateContext["middleName"], equalTo<Any>("Middle"))
@@ -77,7 +69,7 @@ class EditProfilePageTest : WebPageTest() {
 
 	@Test
 	fun `post request without any command stores fields of current sone’s profile in template context`() {
-		request("", POST)
+		setMethod(POST)
 		page.processTemplate(freenetRequest, templateContext)
 		assertThat(templateContext["firstName"], equalTo<Any>("First"))
 		assertThat(templateContext["middleName"], equalTo<Any>("Middle"))
@@ -90,9 +82,9 @@ class EditProfilePageTest : WebPageTest() {
 	}
 
 	private fun <T> verifySingleFieldCanBeChanged(fieldName: String, newValue: T, expectedValue: T = newValue, fieldAccessor: () -> T) {
-		request("", POST)
-		addHttpRequestParameter("save-profile", "true")
-		addHttpRequestParameter(fieldName, newValue.toString())
+		setMethod(POST)
+		addHttpRequestPart("save-profile", "true")
+		addHttpRequestPart(fieldName, newValue.toString())
 		verifyRedirect("editProfile.html") {
 			verify(core).touchConfiguration()
 			assertThat(fieldAccessor(), equalTo(expectedValue))
@@ -155,10 +147,10 @@ class EditProfilePageTest : WebPageTest() {
 
 	@Test
 	fun `adding a field with a duplicate name sets error in template context`() {
-		request("", POST)
+		setMethod(POST)
 		profile.addField("new-field")
-		addHttpRequestParameter("add-field", "true")
-		addHttpRequestParameter("field-name", "new-field")
+		addHttpRequestPart("add-field", "true")
+		addHttpRequestPart("field-name", "new-field")
 		page.processTemplate(freenetRequest, templateContext)
 		assertThat(templateContext["fieldName"], equalTo<Any>("new-field"))
 		assertThat(templateContext["duplicateFieldName"], equalTo<Any>(true))
@@ -167,9 +159,9 @@ class EditProfilePageTest : WebPageTest() {
 
 	@Test
 	fun `adding a field with a new name sets adds field to profile and redirects to profile edit page`() {
-		request("", POST)
-		addHttpRequestParameter("add-field", "true")
-		addHttpRequestParameter("field-name", "new-field")
+		setMethod(POST)
+		addHttpRequestPart("add-field", "true")
+		addHttpRequestPart("field-name", "new-field")
 		verifyRedirect("editProfile.html#profile-fields") {
 			assertThat(profile.getFieldByName("new-field"), notNullValue())
 			verify(currentSone).profile = profile
@@ -179,15 +171,15 @@ class EditProfilePageTest : WebPageTest() {
 
 	@Test
 	fun `deleting a field redirects to delete field page`() {
-		request("", POST)
-		addHttpRequestParameter("delete-field-${firstField.id}", "true")
+		setMethod(POST)
+		addHttpRequestPart("delete-field-${firstField.id}", "true")
 		verifyRedirect("deleteProfileField.html?field=${firstField.id}")
 	}
 
 	@Test
 	fun `moving a field up moves the field up and redirects to the edit profile page`() {
-		request("", POST)
-		addHttpRequestParameter("move-up-field-${secondField.id}", "true")
+		setMethod(POST)
+		addHttpRequestPart("move-up-field-${secondField.id}", "true")
 		verifyRedirect("editProfile.html#profile-fields") {
 			assertThat(profile.fields, contains(secondField, firstField))
 			verify(currentSone).profile = profile
@@ -196,15 +188,15 @@ class EditProfilePageTest : WebPageTest() {
 
 	@Test
 	fun `moving an invalid field up does not redirect`() {
-		request("", POST)
-		addHttpRequestParameter("move-up-field-foo", "true")
+		setMethod(POST)
+		addHttpRequestPart("move-up-field-foo", "true")
 		page.processTemplate(freenetRequest, templateContext)
 	}
 
 	@Test
 	fun `moving a field down moves the field down and redirects to the edit profile page`() {
-		request("", POST)
-		addHttpRequestParameter("move-down-field-${firstField.id}", "true")
+		setMethod(POST)
+		addHttpRequestPart("move-down-field-${firstField.id}", "true")
 		verifyRedirect("editProfile.html#profile-fields") {
 			assertThat(profile.fields, contains(secondField, firstField))
 			verify(currentSone).profile = profile
@@ -213,15 +205,15 @@ class EditProfilePageTest : WebPageTest() {
 
 	@Test
 	fun `moving an invalid field down does not redirect`() {
-		request("", POST)
-		addHttpRequestParameter("move-down-field-foo", "true")
+		setMethod(POST)
+		addHttpRequestPart("move-down-field-foo", "true")
 		page.processTemplate(freenetRequest, templateContext)
 	}
 
 	@Test
 	fun `editing a field redirects to the edit profile page`() {
-		request("", POST)
-		addHttpRequestParameter("edit-field-${firstField.id}", "true")
+		setMethod(POST)
+		addHttpRequestPart("edit-field-${firstField.id}", "true")
 		verifyRedirect("editProfileField.html?field=${firstField.id}")
 	}