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

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 a60c4a7..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,49 +1,40 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.data.Album
-import net.pterodactylus.sone.data.Image
-import net.pterodactylus.sone.data.Image.Modifier
-import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.data.TemporaryImage
+import net.pterodactylus.sone.data.*
+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.baseInjector
-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.Test
-import org.mockito.Mockito.any
+import net.pterodactylus.sone.web.*
+import net.pterodactylus.sone.web.page.*
+import net.pterodactylus.util.web.Method.*
+import org.hamcrest.MatcherAssert.*
+import org.hamcrest.Matchers.*
+import org.junit.*
+import org.mockito.Mockito.*
 import org.mockito.Mockito.eq
-import org.mockito.Mockito.never
-import org.mockito.Mockito.verify
 
 /**
  * Unit test for [UploadImagePage].
  */
-class UploadImagePageTest: WebPageTest(::UploadImagePage) {
+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`() {
-	    assertThat(page.path, equalTo("uploadImage.html"))
+		assertThat(page.path, equalTo("uploadImage.html"))
 	}
 
 	@Test
 	fun `page requires login`() {
-	    assertThat(page.requiresLogin(), equalTo(true))
+		assertThat(page.requiresLogin(), equalTo(true))
 	}
 
 	@Test
 	fun `page returns correct title`() {
-	    addTranslation("Page.UploadImage.Title", "upload image page title")
-		assertThat(page.getPageTitle(freenetRequest), equalTo("upload image page title"))
+		addTranslation("Page.UploadImage.Title", "upload image page title")
+		assertThat(page.getPageTitle(soneRequest), equalTo("upload image page title"))
 	}
 
 	@Test
@@ -63,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<Sone>())
-		addAlbum("parent-id", parentAlbum)
 		verifyRedirect("noPermission.html")
 	}
 
@@ -102,25 +93,25 @@ 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"))
 		}
 	}
 
 	@Test
 	fun `page can be created by dependency injection`() {
-	    assertThat(baseInjector.getInstance<UploadImagePage>(), notNullValue())
+		assertThat(baseInjector.getInstance<UploadImagePage>(), notNullValue())
+	}
+
+	@Test
+	fun `page is annotated with correct template path`() {
+		assertThat(page.templatePath, equalTo("/templates/invalid.html"))
 	}
 
 }