Add tests for more formats

lion7 · gklijs · commit eb832f1ee3c8 · 2024-06-15T11:58:37.000+02:00
diff --git a/kotlin/pom.xml b/kotlin/pom.xml
@@ -59,6 +59,14 @@
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>17</source>
+          <target>17</target>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/serializer/KotlinSerializerCborTest.kt b/kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/serializer/KotlinSerializerCborTest.kt
@@ -0,0 +1,40 @@
+package org.axonframework.extensions.kotlin.serializer
+
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.cbor.Cbor
+import org.axonframework.extensions.kotlin.serialization.KotlinSerializer
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import java.util.HexFormat
+
+class KotlinSerializerCborTest {
+    @OptIn(ExperimentalSerializationApi::class)
+    private val sut = KotlinSerializer(Cbor)
+    private val format = HexFormat.of()
+
+    @Test
+    fun testStandardList() {
+        val items = listOf(
+            TypeOne("a", 1),
+            TypeOne("b", 2),
+        )
+        val actual = sut.serialize(items, ByteArray::class.java)
+        val expected = "9fbf646e616d65616163666f6f01ffbf646e616d65616263666f6f02ffff"
+        assertEquals("List:org.axonframework.extensions.kotlin.serializer.TypeOne", actual.type.name)
+        assertEquals(expected, format.formatHex(actual.data))
+    }
+
+    @Test
+    fun testPolymorphicList() {
+        val items = listOf(
+            TypeOne("a", 1),
+            TypeOne("b", 2),
+            TypeTwo("c", listOf(3, 4)),
+            TypeOne("d", 5),
+        )
+        val actual = sut.serialize(items, ByteArray::class.java)
+        val expected = "9f9f636f6e65bf646e616d65616163666f6f01ffff9f636f6e65bf646e616d65616263666f6f02ffff9f6374776fbf646e616d656163636261729f0304ffffff9f636f6e65bf646e616d65616463666f6f05ffffff"
+        assertEquals("List:org.axonframework.extensions.kotlin.serializer.SuperType", actual.type.name)
+        assertEquals(expected, format.formatHex(actual.data))
+    }
+}
diff --git a/kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/serializer/KotlinSerializerJsonTest.kt b/kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/serializer/KotlinSerializerJsonTest.kt
@@ -1,13 +1,11 @@
 package org.axonframework.extensions.kotlin.serializer
 
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import org.axonframework.extensions.kotlin.serialization.KotlinSerializer
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
-class KotlinSerializerTest {
+class KotlinSerializerJsonTest {
     private val sut = KotlinSerializer(Json)
 
     @Test
@@ -18,7 +16,7 @@ class KotlinSerializerTest {
         )
         val actual = sut.serialize(items, String::class.java)
         val expected = """[{"name":"a","foo":1},{"name":"b","foo":2}]"""
-        assertEquals("List:org.axonframework.extensions.kotlin.serializer.KotlinSerializerTest\$TypeOne", actual.type.name)
+        assertEquals("List:org.axonframework.extensions.kotlin.serializer.TypeOne", actual.type.name)
         assertEquals(expected, actual.data)
     }
 
@@ -32,27 +30,7 @@ class KotlinSerializerTest {
         )
         val actual = sut.serialize(items, String::class.java)
         val expected = """[{"type":"one","name":"a","foo":1},{"type":"one","name":"b","foo":2},{"type":"two","name":"c","bar":[3,4]},{"type":"one","name":"d","foo":5}]"""
-        assertEquals("List:org.axonframework.extensions.kotlin.serializer.KotlinSerializerTest\$SuperType", actual.type.name)
+        assertEquals("List:org.axonframework.extensions.kotlin.serializer.SuperType", actual.type.name)
         assertEquals(expected, actual.data)
     }
-
-    @Serializable
-    sealed interface SuperType {
-        val name: String
-    }
-
-    @Serializable
-    @SerialName("one")
-    data class TypeOne(
-        override val name: String,
-        val foo: Int,
-    ) : SuperType
-
-    @Serializable
-    @SerialName("two")
-    data class TypeTwo(
-        override val name: String,
-        val bar: List<Int>,
-    ) : SuperType
-
 }
