X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentityLoaderTest.kt;h=0426814f31b5a9dfa3dc20bcb0505340e6fa0bcf;hb=6c9bd8dcb139302e29d9eb9c8e509589f31fcb58;hp=b3a844755e7dade22b5cac30d5dc99a67c4d34a6;hpb=faf66247a34f64946990a985d2ea3003465969cb;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 b3a8447..0426814 100644
--- a/src/test/kotlin/net/pterodactylus/sone/freenet/wot/IdentityLoaderTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/freenet/wot/IdentityLoaderTest.kt
@@ -17,9 +17,12 @@
 
 package net.pterodactylus.sone.freenet.wot
 
-import org.hamcrest.MatcherAssert.*
-import org.hamcrest.Matchers.*
-import org.junit.*
+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 +45,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 +57,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 +70,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,13 +125,13 @@ 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 =
+private fun createOwnIdentity(id: String = "", nickname: String = "", requestUri: String = "", insertUri: String = "", contexts: Set<String> = setOf(), properties: Map<String, String> = mapOf()): 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 =
+private fun createIdentity(id: String = "", nickname: String = "", requestUri: String = "", contexts: Set<String> = setOf(), properties: Map<String, String> = mapOf()): Identity =
 		DefaultIdentity(id, nickname, requestUri).apply {
 			setContexts(contexts)
 			this.properties = properties
@@ -106,6 +141,7 @@ 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