🎨 Clean up imports

[Sone.git] / src / test / kotlin / net / pterodactylus / sone / web / pages / EditAlbumPageTest.kt

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 c9bd4fb..6226a30 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPageTest.kt
@@ -1,36 +1,26 @@
 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.mock
-import net.pterodactylus.sone.test.mockBuilder
-import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.EditAlbumPage
-import net.pterodactylus.util.web.Method.GET
-import net.pterodactylus.util.web.Method.POST
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.equalTo
-import org.junit.Before
-import org.junit.Test
-import org.mockito.Mockito.verify
+import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.data.Album.*
+import net.pterodactylus.sone.data.Album.Modifier.*
+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() {
-
-       private val page = EditAlbumPage(template, webInterface)
+class EditAlbumPageTest: WebPageTest(::EditAlbumPage) {
 
        private val album = mock<Album>()
        private val parentAlbum = mock<Album>()
        private val modifier = mockBuilder<Modifier>()
        private val sone = mock<Sone>()
 
-       override fun getPage() = page
-
        @Before
        fun setup() {
                whenever(album.id).thenReturn("album-id")
@@ -56,36 +46,35 @@ class EditAlbumPageTest: WebPageTest() {
        @Test
        fun `page returns correct title`() {
                whenever(l10n.getString("Page.EditAlbum.Title")).thenReturn("edit album page")
-               assertThat(page.getPageTitle(freenetRequest), equalTo("edit album page"))
+               assertThat(page.getPageTitle(soneRequest), equalTo("edit album page"))
        }
 
        @Test
        fun `get request does not redirect`() {
-               request("", GET)
                page.processTemplate(freenetRequest, templateContext)
        }
 
        @Test
        fun `post request with invalid album redirects to invalid page`() {
-               request("", POST)
+               setMethod(POST)
                verifyRedirect("invalid.html")
        }
 
        @Test
        fun `post request with album of non-local sone redirects to no permissions page`() {
-               request("", POST)
+               setMethod(POST)
                whenever(sone.isLocal).thenReturn(false)
                addAlbum("album-id", album)
-               addHttpRequestParameter("album", "album-id")
+               addHttpRequestPart("album", "album-id")
                verifyRedirect("noPermission.html")
        }
 
        @Test
        fun `post request with move left requested moves album to the left and redirects to album browser`() {
-               request("", POST)
+               setMethod(POST)
                addAlbum("album-id", album)
-               addHttpRequestParameter("album", "album-id")
-               addHttpRequestParameter("moveLeft", "true")
+               addHttpRequestPart("album", "album-id")
+               addHttpRequestPart("moveLeft", "true")
                verifyRedirect("imageBrowser.html?album=parent-id") {
                        verify(parentAlbum).moveAlbumUp(album)
                        verify(core).touchConfiguration()
@@ -94,10 +83,10 @@ class EditAlbumPageTest: WebPageTest() {
 
        @Test
        fun `post request with move right requested moves album to the left and redirects to album browser`() {
-               request("", POST)
+               setMethod(POST)
                addAlbum("album-id", album)
-               addHttpRequestParameter("album", "album-id")
-               addHttpRequestParameter("moveRight", "true")
+               addHttpRequestPart("album", "album-id")
+               addHttpRequestPart("moveRight", "true")
                verifyRedirect("imageBrowser.html?album=parent-id") {
                        verify(parentAlbum).moveAlbumDown(album)
                        verify(core).touchConfiguration()
@@ -106,20 +95,20 @@ class EditAlbumPageTest: WebPageTest() {
 
        @Test
        fun `post request with empty album title redirects to empty album title page`() {
-               request("", POST)
+               setMethod(POST)
                addAlbum("album-id", album)
-               addHttpRequestParameter("album", "album-id")
+               addHttpRequestPart("album", "album-id")
                whenever(modifier.setTitle("")).thenThrow(AlbumTitleMustNotBeEmpty())
                verifyRedirect("emptyAlbumTitle.html")
        }
 
        @Test
        fun `post request with non-empty album title and description redirects to album browser`() {
-               request("", POST)
+               setMethod(POST)
                addAlbum("album-id", album)
-               addHttpRequestParameter("album", "album-id")
-               addHttpRequestParameter("title", "title")
-               addHttpRequestParameter("description", "description")
+               addHttpRequestPart("album", "album-id")
+               addHttpRequestPart("title", "title")
+               addHttpRequestPart("description", "description")
                verifyRedirect("imageBrowser.html?album=album-id") {
                        verify(modifier).setTitle("title")
                        verify(modifier).setDescription("description")
@@ -128,4 +117,9 @@ class EditAlbumPageTest: WebPageTest() {
                }
        }
 
+       @Test
+       fun `page can be created by dependency injection`() {
+           assertThat(baseInjector.getInstance<EditAlbumPage>(), notNullValue())
+       }
+
 }