refactoring in progress

src/commonTest/kotlin/RingTest.kt

@@ -31,8 +31,8 @@ class RingTest {
 //
         val r = UniversalRing(k1, k2)
 //        val r = UniversalRing(k1)
-        assertContains(r, k2)
-        assertContains(r, k1)
+        assertTrue(k2 in r)
+        assertTrue(k1 in r)
         assertFalse { k3 in r }
 
         println(Asymmetric.randomSecretKey().keyBytes.size)
@@ -42,8 +42,8 @@ class RingTest {
         println(encoded.size)
         assertTrue { encoded.size < 80 }
         val r2: UniversalRing = BipackDecoder.decode(encoded)
-        assertContains(r2, k2)
-        assertContains(r2, k1)
+        assertTrue { k2 in r2 }
+        assertTrue { k1 in r2 }
         assertFalse { k3 in r2 }
 
         println("\r\n")
@@ -57,8 +57,42 @@ class RingTest {
     }
 
     @Test
-    @Ignore
-    fun testKeysWithSameTags() {
-        // it should be able to keep keys with same tags
+    fun testTags() = runTest {
+        initCrypto()
+
+        val y1 = SymmetricKey("1234567890Hello,dolly.here-we-go".encodeToUByteArray())
+        val y2 = SymmetricKey("1234567890Hello,dolly.here-we-go".encodeToUByteArray())
+
+        val e1 = Asymmetric.randomSecretKey()
+        val e2: Asymmetric.SecretKey = BipackDecoder.decode(BipackEncoder.encode(e1))
+
+        val k1 = UniversalKey.from(SymmetricKey("1234567890Hello,dolly.here-we-go".encodeToUByteArray()))
+        val k11 = UniversalKey.from(SymmetricKey("1234567890Hello,dolly.here-we-go".encodeToUByteArray()))
+        val k2 = UniversalKey.from(Asymmetric.randomSecretKey())
+        val k3 = UniversalKey.from(Asymmetric.randomSecretKey())
+
+        val r1 = UniversalRing(k1, k2)
+        var r2 = UniversalRing(deepCopy(k1), deepCopy(k2))
+        assertEquals(r2, r1)
+        val r3 = UniversalRing(k1 to "foo", k2 to "bar")
+        assertNotEquals(r3, r2)
+        assertTrue { r3 equalKeys r2 }
+
+        r2 += (k1 to "foo")
+        r2 = r2.addTags(k2, "bar")
+        assertEquals(r2, r3)
+        assertEquals(deepCopy(r2), r3)
+
+        r2 += k1 to "buzz"
+        r2 = deepCopy(r2)
+        assertEquals(setOf("foo", "buzz"), r2.getTags(k1))
+        assertNotEquals(r2, r3)
+        r2 = deepCopy(r2.removeTags(k1, "buzz"))
+        assertEquals(r2, r3)
+    }
+
+    @Test
+    fun testSize() = runTest {
+//        val sy1 = SymmetricKey.random().toUniversal()
     }
 }