X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FReloadingPageTest.kt;h=7ebb05258367a43607ad8f05e277b6661e539820;hb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae;hp=6dbcdc099054f911d30eba74a0433c26b5dbcf52;hpb=5ba707d40f9d2a20094aaabc21647aeec1feed46;p=Sone.git

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 6dbcdc0..7ebb052 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
@@ -13,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`() {
@@ -31,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()))
 	}
 
 }