X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentityLoaderTest.kt;h=b3a844755e7dade22b5cac30d5dc99a67c4d34a6;hp=f5fada8a49a167b2240fb61826aedb05cebfac67;hb=438378deab1514f0f608d975ef65f5b7aea44ccb;hpb=797507ccae2bf591a7e7b091f8067c2c961837a9 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 f5fada8..b3a8447 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 @@ -70,33 +70,33 @@ class IdentityLoaderTest { } private fun createOwnIdentities() = listOf( - createOwnIdentity("O1", "ON1", "OR1", "OI1", listOf("Test", "Test2"), mapOf("KeyA" to "ValueA", "KeyB" to "ValueB")), - createOwnIdentity("O2", "ON2", "OR2", "OI2", listOf("Test"), mapOf("KeyC" to "ValueC")), - createOwnIdentity("O3", "ON3", "OR3", "OI3", listOf("Test2"), mapOf("KeyE" to "ValueE", "KeyD" to "ValueD")), - createOwnIdentity("O4", "ON4", "OR$", "OI4", listOf("Test"), mapOf("KeyA" to "ValueA", "KeyD" to "ValueD")) + createOwnIdentity("O1", "ON1", "OR1", "OI1", setOf("Test", "Test2"), mapOf("KeyA" to "ValueA", "KeyB" to "ValueB")), + createOwnIdentity("O2", "ON2", "OR2", "OI2", setOf("Test"), mapOf("KeyC" to "ValueC")), + createOwnIdentity("O3", "ON3", "OR3", "OI3", setOf("Test2"), mapOf("KeyE" to "ValueE", "KeyD" to "ValueD")), + createOwnIdentity("O4", "ON4", "OR$", "OI4", setOf("Test"), mapOf("KeyA" to "ValueA", "KeyD" to "ValueD")) ) private fun createTrustedIdentitiesForFirstOwnIdentity() = setOf( - createIdentity("I11", "IN11", "IR11", listOf("Test"), mapOf("KeyA" to "ValueA")) + createIdentity("I11", "IN11", "IR11", setOf("Test"), mapOf("KeyA" to "ValueA")) ) private fun createTrustedIdentitiesForSecondOwnIdentity() = setOf( - createIdentity("I21", "IN21", "IR21", listOf("Test", "Test2"), mapOf("KeyB" to "ValueB")) + createIdentity("I21", "IN21", "IR21", setOf("Test", "Test2"), mapOf("KeyB" to "ValueB")) ) private fun createTrustedIdentitiesForThirdOwnIdentity() = setOf( - createIdentity("I31", "IN31", "IR31", listOf("Test", "Test3"), mapOf("KeyC" to "ValueC")) + createIdentity("I31", "IN31", "IR31", setOf("Test", "Test3"), mapOf("KeyC" to "ValueC")) ) private fun createTrustedIdentitiesForFourthOwnIdentity(): Set = emptySet() -private fun createOwnIdentity(id: String, nickname: String, requestUri: String, insertUri: String, contexts: List, properties: Map): OwnIdentity = +private fun createOwnIdentity(id: String, nickname: String, requestUri: String, insertUri: String, contexts: Set, properties: Map): OwnIdentity = DefaultOwnIdentity(id, nickname, requestUri, insertUri).apply { setContexts(contexts) this.properties = properties } -private fun createIdentity(id: String, nickname: String, requestUri: String, contexts: List, properties: Map): Identity = +private fun createIdentity(id: String, nickname: String, requestUri: String, contexts: Set, properties: Map): Identity = DefaultIdentity(id, nickname, requestUri).apply { setContexts(contexts) this.properties = properties @@ -110,9 +110,6 @@ private open class TestWebOfTrustConnector : WebOfTrustConnector { 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 getTrust(ownIdentity: OwnIdentity, identity: Identity) = Trust(null, null, null) - override fun setTrust(ownIdentity: OwnIdentity, identity: Identity, trust: Int, comment: String) = Unit - override fun removeTrust(ownIdentity: OwnIdentity, identity: Identity) = Unit override fun ping() = Unit }