projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert bookmark page test to use new web page test base
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
pages
/
FollowSonePageTest.kt
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
(file)
--- 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.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
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].
*/
/**
* 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`() {
@Test
fun `page returns correct path`() {
@@
-41,17
+36,16
@@
class FollowSonePageTest : WebPageTest() {
@Test
fun `get request does not redirect`() {
@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`() {
}
@Test
fun `a single sone can be followed`() {
-
request("",
POST)
+
setMethod(
POST)
val sone = mock<Sone>()
addSone("sone-id", sone)
val sone = mock<Sone>()
addSone("sone-id", sone)
- addHttpRequestPar
ameter
("sone", "sone-id")
- addHttpRequestPar
ameter
("returnPage", "return.html")
+ addHttpRequestPar
t
("sone", "sone-id")
+ addHttpRequestPar
t
("returnPage", "return.html")
verifyRedirect("return.html") {
verify(core).followSone(currentSone, "sone-id")
verify(core).markSoneKnown(sone)
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`() {
@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)
val firstSone = mock<Sone>()
addSone("sone-id1", firstSone)
val secondSone = mock<Sone>()
addSone("sone-id2", secondSone)
- addHttpRequestPar
ameter
("sone", "sone-id1,sone-id2")
- addHttpRequestPar
ameter
("returnPage", "return.html")
+ addHttpRequestPar
t
("sone", "sone-id1,sone-id2")
+ addHttpRequestPar
t
("returnPage", "return.html")
verifyRedirect("return.html") {
verify(core).followSone(currentSone, "sone-id1")
verify(core).followSone(currentSone, "sone-id2")
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`() {
@Test
fun `a non-existing sone is not followed`() {
-
request("",
POST)
- addHttpRequestPar
ameter
("sone", "sone-id")
- addHttpRequestPar
ameter
("returnPage", "return.html")
+
setMethod(
POST)
+ addHttpRequestPar
t
("sone", "sone-id")
+ addHttpRequestPar
t
("returnPage", "return.html")
verifyRedirect("return.html") {
verify(core, never()).followSone(ArgumentMatchers.eq(currentSone), anyString())
verify(core, never()).markSoneKnown(any<Sone>())
verifyRedirect("return.html") {
verify(core, never()).followSone(ArgumentMatchers.eq(currentSone), anyString())
verify(core, never()).markSoneKnown(any<Sone>())