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 LoginPage
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
pages
/
EditAlbumPageTest.kt
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPageTest.kt
index
3583762
..
b085fb4
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPageTest.kt
@@
-4,15
+4,15
@@
import net.pterodactylus.sone.data.Album
import net.pterodactylus.sone.data.Album.Modifier
import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.data.Album.Modifier
import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty
import net.pterodactylus.sone.data.Sone
+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.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.EditAlbumPage
-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.verify
import org.junit.Before
import org.junit.Test
import org.mockito.Mockito.verify
@@
-20,17
+20,13
@@
import org.mockito.Mockito.verify
/**
* Unit test for [EditAlbumPage].
*/
/**
* Unit test for [EditAlbumPage].
*/
-class EditAlbumPageTest: WebPageTest() {
-
- private val page = EditAlbumPage(template, webInterface)
+class EditAlbumPageTest: WebPageTest(::EditAlbumPage) {
private val album = mock<Album>()
private val parentAlbum = mock<Album>()
private val modifier = mockBuilder<Modifier>()
private val sone = mock<Sone>()
private val album = mock<Album>()
private val parentAlbum = mock<Album>()
private val modifier = mockBuilder<Modifier>()
private val sone = mock<Sone>()
- override fun getPage() = page
-
@Before
fun setup() {
whenever(album.id).thenReturn("album-id")
@Before
fun setup() {
whenever(album.id).thenReturn("album-id")
@@
-61,19
+57,18
@@
class EditAlbumPageTest: 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 album redirects to invalid page`() {
page.processTemplate(freenetRequest, templateContext)
}
@Test
fun `post request with invalid album redirects to invalid page`() {
-
request("",
POST)
+
setMethod(
POST)
verifyRedirect("invalid.html")
}
@Test
fun `post request with album of non-local sone redirects to no permissions page`() {
verifyRedirect("invalid.html")
}
@Test
fun `post request with album of non-local sone redirects to no permissions page`() {
-
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")
@@
-82,7
+77,7
@@
class EditAlbumPageTest: WebPageTest() {
@Test
fun `post request with move left requested moves album to the left and redirects to album browser`() {
@Test
fun `post request with move left requested moves album to the left and redirects to album browser`() {
-
request("",
POST)
+
setMethod(
POST)
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
addHttpRequestPart("moveLeft", "true")
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
addHttpRequestPart("moveLeft", "true")
@@
-94,7
+89,7
@@
class EditAlbumPageTest: WebPageTest() {
@Test
fun `post request with move right requested moves album to the left and redirects to album browser`() {
@Test
fun `post request with move right requested moves album to the left and redirects to album browser`() {
-
request("",
POST)
+
setMethod(
POST)
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
addHttpRequestPart("moveRight", "true")
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
addHttpRequestPart("moveRight", "true")
@@
-106,7
+101,7
@@
class EditAlbumPageTest: WebPageTest() {
@Test
fun `post request with empty album title redirects to empty album title page`() {
@Test
fun `post request with empty album title redirects to empty album title page`() {
-
request("",
POST)
+
setMethod(
POST)
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
whenever(modifier.setTitle("")).thenThrow(AlbumTitleMustNotBeEmpty())
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
whenever(modifier.setTitle("")).thenThrow(AlbumTitleMustNotBeEmpty())
@@
-115,7
+110,7
@@
class EditAlbumPageTest: WebPageTest() {
@Test
fun `post request with non-empty album title and description redirects to album browser`() {
@Test
fun `post request with non-empty album title and description redirects to album browser`() {
-
request("",
POST)
+
setMethod(
POST)
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
addHttpRequestPart("title", "title")
addAlbum("album-id", album)
addHttpRequestPart("album", "album-id")
addHttpRequestPart("title", "title")
@@
-128,4
+123,9
@@
class EditAlbumPageTest: WebPageTest() {
}
}
}
}
+ @Test
+ fun `page can be created by dependency injection`() {
+ assertThat(baseInjector.getInstance<EditAlbumPage>(), notNullValue())
+ }
+
}
}