X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FEditProfileFieldPageTest.kt;h=01d78cac949254c7dc7366cdd1ac029b4660c441;hp=1b896da5dd53fe88fcb4d98806c8feb2df796a29;hb=a9c1c1770651720ec3b271464a4b490ea4a1334f;hpb=7eac5c60bdb241d7b98e548cf974d41e22af1b5c

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/EditProfileFieldPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/EditProfileFieldPageTest.kt
index 1b896da..01d78ca 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/EditProfileFieldPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/EditProfileFieldPageTest.kt
@@ -2,7 +2,6 @@ package net.pterodactylus.sone.web
 
 import net.pterodactylus.sone.data.Profile
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.WebTestUtils.redirectsTo
 import net.pterodactylus.util.web.Method.GET
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
@@ -22,6 +21,8 @@ class EditProfileFieldPageTest : WebPageTest() {
 	private val profile = Profile(currentSone)
 	private val field = profile.addField("Name")
 
+	override fun getPage() = page
+
 	@Before
 	fun setupProfile() {
 		whenever(currentSone.profile).thenReturn(profile)
@@ -30,8 +31,7 @@ class EditProfileFieldPageTest : WebPageTest() {
 	@Test
 	fun `get request with invalid field redirects to invalid page`() {
 		request("", GET)
-		expectedException.expect(redirectsTo("invalid.html"))
-		page.handleRequest(freenetRequest, templateContext)
+		verifyRedirect("invalid.html")
 	}
 
 	@Test
@@ -47,8 +47,7 @@ class EditProfileFieldPageTest : WebPageTest() {
 		request("", POST)
 		addHttpRequestParameter("field", field.id)
 		addHttpRequestParameter("cancel", "true")
-		expectedException.expect(redirectsTo("editProfile.html#profile-fields"))
-		page.handleRequest(freenetRequest, templateContext)
+		verifyRedirect("editProfile.html#profile-fields")
 	}
 
 	@Test
@@ -56,10 +55,7 @@ class EditProfileFieldPageTest : WebPageTest() {
 		request("", POST)
 		addHttpRequestParameter("field", field.id)
 		addHttpRequestParameter("name", "New Name")
-		expectedException.expect(redirectsTo("editProfile.html#profile-fields"))
-		try {
-			page.handleRequest(freenetRequest, templateContext)
-		} finally {
+		verifyRedirect("editProfile.html#profile-fields") {
 			assertThat(field.name, equalTo("New Name"))
 			verify(currentSone).profile = profile
 		}
@@ -70,10 +66,7 @@ class EditProfileFieldPageTest : WebPageTest() {
 		request("", POST)
 		addHttpRequestParameter("field", field.id)
 		addHttpRequestParameter("name", "Name")
-		expectedException.expect(redirectsTo("editProfile.html#profile-fields"))
-		try {
-			page.handleRequest(freenetRequest, templateContext)
-		} finally {
+		verifyRedirect("editProfile.html#profile-fields") {
 			assertThat(field.name, equalTo("Name"))
 			verify(currentSone, never()).profile = profile
 		}