X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FEditAlbumAjaxPageTest.kt;fp=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fajax%2FEditAlbumAjaxPageTest.kt;h=850cc9dfbb07b90333c73b04ee0645373ed7f2e6;hp=1528d60f786f84c9568ae2780b95f19ed3fa04b9;hb=5c5bee980f9cab5792e34d1c9840f73b8b191830;hpb=faf66247a34f64946990a985d2ea3003465969cb

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPageTest.kt
index 1528d60..850cc9d 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPageTest.kt
@@ -1,10 +1,7 @@
 package net.pterodactylus.sone.web.ajax
 
-import net.pterodactylus.sone.data.Album
-import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.data.impl.AlbumImpl
-import net.pterodactylus.sone.test.deepMock
 import net.pterodactylus.sone.test.getInstance
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
@@ -20,8 +17,7 @@ import org.junit.Test
 class EditAlbumAjaxPageTest : JsonPageTest("editAlbum.ajax", pageSupplier = ::EditAlbumAjaxPage) {
 
 	private val sone = mock<Sone>()
-	private val localSone = mock<Sone>().apply { whenever(isLocal).thenReturn(true) }
-	private val album = mock<Album>().apply { whenever(id).thenReturn("album-id") }
+	private val album = AlbumImpl(sone, "album-id")
 
 	@Test
 	fun `request without album results in invalid-album-id`() {
@@ -30,7 +26,6 @@ class EditAlbumAjaxPageTest : JsonPageTest("editAlbum.ajax", pageSupplier = ::Ed
 
 	@Test
 	fun `request with non-local album results in not-authorized`() {
-		whenever(album.sone).thenReturn(sone)
 		addAlbum(album)
 		addRequestParameter("album", "album-id")
 		assertThatJsonFailed("not-authorized")
@@ -38,11 +33,11 @@ class EditAlbumAjaxPageTest : JsonPageTest("editAlbum.ajax", pageSupplier = ::Ed
 
 	@Test
 	fun `request with moveLeft moves album to the left`() {
-		whenever(album.sone).thenReturn(localSone)
-		val swappedAlbum = mock<Album>().apply { whenever(id).thenReturn("swapped") }
-		val parentAlbum = mock<Album>()
-		whenever(parentAlbum.moveAlbumUp(album)).thenReturn(swappedAlbum)
-		whenever(album.parent).thenReturn(parentAlbum)
+		setupLocalSone()
+		AlbumImpl(sone).also {
+			it.addAlbum(AlbumImpl(sone, "swapped"))
+			it.addAlbum(album)
+		}
 		addAlbum(album)
 		addRequestParameter("album", "album-id")
 		addRequestParameter("moveLeft", "true")
@@ -53,11 +48,11 @@ class EditAlbumAjaxPageTest : JsonPageTest("editAlbum.ajax", pageSupplier = ::Ed
 
 	@Test
 	fun `request with moveRight moves album to the right`() {
-		whenever(album.sone).thenReturn(localSone)
-		val swappedAlbum = mock<Album>().apply { whenever(id).thenReturn("swapped") }
-		val parentAlbum = mock<Album>()
-		whenever(parentAlbum.moveAlbumDown(album)).thenReturn(swappedAlbum)
-		whenever(album.parent).thenReturn(parentAlbum)
+		setupLocalSone()
+		AlbumImpl(sone).also {
+			it.addAlbum(album)
+			it.addAlbum(AlbumImpl(sone, "swapped"))
+		}
 		addAlbum(album)
 		addRequestParameter("album", "album-id")
 		addRequestParameter("moveRight", "true")
@@ -68,9 +63,7 @@ class EditAlbumAjaxPageTest : JsonPageTest("editAlbum.ajax", pageSupplier = ::Ed
 
 	@Test
 	fun `request with missing title results in invalid-title`() {
-		whenever(album.sone).thenReturn(localSone)
-		whenever(album.modify()).thenReturn(deepMock())
-		whenever(album.modify().setTitle("")).thenThrow(AlbumTitleMustNotBeEmpty::class.java)
+		setupLocalSone()
 		addAlbum(album)
 		addRequestParameter("album", "album-id")
 		assertThatJsonFailed("invalid-album-title")
@@ -95,4 +88,8 @@ class EditAlbumAjaxPageTest : JsonPageTest("editAlbum.ajax", pageSupplier = ::Ed
 	    assertThat(baseInjector.getInstance<EditAlbumAjaxPage>(), notNullValue())
 	}
 
+	private fun setupLocalSone() {
+		whenever(sone.isLocal).thenReturn(true)
+	}
+
 }