Set URI and request method separately in tests

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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPageTest.kt
index 19d24ed..d64e475 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPageTest.kt
@@ -5,9 +5,6 @@ import net.pterodactylus.sone.data.Image
 import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.test.mock
 import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.ImageBrowserPage
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.util.web.Method.GET
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.contains
 import org.hamcrest.Matchers.equalTo
@@ -38,12 +35,11 @@ class ImageBrowserPageTest : WebPageTest() {
 
        @Test
        fun `get request with album sets album and page in template context`() {
-               request("", GET)
                val album = mock<Album>()
                addAlbum("album-id", album)
                addHttpRequestParameter("album", "album-id")
                addHttpRequestParameter("page", "5")
-               page.handleRequest(freenetRequest, templateContext)
+               page.processTemplate(freenetRequest, templateContext)
                assertThat(templateContext["albumRequested"], equalTo<Any>(true))
                assertThat(templateContext["album"], equalTo<Any>(album))
                assertThat(templateContext["page"], equalTo<Any>("5"))
@@ -51,35 +47,32 @@ class ImageBrowserPageTest : WebPageTest() {
 
        @Test
        fun `get request with image sets image in template context`() {
-               request("", GET)
                val image = mock<Image>()
                addImage("image-id", image)
                addHttpRequestParameter("image", "image-id")
-               page.handleRequest(freenetRequest, templateContext)
+               page.processTemplate(freenetRequest, templateContext)
                assertThat(templateContext["imageRequested"], equalTo<Any>(true))
                assertThat(templateContext["image"], equalTo<Any>(image))
        }
 
        @Test
        fun `get request with sone sets sone in template context`() {
-               request("", GET)
                val sone = mock<Sone>()
                addSone("sone-id", sone)
                addHttpRequestParameter("sone", "sone-id")
-               page.handleRequest(freenetRequest, templateContext)
+               page.processTemplate(freenetRequest, templateContext)
                assertThat(templateContext["soneRequested"], equalTo<Any>(true))
                assertThat(templateContext["sone"], equalTo<Any>(sone))
        }
 
        @Test
        fun `get request with mode of gallery sets albums and page in template context`() {
-               request("", GET)
                val firstSone = createSone("first album", "second album")
                addSone("sone1", firstSone)
                val secondSone = createSone("third album", "fourth album")
                addSone("sone2", secondSone)
                addHttpRequestParameter("mode", "gallery")
-               page.handleRequest(freenetRequest, templateContext)
+               page.processTemplate(freenetRequest, templateContext)
                assertThat(templateContext["galleryRequested"], equalTo<Any>(true))
                @Suppress("UNCHECKED_CAST")
                assertThat(templateContext["albums"] as Iterable<Album>, contains(
@@ -108,8 +101,7 @@ class ImageBrowserPageTest : WebPageTest() {
 
        @Test
        fun `requesting nothing will show the albums of the current sone`() {
-               request("", GET)
-               page.handleRequest(freenetRequest, templateContext)
+               page.processTemplate(freenetRequest, templateContext)
                assertThat(templateContext["soneRequested"], equalTo<Any>(true))
                assertThat(templateContext["sone"], equalTo<Any>(currentSone))
        }