projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
🎨 Reduce mocking of albums and images
[Sone.git]
/
src
/
test
/
kotlin
/
net
/
pterodactylus
/
sone
/
web
/
pages
/
DeleteImagePageTest.kt
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePageTest.kt
index
1c5c274
..
eccf949
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePageTest.kt
@@
-1,6
+1,7
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.*
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.data.impl.*
import net.pterodactylus.sone.test.*
import net.pterodactylus.sone.web.*
import net.pterodactylus.sone.web.page.*
import net.pterodactylus.sone.test.*
import net.pterodactylus.sone.web.*
import net.pterodactylus.sone.web.page.*
@@
-13,18
+14,14
@@
import org.mockito.Mockito.*
/**
* Unit test for [DeleteImagePage].
*/
/**
* Unit test for [DeleteImagePage].
*/
-class DeleteImagePageTest: WebPageTest(::DeleteImagePage) {
+class DeleteImagePageTest
: WebPageTest(::DeleteImagePage) {
- private val image = mock<Image>()
private val sone = mock<Sone>()
private val sone = mock<Sone>()
+ private val image = ImageImpl("image-id").modify().setSone(sone).update()!!
@Before
fun setupImage() {
@Before
fun setupImage() {
- val album = mock<Album>()
- whenever(album.id).thenReturn("album-id")
- whenever(image.id).thenReturn("image-id")
- whenever(image.sone).thenReturn(sone)
- whenever(image.album).thenReturn(album)
+ AlbumImpl(sone, "album-id").also { it.addImage(image) }
whenever(sone.isLocal).thenReturn(true)
}
whenever(sone.isLocal).thenReturn(true)
}
@@
-80,12
+77,12
@@
class DeleteImagePageTest: WebPageTest(::DeleteImagePage) {
@Test
fun `page can be created by dependency injection`() {
@Test
fun `page can be created by dependency injection`() {
- assertThat(baseInjector.getInstance<DeleteImagePage>(), notNullValue())
+
assertThat(baseInjector.getInstance<DeleteImagePage>(), notNullValue())
}
@Test
fun `page is annotated with correct template path`() {
}
@Test
fun `page is annotated with correct template path`() {
- assertThat(page.templatePath, equalTo("/templates/deleteImage.html"))
+
assertThat(page.templatePath, equalTo("/templates/deleteImage.html"))
}
}
}
}