🐛 Fix NPE during Sone removal

[Sone.git] / src / test / kotlin / net / pterodactylus / sone / freenet / wot / IdentityLoaderTest.kt

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 0426814..1123bec 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/freenet/wot/IdentityLoaderTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/freenet/wot/IdentityLoaderTest.kt
@@ -17,6 +17,8 @@
 
 package net.pterodactylus.sone.freenet.wot
 
+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
@@ -30,9 +32,9 @@ import org.junit.Test
 class IdentityLoaderTest {
 
        private val ownIdentities = createOwnIdentities()
-       private val webOfTrustConnector = object : TestWebOfTrustConnector() {
-               override fun loadAllOwnIdentities() = ownIdentities.toSet()
-               override fun loadTrustedIdentities(ownIdentity: OwnIdentity, context: String?) =
+       private val webOfTrustConnector = dummyWebOfTrustConnector
+                       .overrideLoadAllOwnIdentities { ownIdentities.toSet() }
+                       .overrideLoadTrustedIdentities { ownIdentity, _ ->
                                when (ownIdentity) {
                                        ownIdentities[0] -> createTrustedIdentitiesForFirstOwnIdentity()
                                        ownIdentities[1] -> createTrustedIdentitiesForSecondOwnIdentity()
@@ -40,7 +42,7 @@ class IdentityLoaderTest {
                                        ownIdentities[3] -> createTrustedIdentitiesForFourthOwnIdentity()
                                        else -> throw RuntimeException()
                                }
-       }
+                       }
 
        @Test
        fun loadingIdentities() {
@@ -74,13 +76,14 @@ class IdentityLoaderTest {
        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 webOfTrustConnector = dummyWebOfTrustConnector
+                               .overrideLoadAllOwnIdentities { setOf(ownIdentity1, ownIdentity2) }
+                               .overrideLoadAllIdentities { ownIdentity, _ ->
+                                       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())
@@ -90,13 +93,14 @@ class IdentityLoaderTest {
        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 webOfTrustConnector = dummyWebOfTrustConnector
+                               .overrideLoadAllOwnIdentities { setOf(ownIdentity1, ownIdentity2) }
+                               .overrideLoadTrustedIdentities { ownIdentity, _ ->
+                                       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())
@@ -124,28 +128,3 @@ private fun createTrustedIdentitiesForThirdOwnIdentity() = setOf(
 )
 
 private fun createTrustedIdentitiesForFourthOwnIdentity(): Set<Identity> = emptySet()
-
-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> = setOf(), properties: Map<String, String> = mapOf()): 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
-       override fun removeProperty(ownIdentity: OwnIdentity, name: String) = Unit
-       override fun ping() = Unit
-
-}