X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FLoginPageTest.kt;h=1b409b7cc17d9c82cf8aad3feecb7ebd91db0701;hp=0da820cd811206a6214719decbcca1f4f6efe5eb;hb=2dd40fba7031cffb35a5156435547a5d964535c9;hpb=de7568a82eb4150bf6d2b0553841b7b69f84c968

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/LoginPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/LoginPageTest.kt
index 0da820c..1b409b7 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/LoginPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/LoginPageTest.kt
@@ -6,9 +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.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.LoginPage
-import net.pterodactylus.util.web.Method.GET
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.contains
@@ -22,14 +19,10 @@ import org.mockito.Mockito.verify
 /**
  * Unit test for [LoginPage].
  */
-class LoginPageTest : WebPageTest() {
-
-	private val page = LoginPage(template, webInterface)
+class LoginPageTest: WebPageTest(::LoginPage) {
 
 	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 {
@@ -63,7 +56,6 @@ class LoginPageTest : WebPageTest() {
 	@Test
 	@Suppress("UNCHECKED_CAST")
 	fun `get request stores sones in template context`() {
-		request("", GET)
 		page.processTemplate(freenetRequest, templateContext)
 		assertThat(templateContext["sones"] as Iterable<Sone>, containsInAnyOrder(sones[0], sones[1], sones[2]))
 	}
@@ -71,7 +63,6 @@ class LoginPageTest : WebPageTest() {
 	@Test
 	@Suppress("UNCHECKED_CAST")
 	fun `get request stores identities without sones in template context`() {
-		request("", GET)
 		page.processTemplate(freenetRequest, templateContext)
 		assertThat(templateContext["identitiesWithoutSone"] as Iterable<Identity>, contains(sones[1].identity))
 	}
@@ -79,7 +70,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)
+		setMethod(POST)
 		page.processTemplate(freenetRequest, templateContext)
 		assertThat(templateContext["sones"] as Iterable<Sone>, containsInAnyOrder(sones[0], sones[1], sones[2]))
 		assertThat(templateContext["identitiesWithoutSone"] as Iterable<Identity>, contains(sones[1].identity))
@@ -87,8 +78,8 @@ class LoginPageTest : WebPageTest() {
 
 	@Test
 	fun `post request with valid sone logs in the sone and redirects to index page`() {
-		request("", POST)
-		addHttpRequestParameter("sone-id", "sone2")
+		setMethod(POST)
+		addHttpRequestPart("sone-id", "sone2")
 		verifyRedirect("index.html") {
 			verify(webInterface).setCurrentSone(toadletContext, sones[1])
 		}
@@ -96,8 +87,8 @@ class LoginPageTest : WebPageTest() {
 
 	@Test
 	fun `post request with valid sone and target redirects to target page`() {
-		request("", POST)
-		addHttpRequestParameter("sone-id", "sone2")
+		setMethod(POST)
+		addHttpRequestPart("sone-id", "sone2")
 		addHttpRequestParameter("target", "foo.html")
 		verifyRedirect("foo.html") {
 			verify(webInterface).setCurrentSone(toadletContext, sones[1])