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=ae5b7af3cca49930c086d65dad18aa761da6cbcf;hp=7832f6890907460c4739c37fbac0fc31d9af49d7;hb=9bb01bc8fe281e6748ebd744ade8945bee841213;hpb=05fb821e72072bde52f383bdc5a988da67f66d0c

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 7832f68..ae5b7af 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/LoginPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/LoginPageTest.kt
@@ -3,17 +3,17 @@ package net.pterodactylus.sone.web.pages
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.freenet.wot.Identity
 import net.pterodactylus.sone.freenet.wot.OwnIdentity
+import net.pterodactylus.sone.test.getInstance
 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.sone.web.baseInjector
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.contains
 import org.hamcrest.Matchers.containsInAnyOrder
 import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.notNullValue
 import org.hamcrest.Matchers.nullValue
 import org.junit.Before
 import org.junit.Test
@@ -22,14 +22,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 +59,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 +66,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 +73,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,7 +81,7 @@ class LoginPageTest : WebPageTest() {
 
 	@Test
 	fun `post request with valid sone logs in the sone and redirects to index page`() {
-		request("", POST)
+		setMethod(POST)
 		addHttpRequestPart("sone-id", "sone2")
 		verifyRedirect("index.html") {
 			verify(webInterface).setCurrentSone(toadletContext, sones[1])
@@ -96,7 +90,7 @@ class LoginPageTest : WebPageTest() {
 
 	@Test
 	fun `post request with valid sone and target redirects to target page`() {
-		request("", POST)
+		setMethod(POST)
 		addHttpRequestPart("sone-id", "sone2")
 		addHttpRequestParameter("target", "foo.html")
 		verifyRedirect("foo.html") {
@@ -147,4 +141,9 @@ class LoginPageTest : WebPageTest() {
 		assertThat(page.isEnabled(toadletContext), equalTo(false))
 	}
 
+	@Test
+	fun `page can be created by dependency injection`() {
+	    assertThat(baseInjector.getInstance<LoginPage>(), notNullValue())
+	}
+
 }