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 CreateReplyAjaxPage
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
pages
/
DeleteAlbumPageTest.kt
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPageTest.kt
index
3a1c504
..
a7fd486
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPageTest.kt
@@
-2,14
+2,14
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.Album
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.data.Album
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.DeleteAlbumPage
-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.ArgumentMatchers.anyString
import org.junit.Before
import org.junit.Test
import org.mockito.ArgumentMatchers.anyString
@@
-18,16
+18,12
@@
import org.mockito.Mockito.verify
/**
* Unit test for [DeleteAlbumPage].
*/
/**
* Unit test for [DeleteAlbumPage].
*/
-class DeleteAlbumPageTest: WebPageTest() {
-
- private val page = DeleteAlbumPage(template, webInterface)
+class DeleteAlbumPageTest: WebPageTest(::DeleteAlbumPage) {
private val sone = mock<Sone>()
private val album = mock<Album>()
private val parentAlbum = mock<Album>()
private val sone = mock<Sone>()
private val album = mock<Album>()
private val parentAlbum = mock<Album>()
- override fun getPage() = page
-
@Before
fun setupAlbums() {
whenever(sone.id).thenReturn("sone-id")
@Before
fun setupAlbums() {
whenever(sone.id).thenReturn("sone-id")
@@
-52,14
+48,12
@@
class DeleteAlbumPageTest: WebPageTest() {
@Test
fun `get request with invalid album ID results in redirect to invalid page`() {
@Test
fun `get request with invalid album ID results in redirect to invalid page`() {
- request("", GET)
whenever(core.getAlbum(anyString())).thenReturn(null)
verifyRedirect("invalid.html")
}
@Test
fun `get request with valid album ID sets album in template context`() {
whenever(core.getAlbum(anyString())).thenReturn(null)
verifyRedirect("invalid.html")
}
@Test
fun `get request with valid album ID sets album in template context`() {
- request("", GET)
val album = mock<Album>()
addAlbum("album-id", album)
addHttpRequestParameter("album", "album-id")
val album = mock<Album>()
addAlbum("album-id", album)
addHttpRequestParameter("album", "album-id")
@@
-69,13
+63,13
@@
class DeleteAlbumPageTest: WebPageTest() {
@Test
fun `post request redirects to invalid page if album is invalid`() {
@Test
fun `post request redirects to invalid page if album is invalid`() {
-
request("",
POST)
+
setMethod(
POST)
verifyRedirect("invalid.html")
}
@Test
fun `post request redirects to no permissions page if album is not local`() {
verifyRedirect("invalid.html")
}
@Test
fun `post request redirects to no permissions page if album is not local`() {
-
request("",
POST)
+
setMethod(
POST)
whenever(sone.isLocal).thenReturn(false)
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
whenever(sone.isLocal).thenReturn(false)
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
@@
-84,7
+78,7
@@
class DeleteAlbumPageTest: WebPageTest() {
@Test
fun `post request with abort delete parameter set redirects to album browser`() {
@Test
fun `post request with abort delete parameter set redirects to album browser`() {
-
request("",
POST)
+
setMethod(
POST)
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
addHttpRequestPart("abortDelete", "true")
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
addHttpRequestPart("abortDelete", "true")
@@
-93,7
+87,7
@@
class DeleteAlbumPageTest: WebPageTest() {
@Test
fun `album is deleted and page redirects to sone if parent album is root album`() {
@Test
fun `album is deleted and page redirects to sone if parent album is root album`() {
-
request("",
POST)
+
setMethod(
POST)
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
verifyRedirect("imageBrowser.html?sone=sone-id") {
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
verifyRedirect("imageBrowser.html?sone=sone-id") {
@@
-103,7
+97,7
@@
class DeleteAlbumPageTest: WebPageTest() {
@Test
fun `album is deleted and page redirects to album if parent album is not root album`() {
@Test
fun `album is deleted and page redirects to album if parent album is not root album`() {
-
request("",
POST)
+
setMethod(
POST)
whenever(parentAlbum.isRoot).thenReturn(false)
whenever(sone.rootAlbum).thenReturn(mock<Album>())
addAlbum("album-id", album)
whenever(parentAlbum.isRoot).thenReturn(false)
whenever(sone.rootAlbum).thenReturn(mock<Album>())
addAlbum("album-id", album)
@@
-113,4
+107,9
@@
class DeleteAlbumPageTest: WebPageTest() {
}
}
}
}
+ @Test
+ fun `page can be created by dependency injection`() {
+ assertThat(baseInjector.getInstance<DeleteAlbumPage>(), notNullValue())
+ }
+
}
}