projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace test for bookmark page with Kotlin version
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
LockSonePageTest.kt
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/LockSonePageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/LockSonePageTest.kt
index
44cd81c
..
7136e04
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/LockSonePageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/LockSonePageTest.kt
@@
-14,13
+14,12
@@
class LockSonePageTest : WebPageTest() {
private val page = LockSonePage(template, webInterface)
private val page = LockSonePage(template, webInterface)
+ override fun getPage() = page
+
@Test
fun `locking an invalid local sone redirects to return page`() {
addHttpRequestParameter("returnPage", "return.html")
@Test
fun `locking an invalid local sone redirects to return page`() {
addHttpRequestParameter("returnPage", "return.html")
- expectedException.expect(WebTestUtils.redirectsTo("return.html"))
- try {
- page.handleRequest(freenetRequest, templateContext)
- } finally {
+ verifyRedirect("return.html") {
verify(core, never()).lockSone(any<Sone>())
}
}
verify(core, never()).lockSone(any<Sone>())
}
}
@@
-31,10
+30,7
@@
class LockSonePageTest : WebPageTest() {
val sone = mock<Sone>()
addLocalSone("sone-id", sone)
addHttpRequestParameter("returnPage", "return.html")
val sone = mock<Sone>()
addLocalSone("sone-id", sone)
addHttpRequestParameter("returnPage", "return.html")
- expectedException.expect(WebTestUtils.redirectsTo("return.html"))
- try {
- page.handleRequest(freenetRequest, templateContext)
- } finally {
+ verifyRedirect("return.html") {
verify(core).lockSone(sone)
}
}
verify(core).lockSone(sone)
}
}