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 GetPostAjaxPage
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
pages
/
DeletePostPageTest.kt
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeletePostPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeletePostPageTest.kt
index
c55f1a5
..
3c18fb4
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeletePostPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeletePostPageTest.kt
@@
-2,14
+2,14
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.Post
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.data.Post
import net.pterodactylus.sone.data.Sone
+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.DeletePostPage
-import net.pterodactylus.util.web.Method.GET
+import net.pterodactylus.sone.web.baseInjector
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
+import org.hamcrest.Matchers.notNullValue
import org.junit.Before
import org.junit.Test
import org.mockito.Mockito.never
import org.junit.Before
import org.junit.Test
import org.mockito.Mockito.never
@@
-18,15
+18,11
@@
import org.mockito.Mockito.verify
/**
* Unit test for [DeletePostPage].
*/
/**
* Unit test for [DeletePostPage].
*/
-class DeletePostPageTest : WebPageTest() {
-
- private val page = DeletePostPage(template, webInterface)
+class DeletePostPageTest: WebPageTest(::DeletePostPage) {
private val post = mock<Post>()
private val sone = mock<Sone>()
private val post = mock<Post>()
private val sone = mock<Sone>()
- override fun getPage() = page
-
@Before
fun setupPost() {
whenever(post.sone).thenReturn(sone)
@Before
fun setupPost() {
whenever(post.sone).thenReturn(sone)
@@
-45,13
+41,11
@@
class DeletePostPageTest : WebPageTest() {
@Test
fun `get request with invalid post redirects to no permission page`() {
@Test
fun `get request with invalid post redirects to no permission page`() {
- request("", GET)
verifyRedirect("noPermission.html")
}
@Test
fun `get request with valid post sets post and return page in template context`() {
verifyRedirect("noPermission.html")
}
@Test
fun `get request with valid post sets post and return page in template context`() {
- request("", GET)
addPost("post-id", post)
addHttpRequestParameter("post", "post-id")
addHttpRequestParameter("returnPage", "return.html")
addPost("post-id", post)
addHttpRequestParameter("post", "post-id")
addHttpRequestParameter("returnPage", "return.html")
@@
-62,13
+56,13
@@
class DeletePostPageTest : WebPageTest() {
@Test
fun `post request with invalid post redirects to no permission page`() {
@Test
fun `post request with invalid post redirects to no permission page`() {
-
request("",
POST)
+
setMethod(
POST)
verifyRedirect("noPermission.html")
}
@Test
fun `post request with post from non-local sone redirects to no permission page`() {
verifyRedirect("noPermission.html")
}
@Test
fun `post request with post from non-local sone redirects to no permission page`() {
-
request("",
POST)
+
setMethod(
POST)
whenever(sone.isLocal).thenReturn(false)
addPost("post-id", post)
addHttpRequestPart("post", "post-id")
whenever(sone.isLocal).thenReturn(false)
addPost("post-id", post)
addHttpRequestPart("post", "post-id")
@@
-78,7
+72,7
@@
class DeletePostPageTest : WebPageTest() {
@Test
fun `post request with confirmation deletes post and redirects to return page`() {
@Test
fun `post request with confirmation deletes post and redirects to return page`() {
-
request("",
POST)
+
setMethod(
POST)
addPost("post-id", post)
addHttpRequestPart("post", "post-id")
addHttpRequestPart("returnPage", "return.html")
addPost("post-id", post)
addHttpRequestPart("post", "post-id")
addHttpRequestPart("returnPage", "return.html")
@@
-90,7
+84,7
@@
class DeletePostPageTest : WebPageTest() {
@Test
fun `post request with abort delete does not delete post and redirects to return page`() {
@Test
fun `post request with abort delete does not delete post and redirects to return page`() {
-
request("",
POST)
+
setMethod(
POST)
addPost("post-id", post)
addHttpRequestPart("post", "post-id")
addHttpRequestPart("returnPage", "return.html")
addPost("post-id", post)
addHttpRequestPart("post", "post-id")
addHttpRequestPart("returnPage", "return.html")
@@
-102,7
+96,7
@@
class DeletePostPageTest : WebPageTest() {
@Test
fun `post request without delete or abort sets post in template context`() {
@Test
fun `post request without delete or abort sets post in template context`() {
-
request("",
POST)
+
setMethod(
POST)
addPost("post-id", post)
addHttpRequestPart("post", "post-id")
addHttpRequestPart("returnPage", "return.html")
addPost("post-id", post)
addHttpRequestPart("post", "post-id")
addHttpRequestPart("returnPage", "return.html")
@@
-111,4
+105,9
@@
class DeletePostPageTest : WebPageTest() {
assertThat(templateContext["returnPage"], equalTo<Any>("return.html"))
}
assertThat(templateContext["returnPage"], equalTo<Any>("return.html"))
}
+ @Test
+ fun `page can be created by dependency injection`() {
+ assertThat(baseInjector.getInstance<DeletePostPage>(), notNullValue())
+ }
+
}
}