X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FFreenetInterfaceTest.kt;h=81b4e041c5e0484e496ba6b5ae68ee050da1ea0f;hp=6647434d924488b893e759ef0b0359a306f33c14;hb=b47ccc9c7796fa160777a03aef49f1168623fbc8;hpb=22458ba912ec789646f387a7b25d12b5f45c907d diff --git a/src/test/kotlin/net/pterodactylus/sone/core/FreenetInterfaceTest.kt b/src/test/kotlin/net/pterodactylus/sone/core/FreenetInterfaceTest.kt index 6647434..81b4e04 100644 --- a/src/test/kotlin/net/pterodactylus/sone/core/FreenetInterfaceTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/core/FreenetInterfaceTest.kt @@ -10,7 +10,6 @@ import freenet.keys.* import freenet.keys.InsertableClientSSK.* import freenet.node.* import freenet.node.RequestStarter.* -import freenet.support.Base64 import freenet.support.api.* import freenet.support.io.* import net.pterodactylus.sone.core.FreenetInterface.* @@ -20,6 +19,7 @@ import net.pterodactylus.sone.data.impl.* import net.pterodactylus.sone.test.* import net.pterodactylus.sone.test.Matchers.* import net.pterodactylus.sone.test.TestUtil.* +import net.pterodactylus.sone.utils.* import org.hamcrest.MatcherAssert.* import org.hamcrest.Matchers.equalTo import org.hamcrest.Matchers.notNullValue @@ -43,6 +43,10 @@ class FreenetInterfaceTest { @JvmField val expectionException: ExpectedException = ExpectedException.none() + @Rule + @JvmField + val silencedLogging = silencedLogging() + @Suppress("UnstableApiUsage") private val eventBus = mock() private val node = mock() @@ -82,7 +86,7 @@ class FreenetInterfaceTest { @Before fun setupSone() { val insertSsk = createRandom(randomSource, "test-0") - whenever(sone.id).thenReturn(Base64.encode(insertSsk.uri.routingKey)) + whenever(sone.id).thenReturn(insertSsk.uri.routingKey.asFreenetBase64) whenever(sone.requestUri).thenReturn(insertSsk.uri.uskForSSK()) }