X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FFreenetInterfaceTest.kt;h=a7b187d719a1e3108a35a8627d9179c5977288c5;hb=f3bc759f7876334bdb2184d756f8f1fc279fff52;hp=e02cddb79bfbb30e472df81cc391aae61099d624;hpb=eb0c51b3cf0b1aeb3a2fe747c57cbd5f624f5744;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 e02cddb..a7b187d 100644
--- a/src/test/kotlin/net/pterodactylus/sone/core/FreenetInterfaceTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/core/FreenetInterfaceTest.kt
@@ -16,6 +16,7 @@ import net.pterodactylus.sone.core.FreenetInterface.*
 import net.pterodactylus.sone.core.event.*
 import net.pterodactylus.sone.data.*
 import net.pterodactylus.sone.data.impl.*
+import net.pterodactylus.sone.freenet.wot.DefaultIdentity
 import net.pterodactylus.sone.test.*
 import net.pterodactylus.sone.test.Matchers.*
 import net.pterodactylus.sone.test.TestUtil.*
@@ -43,6 +44,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>()
@@ -60,6 +65,7 @@ class FreenetInterfaceTest {
 	private val fetchResult = mock<FetchResult>()
 	private val backgroundFetchCallback = mock<BackgroundFetchCallback>()
 	private val clientGetter = mock<ClientGetter>()
+	private val soneUriCreator = SoneUriCreator()
 	private val freenetInterface: FreenetInterface
 
 	init {
@@ -68,7 +74,7 @@ class FreenetInterfaceTest {
 		setField(node, "random", randomSource)
 		setField(nodeClientCore, "uskManager", uskManager)
 		setField(nodeClientCore, "clientContext", mock<ClientContext>())
-		freenetInterface = FreenetInterface(eventBus, node)
+		freenetInterface = FreenetInterface(eventBus, node, soneUriCreator)
 		insertToken = freenetInterface.InsertToken(image)
 		insertToken.setBucket(bucket)
 	}
@@ -83,7 +89,7 @@ class FreenetInterfaceTest {
 	fun setupSone() {
 		val insertSsk = createRandom(randomSource, "test-0")
 		whenever(sone.id).thenReturn(insertSsk.uri.routingKey.asFreenetBase64)
-		whenever(sone.requestUri).thenReturn(insertSsk.uri.uskForSSK())
+		whenever(sone.identity).thenReturn(DefaultIdentity("id", "name", insertSsk.uri.toString()))
 	}
 
 	@Before
@@ -184,7 +190,6 @@ class FreenetInterfaceTest {
 
 	@Test
 	fun `sone with wrong request uri will not be subscribed`() {
-		whenever(sone.requestUri).thenReturn(FreenetURI("KSK@GPLv3.txt"))
 		freenetInterface.registerUsk(FreenetURI("KSK@GPLv3.txt"), null)
 		verify(uskManager, never()).subscribe(any(USK::class.java), any(USKCallback::class.java), anyBoolean(), any(RequestClient::class.java))
 	}
@@ -258,16 +263,15 @@ class FreenetInterfaceTest {
 	}
 
 	@Test
-	fun `unregistering aregistered sone unregisters the sone`() {
-		freenetInterface.registerActiveUsk(sone.requestUri, mock())
+	fun `unregistering a registered sone unregisters the sone`() {
+		freenetInterface.registerActiveUsk(soneUriCreator.getRequestUri(sone), mock())
 		freenetInterface.unregisterUsk(sone)
 		verify(uskManager).unsubscribe(any(USK::class.java), any(USKCallback::class.java))
 	}
 
 	@Test
-	fun `unregistering asone with awrong request key will not unsubscribe`() {
-		whenever(sone.requestUri).thenReturn(FreenetURI("KSK@GPLv3.txt"))
-		freenetInterface.registerUsk(sone.requestUri, null)
+	fun `unregistering a sone with a wrong request key will not unsubscribe`() {
+		freenetInterface.registerUsk(FreenetURI("KSK@GPLv3.txt"), null)
 		freenetInterface.unregisterUsk(sone)
 		verify(uskManager, never()).unsubscribe(any(USK::class.java), any(USKCallback::class.java))
 	}