Merge branch 'update/java-11-lts' into next

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 82ab065..d0b07e6 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -42,6 +42,7 @@ import com.google.common.annotations.*;
 import com.google.common.eventbus.*;
 import com.google.common.cache.*;
 import com.google.inject.*;
+import com.google.inject.Module;
 import com.google.inject.name.*;
 import kotlin.jvm.functions.*;
 

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 99cf8bf..6470c95 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
@@ -8,7 +8,6 @@ import org.hamcrest.Matchers.*
 import org.junit.*
 import org.junit.rules.*
 import java.nio.file.*
-import kotlin.text.Charsets.UTF_8
 
 /**
  * Unit test for [ReloadingPage].
@@ -45,13 +44,14 @@ class ReloadingPageTest {
 
        @Test
        fun `requesting valid file results in 200 and delivers file`() {
-               Files.write(Paths.get(folder.path, "file.txt"), listOf("Hello", "World"), UTF_8)
+               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.toByteArray(), equalTo("Hello\nWorld\n".toByteArray()))
+               assertThat(responseBytes.toByteArray(), equalTo(fileContent))
        }
 
        @Test