Merge branch 'release-0.9.7'

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

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
index 274dba8..7ebb052 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
@@ -1,6 +1,5 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.web.pages.ReloadingPage
 import net.pterodactylus.sone.web.page.FreenetRequest
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.equalTo
@@ -14,11 +13,15 @@ import kotlin.text.Charsets.UTF_8
 /**
  * Unit test for [ReloadingPage].
  */
-class ReloadingPageTest : WebPageTest() {
+class ReloadingPageTest {
 
        @Rule @JvmField val tempFolder = TemporaryFolder()
-       private val folder by lazy { tempFolder.newFolder() }
+       private val folder by lazy { tempFolder.newFolder()!! }
        private val page by lazy { ReloadingPage<FreenetRequest>("/prefix/", folder.path, "text/plain") }
+       private val webPageTest = WebPageTest()
+       private val freenetRequest = webPageTest.freenetRequest
+       private val responseBytes = webPageTest.responseContent
+       private val response = webPageTest.response
 
        @Test
        fun `page returns correct path prefix`() {
@@ -32,19 +35,21 @@ class ReloadingPageTest : WebPageTest() {
 
        @Test
        fun `requesting invalid file results in 404`() {
-               request("/prefix/path/file.txt")
+               webPageTest.request("/prefix/path/file.txt")
                page.handleRequest(freenetRequest, response)
                assertThat(response.statusCode, equalTo(404))
+               assertThat(response.statusText, equalTo("Not found"))
        }
 
        @Test
        fun `requesting valid file results in 200 and delivers file`() {
                Files.write(Paths.get(folder.path, "file.txt"), listOf("Hello", "World"), UTF_8)
-               request("/prefix/path/file.txt")
+               webPageTest.request("/prefix/path/file.txt")
                page.handleRequest(freenetRequest, response)
                assertThat(response.statusCode, equalTo(200))
+               assertThat(response.statusText, equalTo("OK"))
                assertThat(response.contentType, equalTo("text/plain"))
-               assertThat(responseBytes, equalTo("Hello\nWorld\n".toByteArray()))
+               assertThat(responseBytes.toByteArray(), equalTo("Hello\nWorld\n".toByteArray()))
        }
 
 }