X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FReloadingPageTest.kt;h=6470c95eec7bc2287b50c552e92efa003d62a0d0;hb=bfaaa6079966860b840f01cba4e83dc6e1cff947;hp=a281851818a46cae1e18d2ea9fa461109fd3d592;hpb=aa9f039132c8b5cd46e35b9775be7e2cda8abcdf;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 a281851..6470c95 100644
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
@@ -1,23 +1,28 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.web.page.FreenetRequest
-import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.equalTo
-import org.junit.Rule
-import org.junit.Test
-import org.junit.rules.TemporaryFolder
-import java.nio.file.Files
-import java.nio.file.Paths
-import kotlin.text.Charsets.UTF_8
+import net.pterodactylus.sone.test.*
+import net.pterodactylus.sone.web.*
+import net.pterodactylus.sone.web.page.*
+import org.hamcrest.MatcherAssert.*
+import org.hamcrest.Matchers.*
+import org.junit.*
+import org.junit.rules.*
+import java.nio.file.*
 
 /**
  * Unit test for [ReloadingPage].
  */
-class ReloadingPageTest : WebPageTest() {
+class ReloadingPageTest {
 
-	@Rule @JvmField val tempFolder = TemporaryFolder()
+	@Rule
+	@JvmField
+	val tempFolder = TemporaryFolder()
 	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,7 +36,7 @@ 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"))
@@ -39,13 +44,19 @@ class ReloadingPageTest : WebPageTest() {
 
 	@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")
+		val fileContent = listOf("Hello", "World").joinToString("\n", postfix = "\n").toByteArray()
+		Files.write(Paths.get(folder.path, "file.txt"), fileContent)
+		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(fileContent))
+	}
+
+	@Test
+	fun `page can be created by dependency injection`() {
+		assertThat(baseInjector.getInstance<ReloadingPage<*>>(), notNullValue())
 	}
 
 }