X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FEditImageAjaxPageTest.kt;h=e63bb8a5da4880c4bb81fcc3f80b21c8342c9073;hp=26436a3178058dff426e82f0ac6046eedbfd5dfa;hb=2ab560633c24940fa49bdaf569635dd673ad7b19;hpb=c00c2dea5bbe698a46c443d3610855720baa69a4

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditImageAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditImageAjaxPageTest.kt
index 26436a3..e63bb8a 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditImageAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditImageAjaxPageTest.kt
@@ -3,7 +3,7 @@ package net.pterodactylus.sone.web.ajax
 import net.pterodactylus.sone.data.Album
 import net.pterodactylus.sone.data.Image
 import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.data.impl.ImageImpl
+import net.pterodactylus.sone.data.impl.*
 import net.pterodactylus.sone.template.ParserFilter
 import net.pterodactylus.sone.template.RenderFilter
 import net.pterodactylus.sone.template.ShortenFilter
@@ -38,9 +38,8 @@ class EditImageAjaxPageTest : JsonPageTest("editImage.ajax") {
 
 	@Test
 	fun `request with non-local image results in not-authorized`() {
-		val image = mock<Image>()
 		val sone = mock<Sone>()
-		whenever(image.sone).thenReturn(sone)
+		val image = ImageImpl().modify().setSone(sone).update()
 		addImage(image, "image-id")
 		addRequestParameter("image", "image-id")
 		assertThatJsonFailed("not-authorized")
@@ -48,13 +47,12 @@ class EditImageAjaxPageTest : JsonPageTest("editImage.ajax") {
 
 	@Test
 	fun `moving an image to the left returns the correct values`() {
-		val image = mock<Image>().apply { whenever(id).thenReturn("image-id") }
 		val sone = mock<Sone>().apply { whenever(isLocal).thenReturn(true) }
-		whenever(image.sone).thenReturn(sone)
-		val swapped = mock<Image>().apply { whenever(id).thenReturn("swapped") }
-		val album = mock<Album>()
-		whenever(album.moveImageUp(image)).thenReturn(swapped)
-		whenever(image.album).thenReturn(album)
+		val image = ImageImpl("image-id").modify().setSone(sone).update()
+		AlbumImpl(sone).also {
+			it.addImage(ImageImpl("swapped").modify().setSone(sone).update())
+			it.addImage(image)
+		}
 		addImage(image)
 		addRequestParameter("image", "image-id")
 		addRequestParameter("moveLeft", "true")
@@ -66,13 +64,12 @@ class EditImageAjaxPageTest : JsonPageTest("editImage.ajax") {
 
 	@Test
 	fun `moving an image to the right returns the correct values`() {
-		val image = mock<Image>().apply { whenever(id).thenReturn("image-id") }
 		val sone = mock<Sone>().apply { whenever(isLocal).thenReturn(true) }
-		whenever(image.sone).thenReturn(sone)
-		val swapped = mock<Image>().apply { whenever(id).thenReturn("swapped") }
-		val album = mock<Album>()
-		whenever(album.moveImageDown(image)).thenReturn(swapped)
-		whenever(image.album).thenReturn(album)
+		val image = ImageImpl("image-id").modify().setSone(sone).update()
+		AlbumImpl(sone).also {
+			it.addImage(image)
+			it.addImage(ImageImpl("swapped").modify().setSone(sone).update())
+		}
 		addImage(image)
 		addRequestParameter("image", "image-id")
 		addRequestParameter("moveRight", "true")
@@ -84,9 +81,8 @@ class EditImageAjaxPageTest : JsonPageTest("editImage.ajax") {
 
 	@Test
 	fun `request with empty title results in invalid-image-title`() {
-		val image = mock<Image>().apply { whenever(id).thenReturn("image-id") }
 		val sone = mock<Sone>().apply { whenever(isLocal).thenReturn(true) }
-		whenever(image.sone).thenReturn(sone)
+		val image = ImageImpl("image-id").modify().setSone(sone).update()
 		addImage(image)
 		addRequestParameter("image", "image-id")
 		assertThatJsonFailed("invalid-image-title")