X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentityLoaderTest.kt;h=4188adf3e3b2a0fe5e0475a9447091c8f77c84e5;hb=8b8e9d3b5321d67712e557da7b222a58538869d0;hp=1202d4c58da16cd7da65fb7fb1ec5aed8e5a1898;hpb=d13f0d94b3c6a5cce03ec92cd7d0f3470ea2fb57;p=Sone.git

diff --git a/src/test/kotlin/net/pterodactylus/sone/freenet/wot/IdentityLoaderTest.kt b/src/test/kotlin/net/pterodactylus/sone/freenet/wot/IdentityLoaderTest.kt
index 1202d4c..4188adf 100644
--- a/src/test/kotlin/net/pterodactylus/sone/freenet/wot/IdentityLoaderTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/freenet/wot/IdentityLoaderTest.kt
@@ -1,5 +1,5 @@
 /*
- * Sone - IdentityLoaderTest.java - Copyright © 2013–2019 David Roden
+ * Sone - IdentityLoaderTest.kt - Copyright © 2013–2020 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,9 +17,14 @@
 
 package net.pterodactylus.sone.freenet.wot
 
-import org.hamcrest.MatcherAssert.*
-import org.hamcrest.Matchers.*
-import org.junit.*
+import net.pterodactylus.sone.test.createIdentity
+import net.pterodactylus.sone.test.createOwnIdentity
+import org.hamcrest.MatcherAssert.assertThat
+import org.hamcrest.Matchers.containsInAnyOrder
+import org.hamcrest.Matchers.equalTo
+import org.hamcrest.Matchers.hasSize
+import org.hamcrest.Matchers.notNullValue
+import org.junit.Test
 
 /**
  * Unit test for [IdentityLoader].
@@ -42,7 +47,7 @@ class IdentityLoaderTest {
 	@Test
 	fun loadingIdentities() {
 		val identityLoader = IdentityLoader(webOfTrustConnector, Context("Test"))
-		val identities = identityLoader.loadIdentities()
+		val identities = identityLoader.loadTrustedIdentities()
 		assertThat(identities.keys, hasSize(4))
 		assertThat(identities.keys, containsInAnyOrder(ownIdentities[0], ownIdentities[1], ownIdentities[2], ownIdentities[3]))
 		verifyIdentitiesForOwnIdentity(identities, ownIdentities[0], createTrustedIdentitiesForFirstOwnIdentity())
@@ -54,7 +59,7 @@ class IdentityLoaderTest {
 	@Test
 	fun loadingIdentitiesWithoutContext() {
 		val identityLoaderWithoutContext = IdentityLoader(webOfTrustConnector)
-		val identities = identityLoaderWithoutContext.loadIdentities()
+		val identities = identityLoaderWithoutContext.loadTrustedIdentities()
 		assertThat(identities.keys, hasSize(4))
 		assertThat(identities.keys, containsInAnyOrder(ownIdentities[0], ownIdentities[1], ownIdentities[2], ownIdentities[3]))
 		verifyIdentitiesForOwnIdentity(identities, ownIdentities[0], createTrustedIdentitiesForFirstOwnIdentity())
@@ -67,6 +72,38 @@ class IdentityLoaderTest {
 		assertThat(identities[ownIdentity], equalTo<Collection<Identity>>(trustedIdentities))
 	}
 
+	@Test
+	fun `loading all identities merges remote identities’ trust values`() {
+		val ownIdentity1 = createOwnIdentity("o1")
+		val ownIdentity2 = createOwnIdentity("o2")
+		val webOfTrustConnector = object : TestWebOfTrustConnector() {
+			override fun loadAllOwnIdentities() = setOf(ownIdentity1, ownIdentity2)
+			override fun loadAllIdentities(ownIdentity: OwnIdentity, context: String?) = when (ownIdentity) {
+				ownIdentity1 -> setOf(createIdentity().setTrust(ownIdentity1, Trust(100, 50, 2)))
+				else -> setOf(createIdentity().setTrust(ownIdentity2, Trust(80, 40, 2)))
+			}
+		}
+		val identityLoader = IdentityLoader(webOfTrustConnector)
+		val allIdentities = identityLoader.loadAllIdentities()
+		assertThat(allIdentities[ownIdentity1]!!.first().trust[ownIdentity2], notNullValue())
+	}
+
+	@Test
+	fun `loading trusted identities merges remote identities’ trust values`() {
+		val ownIdentity1 = createOwnIdentity("o1")
+		val ownIdentity2 = createOwnIdentity("o2")
+		val webOfTrustConnector = object : TestWebOfTrustConnector() {
+			override fun loadAllOwnIdentities() = setOf(ownIdentity1, ownIdentity2)
+			override fun loadTrustedIdentities(ownIdentity: OwnIdentity, context: String?) = when (ownIdentity) {
+				ownIdentity1 -> setOf(createIdentity().setTrust(ownIdentity1, Trust(100, 50, 2)))
+				else -> setOf(createIdentity().setTrust(ownIdentity2, Trust(80, 40, 2)))
+			}
+		}
+		val identityLoader = IdentityLoader(webOfTrustConnector)
+		val allIdentities = identityLoader.loadTrustedIdentities()
+		assertThat(allIdentities[ownIdentity1]!!.first().trust[ownIdentity2], notNullValue())
+	}
+
 }
 
 private fun createOwnIdentities() = listOf(
@@ -90,22 +127,11 @@ private fun createTrustedIdentitiesForThirdOwnIdentity() = setOf(
 
 private fun createTrustedIdentitiesForFourthOwnIdentity(): Set<Identity> = emptySet()
 
-private fun createOwnIdentity(id: String, nickname: String, requestUri: String, insertUri: String, contexts: Set<String>, properties: Map<String, String>): OwnIdentity =
-		DefaultOwnIdentity(id, nickname, requestUri, insertUri).apply {
-			setContexts(contexts)
-			this.properties = properties
-		}
-
-private fun createIdentity(id: String, nickname: String, requestUri: String, contexts: Set<String>, properties: Map<String, String>): Identity =
-		DefaultIdentity(id, nickname, requestUri).apply {
-			setContexts(contexts)
-			this.properties = properties
-		}
-
 private open class TestWebOfTrustConnector : WebOfTrustConnector {
 
 	override fun loadAllOwnIdentities() = emptySet<OwnIdentity>()
 	override fun loadTrustedIdentities(ownIdentity: OwnIdentity, context: String?) = emptySet<Identity>()
+	override fun loadAllIdentities(ownIdentity: OwnIdentity, context: String?) = emptySet<Identity>()
 	override fun addContext(ownIdentity: OwnIdentity, context: String) = Unit
 	override fun removeContext(ownIdentity: OwnIdentity, context: String) = Unit
 	override fun setProperty(ownIdentity: OwnIdentity, name: String, value: String) = Unit