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=1893acca9ec70e8b671d3874191937f9e92a5ab7;hb=b47ccc9c7796fa160777a03aef49f1168623fbc8;hpb=7349d8b859f87a83913895fa6897a9a7c8557c4e

diff --git a/src/test/kotlin/net/pterodactylus/sone/core/FreenetInterfaceTest.kt b/src/test/kotlin/net/pterodactylus/sone/core/FreenetInterfaceTest.kt
index 1893acc..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
@@ -32,6 +32,7 @@ import org.mockito.ArgumentMatchers.eq
 import org.mockito.Mockito.*
 import java.io.*
 import java.util.*
+import kotlin.test.Test
 
 /**
  * Unit test for [FreenetInterface].
@@ -42,6 +43,10 @@ class FreenetInterfaceTest {
 	@JvmField
 	val expectionException: ExpectedException = ExpectedException.none()
 
+	@Rule
+	@JvmField
+	val silencedLogging = silencedLogging()
+
 	@Suppress("UnstableApiUsage")
 	private val eventBus = mock<EventBus>()
 	private val node = mock<Node>()
@@ -81,13 +86,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
@@ -458,4 +463,13 @@ class FreenetInterfaceTest {
 		verifyNoMoreInteractions(backgroundFetchCallback)
 	}
 
+	@Test
+	fun `unregistering a registered USK with different edition unregisters USK`() {
+		val callback = mock<Callback>()
+		val uri = createRandom(randomSource, "test-123").uri.uskForSSK()
+		freenetInterface.registerUsk(uri, callback)
+		freenetInterface.unregisterUsk(uri.setSuggestedEdition(234))
+		verify(uskManager).unsubscribe(any<USK>(), any<USKCallback>())
+	}
+
 }