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=678991d02008a16266f4b5768c98725a63978b25;hp=ebfadcce7acde21df58e89c39dad0b6cf4187a0d;hb=110a933c2724aba6a604fc5eed6372ff1e1e6144;hpb=de7568a82eb4150bf6d2b0553841b7b69f84c968

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 ebfadcc..678991d 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPageTest.kt
@@ -1,13 +1,14 @@
 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.WebPageTest
-import net.pterodactylus.sone.web.pages.DeleteProfileFieldPage
-import net.pterodactylus.util.web.Method.GET
+import net.pterodactylus.sone.web.baseInjector
+import net.pterodactylus.sone.web.page.*
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.notNullValue
 import org.hamcrest.Matchers.nullValue
 import org.junit.Before
 import org.junit.Test
@@ -18,15 +19,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 +42,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)
-		addHttpRequestParameter("field", "wrong-id")
+		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,8 +61,8 @@ class DeleteProfileFieldPageTest: WebPageTest() {
 
 	@Test
 	fun `post request without confirm redirects to edit profile page`() {
-		request("", POST)
-		addHttpRequestParameter("field", field.id)
+		setMethod(POST)
+		addHttpRequestPart("field", field.id)
 		verifyRedirect("editProfile.html#profile-fields") {
 			verify(currentSone, never()).profile = any()
 		}
@@ -75,13 +70,23 @@ class DeleteProfileFieldPageTest: WebPageTest() {
 
 	@Test
 	fun `post request with confirm removes field and redirects to edit profile page`() {
-		request("", POST)
-		addHttpRequestParameter("field", field.id)
-		addHttpRequestParameter("confirm", "true")
+		setMethod(POST)
+		addHttpRequestPart("field", field.id)
+		addHttpRequestPart("confirm", "true")
 		verifyRedirect("editProfile.html#profile-fields") {
 			assertThat(profile.getFieldById(field.id), nullValue())
 			verify(currentSone).profile = profile
 		}
 	}
 
+	@Test
+	fun `page can be created by dependency injection`() {
+		assertThat(baseInjector.getInstance<DeleteProfileFieldPage>(), notNullValue())
+	}
+
+	@Test
+	fun `page is annotated with correct template path`() {
+	    assertThat(page.templatePath, equalTo("/templates/deleteProfileField.html"))
+	}
+
 }