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=b04ea8db14203dd154111de095420f6e0b964dd9;hp=c9bd4fb982c740556f8a775070bf36e31c9489ec;hb=5ba707d40f9d2a20094aaabc21647aeec1feed46;hpb=de7568a82eb4150bf6d2b0553841b7b69f84c968

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..b04ea8d 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPageTest.kt
@@ -7,9 +7,6 @@ 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
@@ -61,31 +58,30 @@ class EditAlbumPageTest: WebPageTest() {
 
 	@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 +90,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 +102,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")