libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/QVariantMapSerializerTest.kt

@@ -29,35 +29,41 @@ class QVariantMapSerializerTest {
   }
 
   @Test
-  fun testEmpty() = primitiveSerializerTest(
+  fun testEmpty() =
+    primitiveSerializerTest(
       QVariantMapSerializer,
       mapOf(),
-    byteBufferOf(0, 0, 0, 0)
+      byteBufferOf(0, 0, 0, 0),
     )
 
   @Test
-  fun testNormal() = primitiveSerializerTest(
+  fun testNormal() =
+    primitiveSerializerTest(
       QVariantMapSerializer,
       mapOf(
         "Username" to qVariant("AzureDiamond", QtType.QString),
-      "Password" to qVariant("hunter2", QtType.QString)
+        "Password" to qVariant("hunter2", QtType.QString),
       ),
       byteBufferOf(
-      0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x10, 0x00, 0x55, 0x00, 0x73, 0x00, 0x65, 0x00, 0x72, 0x00, 0x6E, 0x00,
-      0x61, 0x00, 0x6D, 0x00, 0x65, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x41, 0x00, 0x7A, 0x00,
-      0x75, 0x00, 0x72, 0x00, 0x65, 0x00, 0x44, 0x00, 0x69, 0x00, 0x61, 0x00, 0x6D, 0x00, 0x6F, 0x00, 0x6E, 0x00, 0x64,
-      0x00, 0x00, 0x00, 0x10, 0x00, 0x50, 0x00, 0x61, 0x00, 0x73, 0x00, 0x73, 0x00, 0x77, 0x00, 0x6F, 0x00, 0x72, 0x00,
-      0x64, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x68, 0x00, 0x75, 0x00, 0x6E, 0x00, 0x74, 0x00,
-      0x65, 0x00, 0x72, 0x00, 0x32
+        0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x10, 0x00, 0x55, 0x00, 0x73,
+        0x00, 0x65, 0x00, 0x72, 0x00, 0x6E, 0x00, 0x61, 0x00, 0x6D, 0x00, 0x65,
+        0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x41, 0x00,
+        0x7A, 0x00, 0x75, 0x00, 0x72, 0x00, 0x65, 0x00, 0x44, 0x00, 0x69, 0x00,
+        0x61, 0x00, 0x6D, 0x00, 0x6F, 0x00, 0x6E, 0x00, 0x64, 0x00, 0x00, 0x00,
+        0x10, 0x00, 0x50, 0x00, 0x61, 0x00, 0x73, 0x00, 0x73, 0x00, 0x77, 0x00,
+        0x6F, 0x00, 0x72, 0x00, 0x64, 0x00, 0x00, 0x00, 0x0A, 0x00, 0x00, 0x00,
+        0x00, 0x0E, 0x00, 0x68, 0x00, 0x75, 0x00, 0x6E, 0x00, 0x74, 0x00, 0x65,
+        0x00, 0x72, 0x00, 0x32,
       ),
-    ::MapMatcher
+      ::MapMatcher,
     )
 
   @Test
-  fun testNullKey() = primitiveSerializerTest(
+  fun testNullKey() =
+    primitiveSerializerTest(
       QVariantMapSerializer,
       mapOf(
-      "" to qVariant<String?>(null, QtType.QString)
+        "" to qVariant<String?>(null, QtType.QString),
       ),
       byteBufferOf(
         // length
@@ -69,9 +75,9 @@ class QVariantMapSerializerTest {
         // isNull of value
         0x00u,
         // length of value
-      0xFFu, 0xFFu, 0xFFu, 0xFFu
+        0xFFu, 0xFFu, 0xFFu, 0xFFu,
       ),
       ::MapMatcher,
-    serializeFeatureSet = null
+      serializeFeatureSet = null,
     )
 }

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/QVariantSerializerTest.kt

@@ -33,7 +33,7 @@ class QVariantSerializerTest {
     assertThrows<NoSerializerForTypeException> {
       QVariantSerializer.deserialize(
         byteBufferOf(0x00u, 0x00u, 0x01u, 0x00u, 0x00u),
-        FeatureSet.all()
+        FeatureSet.all(),
       )
     }
   }
@@ -43,7 +43,7 @@ class QVariantSerializerTest {
     assertThrows<NoSerializerForTypeException> {
       QVariantSerializer.deserialize(
         byteBufferOf(0x00u, 0xFFu, 0x00u, 0x00u, 0x00u),
-        FeatureSet.all()
+        FeatureSet.all(),
       )
     }
   }
@@ -60,7 +60,7 @@ class QVariantSerializerTest {
           // QuasselType length
           0x00u, 0x00u, 0x00u, 0x00u,
         ),
-        FeatureSet.all()
+        FeatureSet.all(),
       )
     }
   }
