projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add test for DI constructability of ReloadingPage
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
pages
/
DismissNotificationPageTest.kt
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
..
c6aab00
100644
(file)
--- 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
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.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.notify.Notification
-import net.pterodactylus.util.web.Method.
GE
T
+import net.pterodactylus.util.web.Method.
POS
T
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
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
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].
*/
/**
* Unit test for [DismissNotificationPage].
*/
-class DismissNotificationPageTest: WebPageTest() {
+class DismissNotificationPageTest: WebPageTest(
::DismissNotificationPage
) {
- private val page = DismissNotificationPage(template, webInterface)
private val notification = mock<Notification>()
private val notification = mock<Notification>()
- override fun getPage() = page
-
@Test
fun `page returns correct path`() {
assertThat(page.path, equalTo("dismissNotification.html"))
@Test
fun `page returns correct path`() {
assertThat(page.path, equalTo("dismissNotification.html"))
@@
-40,32
+38,37
@@
class DismissNotificationPageTest: WebPageTest() {
@Test
fun `get request with invalid notification ID redirects to return page`() {
@Test
fun `get request with invalid notification ID redirects to return page`() {
-
request("", GE
T)
- addHttpRequestPar
ameter
("returnPage", "return.html")
+
setMethod(POS
T)
+ addHttpRequestPar
t
("returnPage", "return.html")
verifyRedirect("return.html")
}
@Test
fun `get request with non-dismissible notification never dismisses the notification but redirects to return page`() {
verifyRedirect("return.html")
}
@Test
fun `get request with non-dismissible notification never dismisses the notification but redirects to return page`() {
-
request("", GE
T)
+
setMethod(POS
T)
addNotification("notification-id", notification)
addNotification("notification-id", notification)
- addHttpRequestPar
ameter
("notification", "notification-id")
- addHttpRequestPar
ameter
("returnPage", "return.html")
+ addHttpRequestPar
t
("notification", "notification-id")
+ addHttpRequestPar
t
("returnPage", "return.html")
verifyRedirect("return.html") {
verify(notification, never()).dismiss()
}
}
@Test
verifyRedirect("return.html") {
verify(notification, never()).dismiss()
}
}
@Test
- fun `
ge
t request with dismissible notification dismisses the notification and redirects to return page`() {
-
request("", GE
T)
+ fun `
pos
t request with dismissible notification dismisses the notification and redirects to return page`() {
+
setMethod(POS
T)
whenever(notification.isDismissable).thenReturn(true)
addNotification("notification-id", notification)
whenever(notification.isDismissable).thenReturn(true)
addNotification("notification-id", notification)
- addHttpRequestPar
ameter
("notification", "notification-id")
- addHttpRequestPar
ameter
("returnPage", "return.html")
+ addHttpRequestPar
t
("notification", "notification-id")
+ addHttpRequestPar
t
("returnPage", "return.html")
verifyRedirect("return.html") {
verify(notification).dismiss()
}
}
verifyRedirect("return.html") {
verify(notification).dismiss()
}
}
+ @Test
+ fun `page can be created by dependency injection`() {
+ assertThat(baseInjector.getInstance<DismissNotificationPage>(), notNullValue())
+ }
+
}
}