diff --git a/kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/serializer/KotlinSerializerProtobufTest.kt b/kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/serializer/KotlinSerializerProtobufTest.kt
@@ -0,0 +1,40 @@
+package org.axonframework.extensions.kotlin.serializer
+
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.protobuf.ProtoBuf
+import org.axonframework.extensions.kotlin.serialization.KotlinSerializer
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+import java.util.HexFormat
+
+class KotlinSerializerProtobufTest {
+    @OptIn(ExperimentalSerializationApi::class)
+    private val sut = KotlinSerializer(ProtoBuf)
+    private val format = HexFormat.of()
+
+    @Test
+    fun testStandardList() {
+        val items = listOf(
+            TypeOne("a", 1),
+            TypeOne("b", 2),
+        )
+        val actual = sut.serialize(items, ByteArray::class.java)
+        val expected = "02050a01611001050a01621002"
+        assertEquals("List:org.axonframework.extensions.kotlin.serializer.TypeOne", actual.type.name)
+        assertEquals(expected, format.formatHex(actual.data))
+    }
+
+    @Test
+    fun testPolymorphicList() {
+        val items = listOf(
+            TypeOne("a", 1),
+            TypeOne("b", 2),
+            TypeTwo("c", listOf(3, 4)),
+            TypeOne("d", 5),
+        )
+        val actual = sut.serialize(items, ByteArray::class.java)
+        val expected = "040c0a036f6e6512050a016110010c0a036f6e6512050a016210020e0a0374776f12070a0163100310040c0a036f6e6512050a01641005"
+        assertEquals("List:org.axonframework.extensions.kotlin.serializer.SuperType", actual.type.name)
+        assertEquals(expected, format.formatHex(actual.data))
+    }
+}
diff --git a/kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/serializer/TestTypes.kt b/kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/serializer/TestTypes.kt
@@ -0,0 +1,23 @@
+package org.axonframework.extensions.kotlin.serializer
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+sealed interface SuperType {
+    val name: String
+}
+
+@Serializable
+@SerialName("one")
+data class TypeOne(
+    override val name: String,
+    val foo: Int,
+) : SuperType
+
+@Serializable
+@SerialName("two")
+data class TypeTwo(
+    override val name: String,
+    val bar: List<Int>,
+) : SuperType
diff --git a/pom.xml b/pom.xml
@@ -118,7 +118,7 @@
             </dependency>
             <dependency>
               <groupId>org.jetbrains.kotlinx</groupId>
-              <artifactId>kotlinx-serialization-json</artifactId>
+              <artifactId>kotlinx-serialization-core</artifactId>
               <version>${kotlin-serialization.version}</version>
             </dependency>
             <!-- Testing -->
@@ -145,6 +145,24 @@
                 <version>${slf4j.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+              <groupId>org.jetbrains.kotlinx</groupId>
+              <artifactId>kotlinx-serialization-json</artifactId>
+              <version>${kotlin-serialization.version}</version>
+              <scope>test</scope>
+            </dependency>
+            <dependency>
+              <groupId>org.jetbrains.kotlinx</groupId>
+              <artifactId>kotlinx-serialization-cbor</artifactId>
+              <version>${kotlin-serialization.version}</version>
+              <scope>test</scope>
+            </dependency>
+            <dependency>
+              <groupId>org.jetbrains.kotlinx</groupId>
+              <artifactId>kotlinx-serialization-protobuf</artifactId>
+              <version>${kotlin-serialization.version}</version>
+              <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -165,7 +183,7 @@
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-serialization-json</artifactId>
+            <artifactId>kotlinx-serialization-core</artifactId>
         </dependency>
         <!-- Testing -->
         <dependency>
@@ -188,6 +206,21 @@
             <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>org.jetbrains.kotlinx</groupId>
+          <artifactId>kotlinx-serialization-json</artifactId>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.jetbrains.kotlinx</groupId>
+          <artifactId>kotlinx-serialization-cbor</artifactId>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>org.jetbrains.kotlinx</groupId>
+          <artifactId>kotlinx-serialization-protobuf</artifactId>
+          <scope>test</scope>
+        </dependency>
         <dependency>
             <!-- Not part of Java 8 by default. Adding it as a dependency makes it compatible with Java 8 -->
             <groupId>javax.xml.bind</groupId>
