X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2FLoginPageTest.kt;h=a4dea43b91b3027592fcb3f146f396e1bb6d7398;hb=a9c1c1770651720ec3b271464a4b490ea4a1334f;hp=3b5c74fa7675c26bf031a0c995d1fa4673cf2cec;hpb=9824d45ada252d673a259029052f5ac4eecc5420;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/LoginPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/LoginPageTest.kt
index 3b5c74f..a4dea43 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/LoginPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/LoginPageTest.kt
@@ -6,7 +6,6 @@ import net.pterodactylus.sone.freenet.wot.OwnIdentity
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.thenReturnMock
 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
@@ -27,6 +26,8 @@ class LoginPageTest : WebPageTest() {
 
 	private val sones = listOf(createSone("Sone", "Test"), createSone("Test"), createSone("Sone"))
 
+	override fun getPage() = page
+
 	private fun createSone(vararg contexts: String) = mock<Sone>().apply {
 		whenever(id).thenReturn(hashCode().toString())
 		val identity = mock<OwnIdentity>().apply {
@@ -57,6 +58,7 @@ class LoginPageTest : WebPageTest() {
 	}
 
 	@Test
+	@Suppress("UNCHECKED_CAST")
 	fun `post request with invalid sone sets sones and identities without sone in template context`() {
 		request("", POST)
 		page.handleRequest(freenetRequest, templateContext)
@@ -68,10 +70,7 @@ class LoginPageTest : WebPageTest() {
 	fun `post request with valid sone and redirects to index page`() {
 		request("", POST)
 		addHttpRequestParameter("sone-id", "sone2")
-		expectedException.expect(redirectsTo("index.html"))
-		try {
-			page.handleRequest(freenetRequest, templateContext)
-		} finally {
+		verifyRedirect("index.html") {
 			verify(webInterface).setCurrentSone(toadletContext, sones[1])
 		}
 	}
@@ -81,10 +80,7 @@ class LoginPageTest : WebPageTest() {
 		request("", POST)
 		addHttpRequestParameter("sone-id", "sone2")
 		addHttpRequestParameter("target", "foo.html")
-		expectedException.expect(redirectsTo("foo.html"))
-		try {
-			page.handleRequest(freenetRequest, templateContext)
-		} finally {
+		verifyRedirect("foo.html") {
 			verify(webInterface).setCurrentSone(toadletContext, sones[1])
 		}
 	}