@@ -77,9 +77,9 @@ class QVariantSerializerTest {
           // QuasselType length
           0x00u, 0x00u, 0x00u, 0x03u,
           // "foo"
-          0x66u, 0x6fu, 0x6fu
+          0x66u, 0x6fu, 0x6fu,
         ),
-        FeatureSet.all()
+        FeatureSet.all(),
       )
     }
   }

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/ShortSerializerTest.kt

@@ -27,30 +27,34 @@ class ShortSerializerTest {
   }
 
   @Test
-  fun testZero() = primitiveSerializerTest(
+  fun testZero() =
+    primitiveSerializerTest(
       ShortSerializer,
       0.toShort(),
-    byteBufferOf(0, 0)
+      byteBufferOf(0, 0),
     )
 
   @Test
-  fun testMinimal() = primitiveSerializerTest(
+  fun testMinimal() =
+    primitiveSerializerTest(
       ShortSerializer,
       Short.MIN_VALUE,
-    byteBufferOf(-128, 0)
+      byteBufferOf(-128, 0),
     )
 
   @Test
-  fun testMaximal() = primitiveSerializerTest(
+  fun testMaximal() =
+    primitiveSerializerTest(
       ShortSerializer,
       Short.MAX_VALUE,
-    byteBufferOf(127, -1)
+      byteBufferOf(127, -1),
     )
 
   @Test
-  fun testAllOnes() = primitiveSerializerTest(
+  fun testAllOnes() =
+    primitiveSerializerTest(
       ShortSerializer,
       0.toShort().inv(),
-    byteBufferOf(-1, -1)
+      byteBufferOf(-1, -1),
     )
 }

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/StringSerializerTest.kt

@@ -62,7 +62,8 @@ class StringSerializerTest {
 
   @Test
   fun testRoundtripEnglish() {
-    val data = """
+    val data =
+      """
       : ACHTUNG!
       ALLES TURISTEN UND NONTEKNISCHEN LOOKENPEEPERS!
       DAS KOMPUTERMASCHINE IST NICHT FÜR DER GEFINGERPOKEN UND MITTENGRABEN! ODERWISE IST EASY TO SCHNAPPEN DER SPRINGENWERK, BLOWENFUSEN UND POPPENCORKEN MIT SPITZENSPARKEN.
@@ -87,7 +88,8 @@ class StringSerializerTest {
 
   @Test
   fun testRoundtripEnglishUtf16() {
-    val data = """
+    val data =
+      """
       : ACHTUNG!
       ALLES TURISTEN UND NONTEKNISCHEN LOOKENPEEPERS!
       DAS KOMPUTERMASCHINE IST NICHT FÜR DER GEFINGERPOKEN UND MITTENGRABEN! ODERWISE IST EASY TO SCHNAPPEN DER SPRINGENWERK, BLOWENFUSEN UND POPPENCORKEN MIT SPITZENSPARKEN.
@@ -104,7 +106,8 @@ class StringSerializerTest {
 
   @Test
   fun testDeserializeEnglish() {
-    val value = """
+    val value =
+      """
       : ACHTUNG!
       ALLES TURISTEN UND NONTEKNISCHEN LOOKENPEEPERS!
       DAS KOMPUTERMASCHINE IST NICHT FÜR DER GEFINGERPOKEN UND MITTENGRABEN! ODERWISE IST EASY TO SCHNAPPEN DER SPRINGENWERK, BLOWENFUSEN UND POPPENCORKEN MIT SPITZENSPARKEN.
@@ -112,7 +115,8 @@ class StringSerializerTest {
       ZO RELAXEN UND WATSCHEN DER BLINKENLICHTEN.
       """.trimIndent()
 
-    val utf8Buffer = byteBufferOf(
+    val utf8Buffer =
+      byteBufferOf(
         0,
         0,
         1,
@@ -510,9 +514,10 @@ class StringSerializerTest {
         84,
         69,
         78,
-      46
+        46,
       )
-    val utf16Buffer = byteBufferOf(
+    val utf16Buffer =
+      byteBufferOf(
         0,
         0,
         3,
@@ -1298,7 +1303,7 @@ class StringSerializerTest {
         0,
         78,
         0,
-      46
+        46,
       )
 
     assertEquals(value, StringSerializerUtf8.deserialize(utf8Buffer, FeatureSet.all()))

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/UByteSerializerTest.kt

@@ -26,30 +26,34 @@ class UByteSerializerTest {
   }
 
   @Test
-  fun testZero() = primitiveSerializerTest(
+  fun testZero() =
+    primitiveSerializerTest(
       UByteSerializer,
       0.toUByte(),
-    byteBufferOf(0)
+      byteBufferOf(0),
     )
 
   @Test
-  fun testMinimal() = primitiveSerializerTest(
+  fun testMinimal() =
+    primitiveSerializerTest(
       UByteSerializer,
       UByte.MIN_VALUE,
-    byteBufferOf(0)
+      byteBufferOf(0),
     )
 
   @Test
-  fun testMaximal() = primitiveSerializerTest(
+  fun testMaximal() =
+    primitiveSerializerTest(
       UByteSerializer,
       UByte.MAX_VALUE,
-    byteBufferOf(255u)
+      byteBufferOf(255u),
     )
 
   @Test
-  fun testAllOnes() = primitiveSerializerTest(
+  fun testAllOnes() =
+    primitiveSerializerTest(
       UByteSerializer,
       0.toUByte().inv(),
-    byteBufferOf(255u)
+      byteBufferOf(255u),
     )
 }

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/UIntSerializerTest.kt

@@ -26,30 +26,34 @@ class UIntSerializerTest {
   }
 
   @Test
-  fun testZero() = primitiveSerializerTest(
+  fun testZero() =
+    primitiveSerializerTest(
       UIntSerializer,
       0.toUInt(),
-    byteBufferOf(0, 0, 0, 0)
+      byteBufferOf(0, 0, 0, 0),
     )
 
   @Test
-  fun testMinimal() = primitiveSerializerTest(
+  fun testMinimal() =
+    primitiveSerializerTest(
       UIntSerializer,
       UInt.MIN_VALUE,
-    byteBufferOf(0, 0, 0, 0)
+      byteBufferOf(0, 0, 0, 0),
     )
 
   @Test
-  fun testMaximal() = primitiveSerializerTest(
+  fun testMaximal() =
+    primitiveSerializerTest(
       UIntSerializer,
       UInt.MAX_VALUE,
-    byteBufferOf(255u, 255u, 255u, 255u)
+      byteBufferOf(255u, 255u, 255u, 255u),
     )
 
   @Test
-  fun testAllOnes() = primitiveSerializerTest(
+  fun testAllOnes() =
+    primitiveSerializerTest(
       UIntSerializer,
       0.toUInt().inv(),
-    byteBufferOf(255u, 255u, 255u, 255u)
+      byteBufferOf(255u, 255u, 255u, 255u),
     )
 }

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/ULongSerializerTest.kt

@@ -26,30 +26,34 @@ class ULongSerializerTest {
   }
 
   @Test
-  fun testZero() = primitiveSerializerTest(
+  fun testZero() =
+    primitiveSerializerTest(
       ULongSerializer,
       0.toULong(),
-    byteBufferOf(0, 0, 0, 0, 0, 0, 0, 0)
+      byteBufferOf(0, 0, 0, 0, 0, 0, 0, 0),
     )
 
   @Test
-  fun testMinimal() = primitiveSerializerTest(
+  fun testMinimal() =
+    primitiveSerializerTest(
       ULongSerializer,
       ULong.MIN_VALUE,
-    byteBufferOf(0, 0, 0, 0, 0, 0, 0, 0)
+      byteBufferOf(0, 0, 0, 0, 0, 0, 0, 0),
     )
 
   @Test
-  fun testMaximal() = primitiveSerializerTest(
+  fun testMaximal() =
+    primitiveSerializerTest(
       ULongSerializer,
       ULong.MAX_VALUE,
-    byteBufferOf(255u, 255u, 255u, 255u, 255u, 255u, 255u, 255u)
+      byteBufferOf(255u, 255u, 255u, 255u, 255u, 255u, 255u, 255u),
     )
 
   @Test
-  fun testAllOnes() = primitiveSerializerTest(
+  fun testAllOnes() =
+    primitiveSerializerTest(
       ULongSerializer,
       0.toULong().inv(),
-    byteBufferOf(255u, 255u, 255u, 255u, 255u, 255u, 255u, 255u)
+      byteBufferOf(255u, 255u, 255u, 255u, 255u, 255u, 255u, 255u),
     )
 }

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/UShortSerializerTest.kt

@@ -26,30 +26,34 @@ class UShortSerializerTest {
   }
 
   @Test
-  fun testZero() = primitiveSerializerTest(
+  fun testZero() =
+    primitiveSerializerTest(
       UShortSerializer,
       0.toUShort(),
-    byteBufferOf(0, 0)
+      byteBufferOf(0, 0),
     )
 
   @Test
-  fun testMinimal() = primitiveSerializerTest(
+  fun testMinimal() =
+    primitiveSerializerTest(
       UShortSerializer,
       UShort.MIN_VALUE,
-    byteBufferOf(0, 0)
+      byteBufferOf(0, 0),
     )
 
   @Test
-  fun testMaximal() = primitiveSerializerTest(
+  fun testMaximal() =
+    primitiveSerializerTest(
       UShortSerializer,
       UShort.MAX_VALUE,
-    byteBufferOf(255u, 255u)
+      byteBufferOf(255u, 255u),
     )
 
   @Test
-  fun testAllOnes() = primitiveSerializerTest(
+  fun testAllOnes() =
+    primitiveSerializerTest(
       UShortSerializer,
       0.toUShort().inv(),
-    byteBufferOf(255u, 255u)
+      byteBufferOf(255u, 255u),
     )
 }

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/UuidSerializerTest.kt

@@ -27,11 +27,12 @@ class UuidSerializerTest {
   }
 
   @Test
-  fun testSimple() = primitiveSerializerTest(
+  fun testSimple() =
+    primitiveSerializerTest(
       UuidSerializer,
       UUID.fromString("e4335bb0-ceef-4b9f-8ceb-be19b4da34fd"),
       byteBufferOf(
         0xE4u, 0x33u, 0x5Bu, 0xB0u, 0xCEu, 0xEFu, 0x4Bu, 0x9Fu, 0x8Cu, 0xEBu, 0xBEu, 0x19u, 0xB4u, 0xDAu, 0x34u, 0xFDu,
-    )
+      ),
     )
 }

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/qt/VoidSerializerTest.kt

@@ -26,9 +26,10 @@ class VoidSerializerTest {
   }
 
   @Test
-  fun test() = primitiveSerializerTest(
+  fun test() =
+    primitiveSerializerTest(
       VoidSerializer,
       Unit,
-    byteBufferOf()
+      byteBufferOf(),
     )
 }

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/BufferIdSerializerTest.kt → libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/BufferModelIdSerializerTest.kt

@@ -17,7 +17,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 @Tag("QuasselSerializerTest")
-class BufferIdSerializerTest {
+class BufferModelIdSerializerTest {
   @Test
   fun testIsRegistered() {
     assertEquals(
@@ -27,30 +27,34 @@ class BufferIdSerializerTest {
   }
 
   @Test
-  fun testZero() = primitiveSerializerTest(
+  fun testZero() =
+    primitiveSerializerTest(
       BufferIdSerializer,
       BufferId(0),
-    byteBufferOf(0, 0, 0, 0)
+      byteBufferOf(0, 0, 0, 0),
     )
 
   @Test
-  fun testMinimal() = primitiveSerializerTest(
+  fun testMinimal() =
+    primitiveSerializerTest(
       BufferIdSerializer,
       BufferId.MIN_VALUE,
-    byteBufferOf(-128, 0, 0, 0)
+      byteBufferOf(-128, 0, 0, 0),
     )
 
   @Test
-  fun testMaximal() = primitiveSerializerTest(
+  fun testMaximal() =
+    primitiveSerializerTest(
       BufferIdSerializer,
       BufferId.MAX_VALUE,
-    byteBufferOf(127, -1, -1, -1)
+      byteBufferOf(127, -1, -1, -1),
     )
 
   @Test
-  fun testAllOnes() = primitiveSerializerTest(
+  fun testAllOnes() =
+    primitiveSerializerTest(
       BufferIdSerializer,
       BufferId(0.inv()),
-    byteBufferOf(-1, -1, -1, -1)
+      byteBufferOf(-1, -1, -1, -1),
     )
 }

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/BufferInfoSerializerTest.kt → libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/BufferModelInfoSerializerTest.kt

@@ -22,7 +22,7 @@ import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
 
 @Tag("QuasselSerializerTest")
-class BufferInfoSerializerTest {
+class BufferModelInfoSerializerTest {
   @Test
   fun testIsRegistered() {
     assertEquals(
@@ -32,14 +32,15 @@ class BufferInfoSerializerTest {
   }
 
   @Test
-  fun testBaseCase() = primitiveSerializerTest(
+  fun testBaseCase() =
+    primitiveSerializerTest(
       BufferInfoSerializer,
       BufferInfo(
         BufferId(-1),
         NetworkId(-1),
         BufferType.none(),
         -1,
-      ""
+        "",
       ),
       byteBufferOf(
         0xFFu,
@@ -59,19 +60,20 @@ class BufferInfoSerializerTest {
         0x00u,
         0x00u,
         0x00u,
-      0x00u
-    )
+        0x00u,
+      ),
     )
 
   @Test
-  fun testNormal() = primitiveSerializerTest(
+  fun testNormal() =
+    primitiveSerializerTest(
       BufferInfoSerializer,
       BufferInfo(
         BufferId.MAX_VALUE,
         NetworkId.MAX_VALUE,
         BufferType.validValues(),
         Int.MAX_VALUE,
-      "äẞ\u0000\uFFFF"
+        "äẞ\u0000\uFFFF",
       ),
       byteBufferOf(
         127,
@@ -100,7 +102,7 @@ class BufferInfoSerializerTest {
         0,
         -17,
         -65,
-      -65
-    )
+        -65,
+      ),
     )
 }

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/DccIpDetectionModeSerializerTest.kt

@@ -27,21 +27,24 @@ class DccIpDetectionModeSerializerTest {
   }
 
   @Test
-  fun testAutomatic() = primitiveSerializerTest(
+  fun testAutomatic() =
+    primitiveSerializerTest(
       DccIpDetectionModeSerializer,
       DccIpDetectionMode.Automatic,
-    byteBufferOf(0x00u)
+      byteBufferOf(0x00u),
     )
 
   @Test
-  fun testManual() = primitiveSerializerTest(
+  fun testManual() =
+    primitiveSerializerTest(
       DccIpDetectionModeSerializer,
       DccIpDetectionMode.Manual,
-    byteBufferOf(0x01u)
+      byteBufferOf(0x01u),
     )
 
   @Test
-  fun testNull() = primitiveSerializerTest(
+  fun testNull() =
+    primitiveSerializerTest(
       DccIpDetectionModeSerializer,
       null,
       byteBufferOf(0x00u),

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/DccPortSelectionModeSerializerTest.kt

@@ -27,21 +27,24 @@ class DccPortSelectionModeSerializerTest {
   }
 
   @Test
-  fun testAutomatic() = primitiveSerializerTest(
+  fun testAutomatic() =
+    primitiveSerializerTest(
       DccPortSelectionModeSerializer,
       DccPortSelectionMode.Automatic,
-    byteBufferOf(0x00u)
+      byteBufferOf(0x00u),
     )
 
   @Test
-  fun testManual() = primitiveSerializerTest(
+  fun testManual() =
+    primitiveSerializerTest(
       DccPortSelectionModeSerializer,
       DccPortSelectionMode.Manual,
-    byteBufferOf(0x01u)
+      byteBufferOf(0x01u),
     )
 
   @Test
-  fun testNull() = primitiveSerializerTest(
+  fun testNull() =
+    primitiveSerializerTest(
       DccPortSelectionModeSerializer,
       null,
       byteBufferOf(0x00u),

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/IdentityIdSerializerTest.kt

@@ -27,30 +27,34 @@ class IdentityIdSerializerTest {
   }
 
   @Test
-  fun testZero() = primitiveSerializerTest(
+  fun testZero() =
+    primitiveSerializerTest(
       IdentityIdSerializer,
       IdentityId(0),
-    byteBufferOf(0, 0, 0, 0)
+      byteBufferOf(0, 0, 0, 0),
     )
 
   @Test
-  fun testMinimal() = primitiveSerializerTest(
+  fun testMinimal() =
+    primitiveSerializerTest(
       IdentityIdSerializer,
       IdentityId.MIN_VALUE,
-    byteBufferOf(-128, 0, 0, 0)
+      byteBufferOf(-128, 0, 0, 0),
     )
 
   @Test
-  fun testMaximal() = primitiveSerializerTest(
+  fun testMaximal() =
+    primitiveSerializerTest(
       IdentityIdSerializer,
       IdentityId.MAX_VALUE,
-    byteBufferOf(127, -1, -1, -1)
+      byteBufferOf(127, -1, -1, -1),
     )
 
   @Test
-  fun testAllOnes() = primitiveSerializerTest(
+  fun testAllOnes() =
+    primitiveSerializerTest(
       IdentityIdSerializer,
       IdentityId(0.inv()),
-    byteBufferOf(-1, -1, -1, -1)
+      byteBufferOf(-1, -1, -1, -1),
     )
 }

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/IrcChannelSerializerTest.kt

@@ -8,14 +8,11 @@
  */
 package de.justjanne.libquassel.protocol.serializers.quassel
 
-import de.justjanne.libquassel.protocol.models.ids.NetworkId
+import de.justjanne.libquassel.protocol.models.network.IrcChannelDto
 import de.justjanne.libquassel.protocol.models.types.QuasselType
-import de.justjanne.libquassel.protocol.syncables.common.IrcChannel
-import de.justjanne.libquassel.protocol.syncables.state.IrcChannelState
+import de.justjanne.libquassel.protocol.serializers.PrimitiveSerializer
 import de.justjanne.libquassel.protocol.testutil.byteBufferOf
-import de.justjanne.libquassel.protocol.testutil.matchers.MapMatcher
 import de.justjanne.libquassel.protocol.testutil.primitiveSerializerTest
-import de.justjanne.libquassel.protocol.variant.QVariantMap
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Tag
 import org.junit.jupiter.api.Test
@@ -26,32 +23,17 @@ class IrcChannelSerializerTest {
   fun testIsRegistered() {
     assertEquals(
       IrcChannelSerializer,
-      QuasselType.IrcChannel.serializer<QVariantMap>(),
+      QuasselType.IrcChannel.serializer<IrcChannelDto>(),
     )
   }
 
-  @Test
-  fun testEmptyMap() = primitiveSerializerTest(
-    IrcChannelSerializer,
-    emptyMap(),
-    byteBufferOf(
-      // no elements
-      0x00u, 0x00u, 0x00u, 0x00u,
-    ),
-    featureSets = emptyList(),
-    serializeFeatureSet = null
-  )
-
   @Test
   fun testNormal() = primitiveSerializerTest(
-    IrcChannelSerializer,
-    IrcChannel(
-      state = IrcChannelState(
-        network = NetworkId(4),
-        name = "#quassel"
-      )
-    ).toVariantMap(),
-    byteBufferOf(
+      IrcChannelSerializer as PrimitiveSerializer<IrcChannelDto>,
+      IrcChannelDto(
+            name = "#quassel",
+      ),
+      encoded = byteBufferOf(
         0x00u, 0x00u, 0x00u, 0x06u, 0x00u, 0x00u, 0x00u, 0x08u, 0x00u, 0x6Eu, 0x00u, 0x61u, 0x00u, 0x6Du, 0x00u, 0x65u,
         0x00u, 0x00u, 0x00u, 0x0Au, 0x00u, 0x00u, 0x00u, 0x00u, 0x10u, 0x00u, 0x23u, 0x00u, 0x71u, 0x00u, 0x75u, 0x00u,
         0x61u, 0x00u, 0x73u, 0x00u, 0x73u, 0x00u, 0x65u, 0x00u, 0x6Cu, 0x00u, 0x00u, 0x00u, 0x0Au, 0x00u, 0x74u, 0x00u,
@@ -69,6 +51,5 @@ class IrcChannelSerializerTest {
         0x00u, 0x4Du, 0x00u, 0x6Fu, 0x00u, 0x64u, 0x00u, 0x65u, 0x00u, 0x73u, 0x00u, 0x00u, 0x00u, 0x08u, 0x00u, 0x00u,
         0x00u, 0x00u, 0x00u,
       ),
-    matcher = ::MapMatcher
     )
 }

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/IrcUserSerializerTest.kt

@@ -8,12 +8,9 @@
  */
 package de.justjanne.libquassel.protocol.serializers.quassel
 
-import de.justjanne.libquassel.protocol.models.ids.NetworkId
+import de.justjanne.libquassel.protocol.models.network.IrcUserDto
 import de.justjanne.libquassel.protocol.models.types.QuasselType
-import de.justjanne.libquassel.protocol.syncables.common.IrcUser
-import de.justjanne.libquassel.protocol.syncables.state.IrcUserState
 import de.justjanne.libquassel.protocol.testutil.byteBufferOf
-import de.justjanne.libquassel.protocol.testutil.matchers.MapMatcher
 import de.justjanne.libquassel.protocol.testutil.primitiveSerializerTest
 import de.justjanne.libquassel.protocol.variant.QVariantMap
 import org.junit.jupiter.api.Assertions.assertEquals
@@ -26,33 +23,19 @@ class IrcUserSerializerTest {
   fun testIsRegistered() {
     assertEquals(
       IrcUserSerializer,
-      QuasselType.IrcUser.serializer<QVariantMap>(),
+      QuasselType.IrcUser.serializer<IrcUserDto>(),
     )
   }
 
   @Test
-  fun testEmptyMap() = primitiveSerializerTest(
+  fun testNormal() =
+    primitiveSerializerTest(
       IrcUserSerializer,
-    emptyMap(),
-    byteBufferOf(
-      // no elements
-      0x00u, 0x00u, 0x00u, 0x00u,
-    ),
-    featureSets = emptyList(),
-    serializeFeatureSet = null
-  )
-
-  @Test
-  fun testNormal() = primitiveSerializerTest(
-    IrcUserSerializer,
-    IrcUser(
-      state = IrcUserState(
-        network = NetworkId(4),
+      IrcUserDto(
         nick = "AzureDiamond",
         user = "~azure",
-        host = "127.0.0.1"
-      )
-    ).toVariantMap(),
+        host = "127.0.0.1",
+      ),
       byteBufferOf(
         0x00u, 0x00u, 0x00u, 0x12u, 0x00u, 0x00u, 0x00u, 0x08u, 0x00u, 0x6Eu, 0x00u, 0x69u, 0x00u, 0x63u, 0x00u, 0x6Bu,
         0x00u, 0x00u, 0x00u, 0x0Au, 0x00u, 0x00u, 0x00u, 0x00u, 0x18u, 0x00u, 0x41u, 0x00u, 0x7Au, 0x00u, 0x75u, 0x00u,
@@ -95,6 +78,5 @@ class IrcUserSerializerTest {
         0x00u, 0x6Fu, 0x00u, 0x64u, 0x00u, 0x65u, 0x00u, 0x73u, 0x00u, 0x00u, 0x00u, 0x0Au, 0x00u, 0x00u, 0x00u, 0x00u,
         0x00u,
       ),
-    matcher = ::MapMatcher
     )
 }

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/MessageSerializerTest.kt

@@ -39,7 +39,8 @@ class MessageSerializerTest {
   }
 
   @Test
-  fun testEmpty() = primitiveSerializerTest(
+  fun testEmpty() =
+    primitiveSerializerTest(
       MessageSerializer,
       Message(
         MsgId(-1),
@@ -51,13 +52,13 @@ class MessageSerializerTest {
           NetworkId(-1),
           BufferType.none(),
           -1,
-        null
+          null,
         ),
         "",
         "",
         "",
         "",
-      ""
+        "",
       ),
       byteBufferOf(
         // MsgId
@@ -90,11 +91,12 @@ class MessageSerializerTest {
         0xFFu, 0xFFu, 0xFFu, 0xFFu,
       ),
       deserializeFeatureSet = FeatureSet.all(),
-    serializeFeatureSet = null
+      serializeFeatureSet = null,
     )
 
   @Test
-  fun testBaseCase() = primitiveSerializerTest(
+  fun testBaseCase() =
+    primitiveSerializerTest(
       MessageSerializer,
       Message(
         MsgId(-1),
@@ -106,13 +108,13 @@ class MessageSerializerTest {
           NetworkId(-1),
           BufferType.none(),
           -1,
-        ""
+          "",
         ),
         "",
         "",
         "",
         "",
-      ""
+        "",
       ),
       byteBufferOf(
         -1,
@@ -153,14 +155,15 @@ class MessageSerializerTest {
         0,
         0,
         0,
-      0
+        0,
       ),
       deserializeFeatureSet = FeatureSet.none(),
-    serializeFeatureSet = FeatureSet.none()
+      serializeFeatureSet = FeatureSet.none(),
     )
 
   @Test
-  fun testNormal() = primitiveSerializerTest(
+  fun testNormal() =
+    primitiveSerializerTest(
       MessageSerializer,
       Message(
         MsgId(Int.MAX_VALUE.toLong()),
@@ -172,13 +175,13 @@ class MessageSerializerTest {
           NetworkId.MAX_VALUE,
           BufferType.validValues(),
           Int.MAX_VALUE,
-        "äẞ\u0000\uFFFF"
+          "äẞ\u0000\uFFFF",
         ),
         "äẞ\u0000\uFFFF",
         "",
         "",
         "",
-      "äẞ\u0000\uFFFF"
+        "äẞ\u0000\uFFFF",
       ),
       byteBufferOf(
         127,
@@ -246,14 +249,15 @@ class MessageSerializerTest {
         0,
         -17,
         -65,
-      -65
+        -65,
       ),
       deserializeFeatureSet = FeatureSet.none(),
-    serializeFeatureSet = FeatureSet.none()
+      serializeFeatureSet = FeatureSet.none(),
     )
 
   @Test
-  fun testExtreme() = primitiveSerializerTest(
+  fun testExtreme() =
+    primitiveSerializerTest(
       MessageSerializer,
       Message(
         MsgId.MAX_VALUE,
@@ -265,13 +269,13 @@ class MessageSerializerTest {
           NetworkId.MAX_VALUE,
           BufferType.validValues(),
           Int.MAX_VALUE,
-        "äẞ\u0000\uFFFF"
+          "äẞ\u0000\uFFFF",
         ),
         "äẞ\u0000\uFFFF",
         "äẞ\u0000\uFFFF",
         "äẞ\u0000\uFFFF",
         "äẞ\u0000\uFFFF",
-      "äẞ\u0000\uFFFF"
+        "äẞ\u0000\uFFFF",
       ),
       byteBufferOf(
         0x7Fu,
@@ -386,10 +390,10 @@ class MessageSerializerTest {
         0x00u,
         0xEFu,
         0xBFu,
-      0xBFu
+        0xBFu,
       ),
       featureSets = listOf(FeatureSet.all()),
       deserializeFeatureSet = FeatureSet.all(),
-    serializeFeatureSet = FeatureSet.all()
+      serializeFeatureSet = FeatureSet.all(),
     )
 }

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/MsgIdSerializerTest.kt

@@ -28,34 +28,38 @@ class MsgIdSerializerTest {
   }
 
   @Test
-  fun testZero() = primitiveSerializerTest(
+  fun testZero() =
+    primitiveSerializerTest(
       MsgIdSerializer,
       MsgId(0),
       byteBufferOf(0, 0, 0, 0, 0, 0, 0, 0),
-    featureSets = listOf(FeatureSet.all())
+      featureSets = listOf(FeatureSet.all()),
     )
 
   @Test
-  fun testMinimal() = primitiveSerializerTest(
+  fun testMinimal() =
+    primitiveSerializerTest(
       MsgIdSerializer,
       MsgId.MIN_VALUE,
       byteBufferOf(-128, 0, 0, 0, 0, 0, 0, 0),
-    featureSets = listOf(FeatureSet.all())
+      featureSets = listOf(FeatureSet.all()),
     )
 
   @Test
-  fun testMaximal() = primitiveSerializerTest(
+  fun testMaximal() =
+    primitiveSerializerTest(
       MsgIdSerializer,
       MsgId.MAX_VALUE,
       byteBufferOf(127, -1, -1, -1, -1, -1, -1, -1),
-    featureSets = listOf(FeatureSet.all())
+      featureSets = listOf(FeatureSet.all()),
     )
 
   @Test
-  fun testAllOnes() = primitiveSerializerTest(
+  fun testAllOnes() =
+    primitiveSerializerTest(
       MsgIdSerializer,
       MsgId(0.inv()),
       byteBufferOf(-1, -1, -1, -1, -1, -1, -1, -1),
-    featureSets = listOf(FeatureSet.all())
+      featureSets = listOf(FeatureSet.all()),
     )
 }

libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/serializers/quassel/NetworkIdSerializerTest.kt

@@ -27,30 +27,34 @@ class NetworkIdSerializerTest {
   }
 
   @Test
-  fun testZero() = primitiveSerializerTest(
+  fun testZero() =
+    primitiveSerializerTest(
       NetworkIdSerializer,
       NetworkId(0),
-    byteBufferOf(0, 0, 0, 0)
+      byteBufferOf(0, 0, 0, 0),
     )
 
   @Test
-  fun testMinimal() = primitiveSerializerTest(
+  fun testMinimal() =
+    primitiveSerializerTest(
       NetworkIdSerializer,
       NetworkId.MIN_VALUE,
-    byteBufferOf(-128, 0, 0, 0)
+      byteBufferOf(-128, 0, 0, 0),
     )
 
   @Test
-  fun testMaximal() = primitiveSerializerTest(
+  fun testMaximal() =
+    primitiveSerializerTest(
       NetworkIdSerializer,
       NetworkId.MAX_VALUE,
-    byteBufferOf(127, -1, -1, -1)
+      byteBufferOf(127, -1, -1, -1),
     )
 
   @Test
-  fun testAllOnes() = primitiveSerializerTest(
+  fun testAllOnes() =
+    primitiveSerializerTest(
       NetworkIdSerializer,
       NetworkId(0.inv()),
-    byteBufferOf(-1, -1, -1, -1)
+      byteBufferOf(-1, -1, -1, -1),
     )
 }