X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FDismissNotificationPageTest.kt;h=933a90a457913792dd93377998ffb689eafa9f4c;hp=b6524a8207e96f5667c2b013030daa9ac2391078;hb=3db634e425d3482bcf00dfd82e4b0d46785d5959;hpb=de7568a82eb4150bf6d2b0553841b7b69f84c968

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPageTest.kt
index b6524a8..933a90a 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPageTest.kt
@@ -1,13 +1,14 @@
 package net.pterodactylus.sone.web.pages
 
+import net.pterodactylus.sone.test.getInstance
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.DismissNotificationPage
+import net.pterodactylus.sone.web.baseInjector
 import net.pterodactylus.util.notify.Notification
-import net.pterodactylus.util.web.Method.GET
+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.Mockito.never
 import org.mockito.Mockito.verify
@@ -15,13 +16,10 @@ import org.mockito.Mockito.verify
 /**
  * Unit test for [DismissNotificationPage].
  */
-class DismissNotificationPageTest: WebPageTest() {
+class DismissNotificationPageTest: WebPageTest(::DismissNotificationPage) {
 
-	private val page = DismissNotificationPage(template, webInterface)
 	private val notification = mock<Notification>()
 
-	override fun getPage() = page
-
 	@Test
 	fun `page returns correct path`() {
 		assertThat(page.path, equalTo("dismissNotification.html"))
@@ -35,37 +33,42 @@ class DismissNotificationPageTest: WebPageTest() {
 	@Test
 	fun `page returns correct title`() {
 		whenever(l10n.getString("Page.DismissNotification.Title")).thenReturn("dismiss notification page")
-		assertThat(page.getPageTitle(freenetRequest), equalTo("dismiss notification page"))
+		assertThat(page.getPageTitle(soneRequest), equalTo("dismiss notification page"))
 	}
 
 	@Test
 	fun `get request with invalid notification ID redirects to return page`() {
-		request("", GET)
-		addHttpRequestParameter("returnPage", "return.html")
+		setMethod(POST)
+		addHttpRequestPart("returnPage", "return.html")
 		verifyRedirect("return.html")
 	}
 
 	@Test
 	fun `get request with non-dismissible notification never dismisses the notification but redirects to return page`() {
-		request("", GET)
+		setMethod(POST)
 		addNotification("notification-id", notification)
-		addHttpRequestParameter("notification", "notification-id")
-		addHttpRequestParameter("returnPage", "return.html")
+		addHttpRequestPart("notification", "notification-id")
+		addHttpRequestPart("returnPage", "return.html")
 		verifyRedirect("return.html") {
 			verify(notification, never()).dismiss()
 		}
 	}
 
 	@Test
-	fun `get request with dismissible notification dismisses the notification and redirects to return page`() {
-		request("", GET)
+	fun `post request with dismissible notification dismisses the notification and redirects to return page`() {
+		setMethod(POST)
 		whenever(notification.isDismissable).thenReturn(true)
 		addNotification("notification-id", notification)
-		addHttpRequestParameter("notification", "notification-id")
-		addHttpRequestParameter("returnPage", "return.html")
+		addHttpRequestPart("notification", "notification-id")
+		addHttpRequestPart("returnPage", "return.html")
 		verifyRedirect("return.html") {
 			verify(notification).dismiss()
 		}
 	}
 
+	@Test
+	fun `page can be created by dependency injection`() {
+		assertThat(baseInjector.getInstance<DismissNotificationPage>(), notNullValue())
+	}
+
 }