X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FUploadImagePageTest.kt;fp=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FUploadImagePageTest.kt;h=4c99759e5cb80b8d7fec12497a8520f913f8b5fc;hp=370c0a794705fb6a76b3861d9593ebd48b25d44b;hb=5c5bee980f9cab5792e34d1c9840f73b8b191830;hpb=faf66247a34f64946990a985d2ea3003465969cb

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/UploadImagePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/UploadImagePageTest.kt
index 370c0a7..4c99759 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/UploadImagePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/UploadImagePageTest.kt
@@ -1,10 +1,9 @@
 package net.pterodactylus.sone.web.pages
 
 import net.pterodactylus.sone.data.*
-import net.pterodactylus.sone.data.Image.*
+import net.pterodactylus.sone.data.impl.*
 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.web.*
 import net.pterodactylus.sone.web.page.*
@@ -20,10 +19,7 @@ import org.mockito.Mockito.eq
  */
 class UploadImagePageTest : WebPageTest(::UploadImagePage) {
 
-	private val parentAlbum = mock<Album>().apply {
-		whenever(id).thenReturn("parent-id")
-		whenever(sone).thenReturn(currentSone)
-	}
+	private val parentAlbum = AlbumImpl(currentSone, "parent-id")
 
 	@Test
 	fun `page returns correct path`() {
@@ -58,9 +54,9 @@ class UploadImagePageTest : WebPageTest(::UploadImagePage) {
 	@Test
 	fun `post request with parent that is not the current sone results in no permission error page`() {
 		setMethod(POST)
+		val remoteAlbum = AlbumImpl(mock(), "parent-id")
+		addAlbum("parent-id", remoteAlbum)
 		addHttpRequestPart("parent", "parent-id")
-		whenever(parentAlbum.sone).thenReturn(mock())
-		addAlbum("parent-id", parentAlbum)
 		verifyRedirect("noPermission.html")
 	}
 
@@ -97,19 +93,14 @@ class UploadImagePageTest : WebPageTest(::UploadImagePage) {
 		addHttpRequestHeader("Host", "localhost:8888")
 		addUploadedFile("image", "upload-image-value-image.png", "image/png", "upload-image-value-image.png")
 		val temporaryImage = TemporaryImage("temp-image")
-		val imageModifier = mockBuilder<Modifier>()
-		val image = mock<Image>().apply {
-			whenever(modify()).thenReturn(imageModifier)
-		}
+		val image = ImageImpl()
 		whenever(core.createTemporaryImage(eq("image/png"), any())).thenReturn(temporaryImage)
 		whenever(core.createImage(currentSone, parentAlbum, temporaryImage)).thenReturn(image)
 		verifyRedirect("imageBrowser.html?album=parent-id") {
-			verify(image).modify()
-			verify(imageModifier).setWidth(2)
-			verify(imageModifier).setHeight(1)
-			verify(imageModifier).setTitle("Title")
-			verify(imageModifier).setDescription("Description @ KSK@foo")
-			verify(imageModifier).update()
+			assertThat(image.width, equalTo(2))
+			assertThat(image.height, equalTo(1))
+			assertThat(image.title, equalTo("Title"))
+			assertThat(image.description, equalTo("Description @ KSK@foo"))
 		}
 	}