add more tests

Author: JesusMcCloud

formats/cbor/commonTest/src/kotlinx/serialization/cbor/CborArrayTest.kt

@@ -1,6 +1,7 @@
 package kotlinx.serialization.cbor
 
 import kotlinx.serialization.*
+import kotlinx.serialization.cbor.CborIsoTest.DataClass
 import kotlin.test.*
 
 
@@ -18,6 +19,10 @@ class CborArrayTest {
         val cbor = Cbor.CoseCompliant
         assertEquals(referenceHexString, cbor.encodeToHexString(ClassAs1Array.serializer(), reference))
         assertEquals(reference, cbor.decodeFromHexString(ClassAs1Array.serializer(), referenceHexString))
+
+        val struct = cbor.encodeToCbor(ClassAs1Array.serializer(), reference)
+        assertEquals(reference, cbor.decodeFromCbor(ClassAs1Array.serializer(), struct))
+        assertEquals(referenceHexString, cbor.encodeToHexString(CborElement.serializer(), struct))
     }
 
     @Test
@@ -35,6 +40,10 @@ class CborArrayTest {
         val cbor = Cbor.CoseCompliant
         assertEquals(referenceHexString, cbor.encodeToHexString(ClassAs2Array.serializer(), reference))
         assertEquals(reference, cbor.decodeFromHexString(ClassAs2Array.serializer(), referenceHexString))
+
+        val struct = cbor.encodeToCbor(ClassAs2Array.serializer(), reference)
+        assertEquals(reference, cbor.decodeFromCbor(ClassAs2Array.serializer(), struct))
+        assertEquals(referenceHexString, cbor.encodeToHexString(CborElement.serializer(), struct))
     }
 
     @Test
@@ -54,6 +63,10 @@ class CborArrayTest {
 
         assertEquals(referenceHexString, cbor.encodeToHexString(ClassAs4ArrayNullable.serializer(), reference))
         assertEquals(reference, cbor.decodeFromHexString(ClassAs4ArrayNullable.serializer(), referenceHexString))
+
+        val struct = cbor.encodeToCbor(ClassAs4ArrayNullable.serializer(), reference)
+        assertEquals(reference, cbor.decodeFromCbor(ClassAs4ArrayNullable.serializer(), struct))
+        assertEquals(referenceHexString, cbor.encodeToHexString(CborElement.serializer(), struct))
     }
 
     @Test
@@ -75,12 +88,10 @@ class CborArrayTest {
         assertEquals(referenceHexString, cbor.encodeToHexString(ClassWithArray.serializer(), reference))
         assertEquals(reference, cbor.decodeFromHexString(ClassWithArray.serializer(), referenceHexString))
 
-        println(
-            cbor.encodeToHexString(
-                DoubleTaggedClassWithArray.serializer(),
-                DoubleTaggedClassWithArray(array = ClassAs2Array(alg = -7, kid = "bar"))
-            )
-        )
+
+        val struct = cbor.encodeToCbor(ClassWithArray.serializer(), reference)
+        assertEquals(reference, cbor.decodeFromCbor(ClassWithArray.serializer(), struct))
+        assertEquals(referenceHexString, cbor.encodeToHexString(CborElement.serializer(), struct))
     }
 
 
@@ -103,6 +114,10 @@ class CborArrayTest {
         val cbor = Cbor.CoseCompliant
         assertEquals(referenceHexString, cbor.encodeToHexString(DoubleTaggedClassWithArray.serializer(), reference))
         assertEquals(reference, cbor.decodeFromHexString(DoubleTaggedClassWithArray.serializer(), referenceHexString))
+
+        val struct = cbor.encodeToCbor(DoubleTaggedClassWithArray.serializer(), reference)
+        assertEquals(reference, cbor.decodeFromCbor(DoubleTaggedClassWithArray.serializer(), struct))
+        assertEquals(referenceHexString, cbor.encodeToHexString(CborElement.serializer(), struct))
     }
 
     @CborArray

formats/cbor/commonTest/src/kotlinx/serialization/cbor/CborDecoderTest.kt

@@ -18,9 +18,13 @@ class CborDecoderTest {
     @Test
     fun testDecodeSimpleObject() {
         val hex = "bf616163737472ff"
-        assertEquals(Simple("str"), Cbor.decodeFromHexString(Simple.serializer(), hex))
+        val reference = Simple("str")
+        assertEquals(reference, Cbor.decodeFromHexString(Simple.serializer(), hex))
+
         val struct = Cbor.decodeFromHexString<CborElement>(hex)
-        assertEquals(Simple("str"), Cbor.decodeFromCbor(Simple.serializer(), struct))
+        assertEquals(reference, Cbor.decodeFromCbor(Simple.serializer(), struct))
+
+        assertEquals(hex, Cbor.encodeToHexString(CborElement.serializer(), struct))
     }
 
     @Test
@@ -50,14 +54,23 @@ class CborDecoderTest {
         assertEquals(Cbor.encodeToCbor(test), struct)
         assertEquals(test, Cbor.decodeFromCbor(TypesUmbrella.serializer(), struct))
 
+        assertEquals(hex, Cbor.encodeToHexString(CborElement.serializer(), struct))
+
 
         // with maps, lists & strings of definite length
+        val hexDef =
+            "a9646c6973748261616162686e756c6c61626c65f6636d6170a202f401f56169182a6a696e6e6572734c69737481a16161636b656b637374726d48656c6c6f2c20776f726c642165696e6e6572a16161636c6f6c6a62797465537472696e6742cafe6962797465417272617982383521"
         assertEquals(
             test, Cbor.decodeFromHexString(
                 TypesUmbrella.serializer(),
-                "a9646c6973748261616162686e756c6c61626c65f6636d6170a202f401f56169182a6a696e6e6572734c69737481a16161636b656b637374726d48656c6c6f2c20776f726c642165696e6e6572a16161636c6f6c6a62797465537472696e6742cafe6962797465417272617982383521"
+                hexDef
             )
         )
+
+        val structDef = Cbor.decodeFromHexString<CborElement>(hexDef)
+        assertEquals(Cbor.encodeToCbor(test), structDef)
+        assertEquals(test, Cbor.decodeFromCbor(TypesUmbrella.serializer(), structDef))
+
     }
 
     @Test

formats/cbor/commonTest/src/kotlinx/serialization/cbor/CborIsoTest.kt

@@ -27,6 +27,10 @@ class CborIsoTest {
         }
         assertEquals(reference, cbor.decodeFromHexString(DataClass.serializer(), referenceHexString))
         assertEquals(referenceHexString, cbor.encodeToHexString(DataClass.serializer(), reference))
+
+        val struct = cbor.encodeToCbor(DataClass.serializer(), reference)
+        assertEquals(reference, cbor.decodeFromCbor(DataClass.serializer(), struct))
+        assertEquals(referenceHexString, cbor.encodeToHexString(CborElement.serializer(), struct))
     }
 
     @Serializable