X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FFollowSonePageTest.kt;h=3e80cc5197484ce64dff39fe04a324a2b8e37fa4;hb=04d8d233b097a2c1a856d4fe2a1dc87a7ea3a26b;hp=df65727c9276551d9fb3c5c3659d7078ce24110a;hpb=28b8d916e878535f5f93c7c2600a6d2e04e5ffcd;p=Sone.git

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 df65727..3e80cc5 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/FollowSonePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/FollowSonePageTest.kt
@@ -3,7 +3,6 @@ package net.pterodactylus.sone.web.pages
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.util.web.Method.GET
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
@@ -17,11 +16,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: WebPageTest2(::FollowSonePage) {
 
 	@Test
 	fun `page returns correct path`() {
@@ -41,17 +36,16 @@ class FollowSonePageTest : WebPageTest() {
 
 	@Test
 	fun `get request does not redirect`() {
-		request("", GET)
-		page.handleRequest(freenetRequest, templateContext)
+		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 +54,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,9 +71,9 @@ 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>())