X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FCreateAlbumPageTest.kt;h=5cc463a1277e522a179ee6be239142c30afc73f1;hb=8b06e4cc88900b40cb49c1b05c724ff7f7717d6b;hp=c4f2ee4da333a96e6b7b8e15c0c0ff92730d8391;hpb=de7568a82eb4150bf6d2b0553841b7b69f84c968;p=Sone.git

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..5cc463a 100644
--- 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
@@ -18,11 +16,7 @@ import org.mockito.Mockito.verify
 /**
  * Unit test for [CreateAlbumPage].
  */
-class CreateAlbumPageTest: WebPageTest() {
-
-	private val page = CreateAlbumPage(template, webInterface)
-
-	override fun getPage() = page
+class CreateAlbumPageTest: WebPageTest(::CreateAlbumPage) {
 
 	private val parentAlbum = createAlbum("parent-id")
 	private val newAlbum = createAlbum("album-id")
@@ -45,7 +39,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 +54,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 +70,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")