X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FEditProfileFieldPageTest.kt;h=cff74ac77eef8e2720a058828727a115c8565093;hp=83385d2c0516c18cfc7d82a2a9f747f6066a04ff;hb=cd72add62ab407336b471d4b7cda8e33dd2df5c6;hpb=e280cbaa00df256a60277ed8b3443126a9865b6e

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfileFieldPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfileFieldPageTest.kt
index 83385d2..cff74ac 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfileFieldPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfileFieldPageTest.kt
@@ -1,13 +1,13 @@
 package net.pterodactylus.sone.web.pages
 
 import net.pterodactylus.sone.data.Profile
+import net.pterodactylus.sone.test.getInstance
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.EditProfileFieldPage
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.util.web.Method.GET
+import net.pterodactylus.sone.web.baseInjector
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.notNullValue
 import org.junit.Before
 import org.junit.Test
 import org.mockito.Mockito.never
@@ -16,15 +16,11 @@ import org.mockito.Mockito.verify
 /**
  * Unit test for [EditProfileFieldPage].
  */
-class EditProfileFieldPageTest : WebPageTest() {
-
-	private val page = EditProfileFieldPage(template, webInterface)
+class EditProfileFieldPageTest: WebPageTest(::EditProfileFieldPage) {
 
 	private val profile = Profile(currentSone)
 	private val field = profile.addField("Name")
 
-	override fun getPage() = page
-
 	@Before
 	fun setupProfile() {
 		whenever(currentSone.profile).thenReturn(profile)
@@ -43,18 +39,16 @@ class EditProfileFieldPageTest : WebPageTest() {
 	@Test
 	fun `page returns correct title`() {
 		whenever(l10n.getString("Page.EditProfileField.Title")).thenReturn("edit profile field title")
-	    assertThat(page.getPageTitle(freenetRequest), equalTo("edit profile field title"))
+	    assertThat(page.getPageTitle(soneRequest), equalTo("edit profile field title"))
 	}
 
 	@Test
 	fun `get request with invalid field redirects to invalid page`() {
-		request("", GET)
 		verifyRedirect("invalid.html")
 	}
 
 	@Test
 	fun `get request with valid field stores field in template context`() {
-		request("", GET)
 		addHttpRequestParameter("field", field.id)
 		page.processTemplate(freenetRequest, templateContext)
 		assertThat(templateContext["field"], equalTo<Any>(field))
@@ -62,17 +56,17 @@ class EditProfileFieldPageTest : WebPageTest() {
 
 	@Test
 	fun `post request with cancel set redirects to profile edit page`() {
-		request("", POST)
-		addHttpRequestParameter("field", field.id)
-		addHttpRequestParameter("cancel", "true")
+		setMethod(POST)
+		addHttpRequestPart("field", field.id)
+		addHttpRequestPart("cancel", "true")
 		verifyRedirect("editProfile.html#profile-fields")
 	}
 
 	@Test
 	fun `post request with new name renames field and redirects to profile edit page`() {
-		request("", POST)
-		addHttpRequestParameter("field", field.id)
-		addHttpRequestParameter("name", "New Name")
+		setMethod(POST)
+		addHttpRequestPart("field", field.id)
+		addHttpRequestPart("name", "New Name")
 		verifyRedirect("editProfile.html#profile-fields") {
 			assertThat(field.name, equalTo("New Name"))
 			verify(currentSone).profile = profile
@@ -81,9 +75,9 @@ class EditProfileFieldPageTest : WebPageTest() {
 
 	@Test
 	fun `post request with same name does not modify field and redirects to profile edit page`() {
-		request("", POST)
-		addHttpRequestParameter("field", field.id)
-		addHttpRequestParameter("name", "Name")
+		setMethod(POST)
+		addHttpRequestPart("field", field.id)
+		addHttpRequestPart("name", "Name")
 		verifyRedirect("editProfile.html#profile-fields") {
 			assertThat(field.name, equalTo("Name"))
 			verify(currentSone, never()).profile = profile
@@ -92,14 +86,19 @@ class EditProfileFieldPageTest : WebPageTest() {
 
 	@Test
 	fun `post request with same name as different field sets error condition in template`() {
-		request("", POST)
+		setMethod(POST)
 		profile.addField("New Name")
-		addHttpRequestParameter("field", field.id)
-		addHttpRequestParameter("name", "New Name")
+		addHttpRequestPart("field", field.id)
+		addHttpRequestPart("name", "New Name")
 		page.processTemplate(freenetRequest, templateContext)
 		assertThat(field.name, equalTo("Name"))
 		verify(currentSone, never()).profile = profile
 		assertThat(templateContext["duplicateFieldName"], equalTo<Any>(true))
 	}
 
+	@Test
+	fun `page can be created by dependency injection`() {
+		assertThat(baseInjector.getInstance<EditProfileFieldPage>(), notNullValue())
+	}
+
 }