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
/
BookmarkPageTest.kt
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarkPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarkPageTest.kt
index
411d051
..
c03706b
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarkPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarkPageTest.kt
@@
-2,8
+2,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.Post
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.data.Post
import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.BookmarkPage
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
@@
-15,10
+13,7
@@
import org.mockito.Mockito.verify
/**
* Unit test for [BookmarkPage].
*/
/**
* Unit test for [BookmarkPage].
*/
-class BookmarkPageTest : WebPageTest() {
-
- private val page = BookmarkPage(template, webInterface)
- override fun getPage() = page
+class BookmarkPageTest: WebPageTest2(::BookmarkPage) {
@Test
fun `path is set correctly`() {
@Test
fun `path is set correctly`() {
@@
-27,12
+22,13
@@
class BookmarkPageTest : WebPageTest() {
@Test
fun `get request does not bookmark anything and does not redirect`() {
@Test
fun `get request does not bookmark anything and does not redirect`() {
- page.processTemplate(freenetRequest, templateContext)
- verify(core, never()).bookmarkPost(any())
+ verifyNoRedirect {
+ verify(core, never()).bookmarkPost(any())
+ }
}
private fun setupBookmarkRequest() {
}
private fun setupBookmarkRequest() {
-
request("",
POST)
+
setMethod(
POST)
addHttpRequestPart("returnPage", "return-page.html")
addHttpRequestPart("post", "post-id")
}
addHttpRequestPart("returnPage", "return-page.html")
addHttpRequestPart("post", "post-id")
}