Clean up some imports

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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPageTest.kt
index c4f2ee4..7c4f07b 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPageTest.kt
@@ -6,8 +6,6 @@ import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty
 import net.pterodactylus.sone.test.deepMock
 import net.pterodactylus.sone.test.selfMock
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.CreateAlbumPage
 import net.pterodactylus.util.web.Method.POST
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
@@ -45,7 +43,7 @@ class CreateAlbumPageTest: WebPageTest() {
 
        @Test
        fun `missing name results in attribute being set in template context`() {
-               request("", POST)
+               setMethod(POST)
                page.processTemplate(freenetRequest, templateContext)
                assertThat(templateContext["nameMissing"], equalTo<Any>(true))
        }
@@ -60,11 +58,11 @@ class CreateAlbumPageTest: WebPageTest() {
 
        @Test
        fun `title and description are set correctly on the album`() {
-               request("", POST)
+               setMethod(POST)
                addAlbum("parent-id", parentAlbum)
-               addHttpRequestParameter("name", "new name")
-               addHttpRequestParameter("description", "new description")
-               addHttpRequestParameter("parent", "parent-id")
+               addHttpRequestPart("name", "new name")
+               addHttpRequestPart("description", "new description")
+               addHttpRequestPart("parent", "parent-id")
                verifyRedirect("imageBrowser.html?album=album-id") {
                        verify(newAlbum).modify()
                        verify(newAlbum.modify()).setTitle("new name")
@@ -76,26 +74,26 @@ class CreateAlbumPageTest: WebPageTest() {
 
        @Test
        fun `root album is used if no parent is specified`() {
-               request("", POST)
-               addHttpRequestParameter("name", "new name")
-               addHttpRequestParameter("description", "new description")
+               setMethod(POST)
+               addHttpRequestPart("name", "new name")
+               addHttpRequestPart("description", "new description")
                verifyRedirect("imageBrowser.html?album=album-id")
        }
 
        @Test
        fun `empty album title redirects to error page`() {
-               request("", POST)
+               setMethod(POST)
                whenever(newAlbum.modify().update()).thenThrow(AlbumTitleMustNotBeEmpty::class.java)
-               addHttpRequestParameter("name", "new name")
-               addHttpRequestParameter("description", "new description")
+               addHttpRequestPart("name", "new name")
+               addHttpRequestPart("description", "new description")
                verifyRedirect("emptyAlbumTitle.html")
        }
 
        @Test
        fun `album description is filtered`() {
-               request("", POST)
-               addHttpRequestParameter("name", "new name")
-               addHttpRequestParameter("description", "new http://localhost:12345/KSK@foo description")
+               setMethod(POST)
+               addHttpRequestPart("name", "new name")
+               addHttpRequestPart("description", "new http://localhost:12345/KSK@foo description")
                addHttpRequestHeader("Host", "localhost:12345")
                verifyRedirect("imageBrowser.html?album=album-id") {
                        verify(newAlbum.modify()).setDescription("new KSK@foo description")