X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserterTest.kt;h=7d065527585963590c9d5ec5ec00eae29226897a;hp=7ac9e0643354a96c03a4be07eb0f4ac5bf2de4ce;hb=a9e1e90e3eb8e0aa3bb3e591ce44d77f557f7e36;hpb=d59dcba3dbf5d1f9327dd7b370b96bded9d79ccc diff --git a/src/test/kotlin/net/pterodactylus/sone/core/SoneInserterTest.kt b/src/test/kotlin/net/pterodactylus/sone/core/SoneInserterTest.kt index 7ac9e06..7d06552 100644 --- a/src/test/kotlin/net/pterodactylus/sone/core/SoneInserterTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/core/SoneInserterTest.kt @@ -4,7 +4,6 @@ import com.codahale.metrics.* import com.google.common.base.* import com.google.common.base.Optional import com.google.common.eventbus.* -import com.google.common.io.ByteStreams.* import com.google.common.util.concurrent.MoreExecutors.* import freenet.keys.* import net.pterodactylus.sone.core.SoneInserter.* @@ -210,14 +209,14 @@ class SoneInserterTest { val manifestElement = manifestCreator.createManifestElement("test.txt", "plain/text; charset=utf-8", "sone-inserter-manifest.txt") assertThat(manifestElement!!.name, equalTo("test.txt")) assertThat(manifestElement.mimeTypeOverride, equalTo("plain/text; charset=utf-8")) - val templateContent = String(toByteArray(manifestElement.data.inputStream), Charsets.UTF_8) + val templateContent = String(manifestElement.data.inputStream.readBytes(), Charsets.UTF_8) assertThat(templateContent, containsString("Sone Version: ${SonePlugin.getPluginVersion()}\n")) assertThat(templateContent, containsString("Core Startup: $now\n")) assertThat(templateContent, containsString("Sone ID: SoneId\n")) } @Test - fun `invalid template returns anull manifest element`() { + fun `invalid template returns a null manifest element`() { val soneProperties = HashMap() val manifestCreator = ManifestCreator(core, soneProperties) assertThat(manifestCreator.createManifestElement("test.txt",