X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Ffreenet%2Fwot%2FIdentityChangeDetectorTest.kt;h=03c7b348084a74f19cdeb24ed8e5c7b637642d68;hp=188a60a03f2096976e8870cf147fe16ab15c593e;hb=2f1e414e86c61435cd8b3991c475e0832f6de2fb;hpb=c81b4be138453811e354898e842585a933050c4f diff --git a/src/test/kotlin/net/pterodactylus/sone/freenet/wot/IdentityChangeDetectorTest.kt b/src/test/kotlin/net/pterodactylus/sone/freenet/wot/IdentityChangeDetectorTest.kt index 188a60a..03c7b34 100644 --- a/src/test/kotlin/net/pterodactylus/sone/freenet/wot/IdentityChangeDetectorTest.kt +++ b/src/test/kotlin/net/pterodactylus/sone/freenet/wot/IdentityChangeDetectorTest.kt @@ -1,5 +1,5 @@ /* - * Sone - IdentityChangeDetectorTest.java - Copyright © 2013–2019 David Roden + * Sone - IdentityChangeDetectorTest.kt - Copyright © 2013–2019 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,13 +17,9 @@ package net.pterodactylus.sone.freenet.wot -import net.pterodactylus.sone.freenet.wot.Identities.createIdentity -import org.hamcrest.MatcherAssert.assertThat -import org.hamcrest.Matchers.containsInAnyOrder -import org.hamcrest.Matchers.empty - -import org.junit.Before -import org.junit.Test +import org.hamcrest.MatcherAssert.* +import org.hamcrest.Matchers.* +import org.junit.* /** * Unit test for [IdentityChangeDetector]. @@ -38,37 +34,37 @@ class IdentityChangeDetectorTest { @Before fun setup() { - identityChangeDetector.onNewIdentity { identity -> newIdentities.add(identity) } - identityChangeDetector.onRemovedIdentity { identity -> removedIdentities.add(identity) } - identityChangeDetector.onChangedIdentity { identity -> changedIdentities.add(identity) } - identityChangeDetector.onUnchangedIdentity { identity -> unchangedIdentities.add(identity) } + identityChangeDetector.onNewIdentity = { identity -> newIdentities.add(identity) } + identityChangeDetector.onRemovedIdentity = { identity -> removedIdentities.add(identity) } + identityChangeDetector.onChangedIdentity = { identity -> changedIdentities.add(identity) } + identityChangeDetector.onUnchangedIdentity = { identity -> unchangedIdentities.add(identity) } } @Test fun `no differences are detected when sending the old identities again`() { identityChangeDetector.detectChanges(createOldIdentities()) - assertThat>(newIdentities, empty()) - assertThat>(removedIdentities, empty()) - assertThat>(changedIdentities, empty()) - assertThat>(unchangedIdentities, containsInAnyOrder(createIdentity1(), createIdentity2(), createIdentity3())) + assertThat(newIdentities, empty()) + assertThat(removedIdentities, empty()) + assertThat(changedIdentities, empty()) + assertThat(unchangedIdentities, containsInAnyOrder(createIdentity1(), createIdentity2(), createIdentity3())) } @Test fun `detect that an identity was removed`() { identityChangeDetector.detectChanges(listOf(createIdentity1(), createIdentity3())) - assertThat>(newIdentities, empty()) - assertThat>(removedIdentities, containsInAnyOrder(createIdentity2())) - assertThat>(changedIdentities, empty()) - assertThat>(unchangedIdentities, containsInAnyOrder(createIdentity1(), createIdentity3())) + assertThat(newIdentities, empty()) + assertThat(removedIdentities, containsInAnyOrder(createIdentity2())) + assertThat(changedIdentities, empty()) + assertThat(unchangedIdentities, containsInAnyOrder(createIdentity1(), createIdentity3())) } @Test fun `detect that an identity was added`() { identityChangeDetector.detectChanges(listOf(createIdentity1(), createIdentity2(), createIdentity3(), createIdentity4())) - assertThat>(newIdentities, containsInAnyOrder(createIdentity4())) - assertThat>(removedIdentities, empty()) - assertThat>(changedIdentities, empty()) - assertThat>(unchangedIdentities, containsInAnyOrder(createIdentity1(), createIdentity2(), createIdentity3())) + assertThat(newIdentities, containsInAnyOrder(createIdentity4())) + assertThat(removedIdentities, empty()) + assertThat(changedIdentities, empty()) + assertThat(unchangedIdentities, containsInAnyOrder(createIdentity1(), createIdentity2(), createIdentity3())) } @Test @@ -76,10 +72,10 @@ class IdentityChangeDetectorTest { val identity2 = createIdentity2() identity2.removeContext("Context C") identityChangeDetector.detectChanges(listOf(createIdentity1(), identity2, createIdentity3())) - assertThat>(newIdentities, empty()) - assertThat>(removedIdentities, empty()) - assertThat>(changedIdentities, containsInAnyOrder(identity2)) - assertThat>(unchangedIdentities, containsInAnyOrder(createIdentity1(), createIdentity3())) + assertThat(newIdentities, empty()) + assertThat(removedIdentities, empty()) + assertThat(changedIdentities, containsInAnyOrder(identity2)) + assertThat(unchangedIdentities, containsInAnyOrder(createIdentity1(), createIdentity3())) } @Test @@ -87,10 +83,10 @@ class IdentityChangeDetectorTest { val identity2 = createIdentity2() identity2.addContext("Context C1") identityChangeDetector.detectChanges(listOf(createIdentity1(), identity2, createIdentity3())) - assertThat>(newIdentities, empty()) - assertThat>(removedIdentities, empty()) - assertThat>(changedIdentities, containsInAnyOrder(identity2)) - assertThat>(unchangedIdentities, containsInAnyOrder(createIdentity1(), createIdentity3())) + assertThat(newIdentities, empty()) + assertThat(removedIdentities, empty()) + assertThat(changedIdentities, containsInAnyOrder(identity2)) + assertThat(unchangedIdentities, containsInAnyOrder(createIdentity1(), createIdentity3())) } @Test @@ -98,10 +94,10 @@ class IdentityChangeDetectorTest { val identity1 = createIdentity1() identity1.removeProperty("Key A") identityChangeDetector.detectChanges(listOf(identity1, createIdentity2(), createIdentity3())) - assertThat>(newIdentities, empty()) - assertThat>(removedIdentities, empty()) - assertThat>(changedIdentities, containsInAnyOrder(identity1)) - assertThat>(unchangedIdentities, containsInAnyOrder(createIdentity2(), createIdentity3())) + assertThat(newIdentities, empty()) + assertThat(removedIdentities, empty()) + assertThat(changedIdentities, containsInAnyOrder(identity1)) + assertThat(unchangedIdentities, containsInAnyOrder(createIdentity2(), createIdentity3())) } @Test @@ -109,10 +105,10 @@ class IdentityChangeDetectorTest { val identity3 = createIdentity3() identity3.setProperty("Key A", "Value A") identityChangeDetector.detectChanges(listOf(createIdentity1(), createIdentity2(), identity3)) - assertThat>(newIdentities, empty()) - assertThat>(removedIdentities, empty()) - assertThat>(changedIdentities, containsInAnyOrder(identity3)) - assertThat>(unchangedIdentities, containsInAnyOrder(createIdentity1(), createIdentity2())) + assertThat(newIdentities, empty()) + assertThat(removedIdentities, empty()) + assertThat(changedIdentities, containsInAnyOrder(identity3)) + assertThat(unchangedIdentities, containsInAnyOrder(createIdentity1(), createIdentity2())) } @Test @@ -120,42 +116,39 @@ class IdentityChangeDetectorTest { val identity3 = createIdentity3() identity3.setProperty("Key E", "Value F") identityChangeDetector.detectChanges(listOf(createIdentity1(), createIdentity2(), identity3)) - assertThat>(newIdentities, empty()) - assertThat>(removedIdentities, empty()) - assertThat>(changedIdentities, containsInAnyOrder(identity3)) - assertThat>(unchangedIdentities, containsInAnyOrder(createIdentity1(), createIdentity2())) + assertThat(newIdentities, empty()) + assertThat(removedIdentities, empty()) + assertThat(changedIdentities, containsInAnyOrder(identity3)) + assertThat(unchangedIdentities, containsInAnyOrder(createIdentity1(), createIdentity2())) } @Test fun `no removed identities are detected without an identity processor`() { - identityChangeDetector.onRemovedIdentity(null) + identityChangeDetector.onRemovedIdentity = null identityChangeDetector.detectChanges(listOf(createIdentity1(), createIdentity3())) + assertThat(removedIdentities, empty()) } @Test fun `no added identities are detected without an identity processor`() { - identityChangeDetector.onNewIdentity(null) + identityChangeDetector.onNewIdentity = null identityChangeDetector.detectChanges(listOf(createIdentity1(), createIdentity2(), createIdentity3(), createIdentity4())) + assertThat(newIdentities, empty()) } - private fun createOldIdentities(): Collection { - return listOf(createIdentity1(), createIdentity2(), createIdentity3()) - } + private fun createOldIdentities() = + listOf(createIdentity1(), createIdentity2(), createIdentity3()) - private fun createIdentity1(): Identity { - return createIdentity("Test1", listOf("Context A", "Context B"), mapOf("Key A" to "Value A", "Key B" to "Value B")) - } + private fun createIdentity1() = + createIdentity("Test1", setOf("Context A", "Context B"), "Key A" to "Value A", "Key B" to "Value B") - private fun createIdentity2(): Identity { - return createIdentity("Test2", listOf("Context C", "Context D"), mapOf("Key C" to "Value C", "Key D" to "Value D")) - } + private fun createIdentity2() = + createIdentity("Test2", setOf("Context C", "Context D"), "Key C" to "Value C", "Key D" to "Value D") - private fun createIdentity3(): Identity { - return createIdentity("Test3", listOf("Context E", "Context F"), mapOf("Key E" to "Value E", "Key F" to "Value F")) - } + private fun createIdentity3() = + createIdentity("Test3", setOf("Context E", "Context F"), "Key E" to "Value E", "Key F" to "Value F") - private fun createIdentity4(): Identity { - return createIdentity("Test4", listOf("Context G", "Context H"), mapOf("Key G" to "Value G", "Key H" to "Value H")) - } + private fun createIdentity4() = + createIdentity("Test4", setOf("Context G", "Context H"), "Key G" to "Value G", "Key H" to "Value H") }