X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FEditAlbumPageTest.kt;h=97e88654a005c58c69aa0c0fc60021937c49b77f;hp=b671caa840a438242a5aebe82dd5a21eb7dfdc60;hb=HEAD;hpb=cd72add62ab407336b471d4b7cda8e33dd2df5c6

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 b671caa..97e8865 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPageTest.kt
@@ -1,41 +1,29 @@
 package net.pterodactylus.sone.web.pages
 
-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.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.Before
-import org.junit.Test
-import org.mockito.Mockito.verify
+import net.pterodactylus.sone.data.impl.*
+import net.pterodactylus.sone.test.*
+import net.pterodactylus.sone.web.*
+import net.pterodactylus.util.web.Method.*
+import org.hamcrest.MatcherAssert.*
+import org.hamcrest.Matchers.*
+import org.junit.*
+import org.mockito.Mockito.*
 
 /**
  * Unit test for [EditAlbumPage].
  */
-class EditAlbumPageTest: WebPageTest(::EditAlbumPage) {
+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 = AlbumImpl(currentSone, "album-id")
+	private val parentAlbum = AlbumImpl(currentSone, "parent-id").also {
+		it.addAlbum(AlbumImpl(currentSone))
+		it.addAlbum(album)
+		it.addAlbum(AlbumImpl(currentSone))
+	}
 
 	@Before
 	fun setup() {
-		whenever(album.id).thenReturn("album-id")
-		whenever(album.sone).thenReturn(sone)
-		whenever(album.parent).thenReturn(parentAlbum)
-		whenever(album.modify()).thenReturn(modifier)
-		whenever(modifier.update()).thenReturn(album)
-		whenever(parentAlbum.id).thenReturn("parent-id")
-		whenever(sone.isLocal).thenReturn(true)
+		whenever(currentSone.isLocal).thenReturn(true)
 		addHttpRequestHeader("Host", "www.te.st")
 	}
 
@@ -51,7 +39,7 @@ class EditAlbumPageTest: WebPageTest(::EditAlbumPage) {
 
 	@Test
 	fun `page returns correct title`() {
-		whenever(l10n.getString("Page.EditAlbum.Title")).thenReturn("edit album page")
+		addTranslation("Page.EditAlbum.Title", "edit album page")
 		assertThat(page.getPageTitle(soneRequest), equalTo("edit album page"))
 	}
 
@@ -69,7 +57,7 @@ class EditAlbumPageTest: WebPageTest(::EditAlbumPage) {
 	@Test
 	fun `post request with album of non-local sone redirects to no permissions page`() {
 		setMethod(POST)
-		whenever(sone.isLocal).thenReturn(false)
+		whenever(currentSone.isLocal).thenReturn(false)
 		addAlbum("album-id", album)
 		addHttpRequestPart("album", "album-id")
 		verifyRedirect("noPermission.html")
@@ -82,7 +70,7 @@ class EditAlbumPageTest: WebPageTest(::EditAlbumPage) {
 		addHttpRequestPart("album", "album-id")
 		addHttpRequestPart("moveLeft", "true")
 		verifyRedirect("imageBrowser.html?album=parent-id") {
-			verify(parentAlbum).moveAlbumUp(album)
+			assertThat(parentAlbum.albums.indexOf(album), equalTo(0))
 			verify(core).touchConfiguration()
 		}
 	}
@@ -94,7 +82,7 @@ class EditAlbumPageTest: WebPageTest(::EditAlbumPage) {
 		addHttpRequestPart("album", "album-id")
 		addHttpRequestPart("moveRight", "true")
 		verifyRedirect("imageBrowser.html?album=parent-id") {
-			verify(parentAlbum).moveAlbumDown(album)
+			assertThat(parentAlbum.albums.indexOf(album), equalTo(2))
 			verify(core).touchConfiguration()
 		}
 	}
@@ -104,7 +92,6 @@ class EditAlbumPageTest: WebPageTest(::EditAlbumPage) {
 		setMethod(POST)
 		addAlbum("album-id", album)
 		addHttpRequestPart("album", "album-id")
-		whenever(modifier.setTitle("")).thenThrow(AlbumTitleMustNotBeEmpty())
 		verifyRedirect("emptyAlbumTitle.html")
 	}
 
@@ -116,16 +103,15 @@ class EditAlbumPageTest: WebPageTest(::EditAlbumPage) {
 		addHttpRequestPart("title", "title")
 		addHttpRequestPart("description", "description")
 		verifyRedirect("imageBrowser.html?album=album-id") {
-			verify(modifier).setTitle("title")
-			verify(modifier).setDescription("description")
-			verify(modifier).update()
+			assertThat(album.title, equalTo("title"))
+			assertThat(album.description, equalTo("description"))
 			verify(core).touchConfiguration()
 		}
 	}
 
 	@Test
 	fun `page can be created by dependency injection`() {
-	    assertThat(baseInjector.getInstance<EditAlbumPage>(), notNullValue())
+		assertThat(baseInjector.getInstance<EditAlbumPage>(), notNullValue())
 	}
 
 }