X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FFollowSonePageTest.kt;h=199c6fdd652da2492b4e1269cc79180e436e0ca7;hp=0cd84443f6cebaf5cf737423ed20b2b0de5c7130;hb=cd72add62ab407336b471d4b7cda8e33dd2df5c6;hpb=ec655d61682a70063c1cf540fe3e41613aaf71a5

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/FollowSonePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/FollowSonePageTest.kt
index 0cd8444..199c6fd 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/FollowSonePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/FollowSonePageTest.kt
@@ -1,12 +1,14 @@
 package net.pterodactylus.sone.web.pages
 
 import net.pterodactylus.sone.data.Sone
+import net.pterodactylus.sone.test.getInstance
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
-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.equalTo
+import org.hamcrest.Matchers.notNullValue
 import org.junit.Test
 import org.mockito.ArgumentMatchers
 import org.mockito.ArgumentMatchers.any
@@ -17,11 +19,7 @@ import org.mockito.Mockito.verify
 /**
  * Unit test for [FollowSonePage].
  */
-class FollowSonePageTest : WebPageTest() {
-
-	private val page = FollowSonePage(template, webInterface)
-
-	override fun getPage() = page
+class FollowSonePageTest: WebPageTest(::FollowSonePage) {
 
 	@Test
 	fun `page returns correct path`() {
@@ -36,22 +34,21 @@ class FollowSonePageTest : WebPageTest() {
 	@Test
 	fun `page returns correct title`() {
 	    whenever(l10n.getString("Page.FollowSone.Title")).thenReturn("follow sone page title")
-		assertThat(page.getPageTitle(freenetRequest), equalTo("follow sone page title"))
+		assertThat(page.getPageTitle(soneRequest), equalTo("follow sone page title"))
 	}
 
 	@Test
 	fun `get request does not redirect`() {
-		request("", GET)
 		page.processTemplate(freenetRequest, templateContext)
 	}
 
 	@Test
 	fun `a single sone can be followed`() {
-		request("", POST)
+		setMethod(POST)
 		val sone = mock<Sone>()
 		addSone("sone-id", sone)
-		addHttpRequestParameter("sone", "sone-id")
-		addHttpRequestParameter("returnPage", "return.html")
+		addHttpRequestPart("sone", "sone-id")
+		addHttpRequestPart("returnPage", "return.html")
 		verifyRedirect("return.html") {
 			verify(core).followSone(currentSone, "sone-id")
 			verify(core).markSoneKnown(sone)
@@ -60,13 +57,13 @@ class FollowSonePageTest : WebPageTest() {
 
 	@Test
 	fun `multiple sones can be followed`() {
-		request("", POST)
+		setMethod(POST)
 		val firstSone = mock<Sone>()
 		addSone("sone-id1", firstSone)
 		val secondSone = mock<Sone>()
 		addSone("sone-id2", secondSone)
-		addHttpRequestParameter("sone", "sone-id1,sone-id2")
-		addHttpRequestParameter("returnPage", "return.html")
+		addHttpRequestPart("sone", "sone-id1,sone-id2")
+		addHttpRequestPart("returnPage", "return.html")
 		verifyRedirect("return.html") {
 			verify(core).followSone(currentSone, "sone-id1")
 			verify(core).followSone(currentSone, "sone-id2")
@@ -77,13 +74,18 @@ class FollowSonePageTest : WebPageTest() {
 
 	@Test
 	fun `a non-existing sone is not followed`() {
-		request("", POST)
-		addHttpRequestParameter("sone", "sone-id")
-		addHttpRequestParameter("returnPage", "return.html")
+		setMethod(POST)
+		addHttpRequestPart("sone", "sone-id")
+		addHttpRequestPart("returnPage", "return.html")
 		verifyRedirect("return.html") {
 			verify(core, never()).followSone(ArgumentMatchers.eq(currentSone), anyString())
 			verify(core, never()).markSoneKnown(any<Sone>())
 		}
 	}
 
+	@Test
+	fun `page can be created by dependency injection`() {
+	    assertThat(baseInjector.getInstance<FollowSonePage>(), notNullValue())
+	}
+
 }