X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FFreenetInterfaceTest.kt;h=e02cddb79bfbb30e472df81cc391aae61099d624;hb=bf9d78ae8c577a31e6477afc4cfebcf024df3596;hp=cdf0dfbe3093078bd835f2edd3867e6004ce6e8d;hpb=135c25fa4317cbf607049935b183bfa71d532278;p=Sone.git diff --git a/src/test/kotlin/net/pterodactylus/sone/core/FreenetInterfaceTest.kt b/src/test/kotlin/net/pterodactylus/sone/core/FreenetInterfaceTest.kt index cdf0dfb..e02cddb 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 @@ -82,13 +82,13 @@ 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()) } @Before fun setupCallbackCaptorAndUskManager() { - doNothing().`when`(uskManager).subscribe(any(USK::class.java), callbackCaptor.capture(), anyBoolean(), any(RequestClient::class.java)) + doNothing().whenever(uskManager).subscribe(any(USK::class.java), callbackCaptor.capture(), anyBoolean(), any(RequestClient::class.java)) } @Test