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 DismissNotificationAjaxPage
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
pages
/
EditImagePageTest.kt
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt
index
ac710d5
..
ea104e0
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/EditImagePageTest.kt
@@
-6,13
+6,15
@@
import net.pterodactylus.sone.data.Image.Modifier
import net.pterodactylus.sone.data.Image.Modifier.ImageTitleMustNotBeEmpty
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.doThrow
import net.pterodactylus.sone.data.Image.Modifier.ImageTitleMustNotBeEmpty
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.doThrow
+import net.pterodactylus.sone.test.getInstance
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.mockBuilder
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.mockBuilder
import net.pterodactylus.sone.test.whenever
-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
@@
-21,17
+23,13
@@
import org.mockito.Mockito.verify
/**
* Unit test for [EditImagePage].
*/
/**
* Unit test for [EditImagePage].
*/
-class EditImagePageTest : WebPageTest() {
-
- private val page = EditImagePage(template, webInterface)
+class EditImagePageTest: WebPageTest(::EditImagePage) {
private val image = mock<Image>()
private val modifier = mockBuilder<Modifier>()
private val sone = mock<Sone>()
private val album = mock<Album>()
private val image = mock<Image>()
private val modifier = mockBuilder<Modifier>()
private val sone = mock<Sone>()
private val album = mock<Album>()
- override fun getPage() = page
-
@Before
fun setupImage() {
whenever(sone.isLocal).thenReturn(true)
@Before
fun setupImage() {
whenever(sone.isLocal).thenReturn(true)
@@
-60,19
+58,18
@@
class EditImagePageTest : WebPageTest() {
@Test
fun `get request does not redirect`() {
@Test
fun `get request does not redirect`() {
- request("", GET)
page.processTemplate(freenetRequest, templateContext)
}
@Test
fun `post request with invalid image redirects to invalid page`() {
page.processTemplate(freenetRequest, templateContext)
}
@Test
fun `post request with invalid image redirects to invalid page`() {
-
request("",
POST)
+
setMethod(
POST)
verifyRedirect("invalid.html")
}
@Test
fun `post request with valid image from non-local sone redirects to no permission page`() {
verifyRedirect("invalid.html")
}
@Test
fun `post request with valid image from non-local sone redirects to no permission page`() {
-
request("",
POST)
+
setMethod(
POST)
whenever(sone.isLocal).thenReturn(false)
addImage("image-id", image)
addHttpRequestPart("image", "image-id")
whenever(sone.isLocal).thenReturn(false)
addImage("image-id", image)
addHttpRequestPart("image", "image-id")
@@
-81,7
+78,7
@@
class EditImagePageTest : WebPageTest() {
@Test
fun `post request with valid image and move left requested moves image left and redirects to return page`() {
@Test
fun `post request with valid image and move left requested moves image left and redirects to return page`() {
-
request("",
POST)
+
setMethod(
POST)
addImage("image-id", image)
addHttpRequestPart("image", "image-id")
addHttpRequestPart("returnPage", "return.html")
addImage("image-id", image)
addHttpRequestPart("image", "image-id")
addHttpRequestPart("returnPage", "return.html")
@@
-94,7
+91,7
@@
class EditImagePageTest : WebPageTest() {
@Test
fun `post request with valid image and move right requested moves image right and redirects to return page`() {
@Test
fun `post request with valid image and move right requested moves image right and redirects to return page`() {
-
request("",
POST)
+
setMethod(
POST)
addImage("image-id", image)
addHttpRequestPart("image", "image-id")
addHttpRequestPart("returnPage", "return.html")
addImage("image-id", image)
addHttpRequestPart("image", "image-id")
addHttpRequestPart("returnPage", "return.html")
@@
-107,7
+104,7
@@
class EditImagePageTest : WebPageTest() {
@Test
fun `post request with valid image but only whitespace in the title redirects to empty image title page`() {
@Test
fun `post request with valid image but only whitespace in the title redirects to empty image title page`() {
-
request("",
POST)
+
setMethod(
POST)
addImage("image-id", image)
addHttpRequestPart("image", "image-id")
addHttpRequestPart("returnPage", "return.html")
addImage("image-id", image)
addHttpRequestPart("image", "image-id")
addHttpRequestPart("returnPage", "return.html")
@@
-120,7
+117,7
@@
class EditImagePageTest : WebPageTest() {
@Test
fun `post request with valid image title and description modifies image and redirects to reutrn page`() {
@Test
fun `post request with valid image title and description modifies image and redirects to reutrn page`() {
-
request("",
POST)
+
setMethod(
POST)
addImage("image-id", image)
addHttpRequestPart("image", "image-id")
addHttpRequestPart("returnPage", "return.html")
addImage("image-id", image)
addHttpRequestPart("image", "image-id")
addHttpRequestPart("returnPage", "return.html")
@@
-136,7
+133,7
@@
class EditImagePageTest : WebPageTest() {
@Test
fun `post request with image title and description modifies image with filtered description and redirects to return page`() {
@Test
fun `post request with image title and description modifies image with filtered description and redirects to return page`() {
-
request("",
POST)
+
setMethod(
POST)
addImage("image-id", image)
addHttpRequestPart("image", "image-id")
addHttpRequestPart("returnPage", "return.html")
addImage("image-id", image)
addHttpRequestPart("image", "image-id")
addHttpRequestPart("returnPage", "return.html")
@@
-151,4
+148,9
@@
class EditImagePageTest : WebPageTest() {
}
}
}
}
+ @Test
+ fun `page can be created by dependency injection`() {
+ assertThat(baseInjector.getInstance<EditImagePage>(), notNullValue())
+ }
+
}
}