Additional testing

protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/QVariantMapSerializerTest.kt

@@ -18,14 +18,26 @@
  */
 package de.kuschku.libquassel.protocol.serializers.primitive
 
+import de.kuschku.libquassel.protocol.serializers.QtSerializers
 import de.kuschku.libquassel.protocol.testutil.byteBufferOf
 import de.kuschku.libquassel.protocol.testutil.matchers.MapMatcher
 import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
+import de.kuschku.libquassel.protocol.variant.QVariantMap
 import de.kuschku.libquassel.protocol.variant.QtType
 import de.kuschku.libquassel.protocol.variant.qVariant
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 class QVariantMapSerializerTest {
+  @Test
+  fun testIsRegistered() {
+    assertEquals(
+      QVariantMapSerializer,
+      QtSerializers.find<QVariantMap>(QtType.QVariantMap),
+    )
+  }
+
   @Test
   fun testEmpty() = qtSerializerTest(
     QVariantMapSerializer,
@@ -50,8 +62,20 @@ class QVariantMapSerializerTest {
     mapOf(
       "" to qVariant<String?>(null, QtType.QString)
     ),
-    byteBufferOf(0x00u, 0x00u, 0x00u, 0x01u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x0Au, 0x00u, 0xFFu, 0xFFu, 0xFFu, 0xFFu),
-    ::MapMatcher
+    byteBufferOf(
+      // length
+      0x00u, 0x00u, 0x00u, 0x01u,
+      // length of key
+      0xFFu, 0xFFu, 0xFFu, 0xFFu,
+      // type of value
+      0x00u, 0x00u, 0x00u, 0x0Au,
+      // isNull of value
+      0x00u,
+      // length of value
+      0xFFu, 0xFFu, 0xFFu, 0xFFu
+    ),
+    ::MapMatcher,
+    serializeFeatureSet = null
   )
 }
 

protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/QVariantSerializerTest.kt

@@ -19,12 +19,24 @@
 package de.kuschku.libquassel.protocol.serializers.primitive
 
 import de.kuschku.libquassel.protocol.serializers.NoSerializerForTypeException
+import de.kuschku.libquassel.protocol.serializers.QtSerializers
 import de.kuschku.libquassel.protocol.testutil.byteBufferOf
 import de.kuschku.libquassel.protocol.testutil.deserialize
+import de.kuschku.libquassel.protocol.variant.QVariant_
+import de.kuschku.libquassel.protocol.variant.QtType
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 
 class QVariantSerializerTest {
+  @Test
+  fun testIsRegistered() {
+    assertEquals(
+      QVariantSerializer,
+      QtSerializers.find<QVariant_>(QtType.QVariant),
+    )
+  }
+
   @Test
   fun testUnregisteredQtType() {
     assertThrows<NoSerializerForTypeException> {

protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/ShortSerializerTest.kt

@@ -18,12 +18,24 @@
  */
 package de.kuschku.libquassel.protocol.serializers.primitive
 
+import de.kuschku.libquassel.protocol.serializers.QtSerializers
 import de.kuschku.libquassel.protocol.testutil.byteBufferOf
 import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
+import de.kuschku.libquassel.protocol.variant.QtType
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 import kotlin.experimental.inv
 
 class ShortSerializerTest {
+  @Test
+  fun testIsRegistered() {
+    assertEquals(
+      ShortSerializer,
+      QtSerializers.find<Short>(QtType.Short),
+    )
+  }
+
   @Test
   fun testZero() = qtSerializerTest(
     ShortSerializer,

protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/StringSerializerTest.kt

@@ -18,17 +18,27 @@
  */
 package de.kuschku.libquassel.protocol.serializers.primitive
 
+import de.kuschku.libquassel.protocol.serializers.QtSerializers
 import de.kuschku.libquassel.protocol.testutil.byteBufferOf
 import de.kuschku.libquassel.protocol.testutil.deserialize
 import de.kuschku.libquassel.protocol.testutil.matchers.BomMatcherString
 import de.kuschku.libquassel.protocol.testutil.matchers.ByteBufferMatcher
 import de.kuschku.libquassel.protocol.testutil.testQtSerializerDirect
 import de.kuschku.libquassel.protocol.testutil.testQtSerializerVariant
+import de.kuschku.libquassel.protocol.variant.QtType
 import org.hamcrest.MatcherAssert.assertThat
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 class StringSerializerTest {
+  @Test
+  fun testIsRegistered() {
+    assertEquals(
+      StringSerializerUtf16,
+      QtSerializers.find<String>(QtType.QString),
+    )
+  }
+
   @Test
   fun testBigListOfNaughtyStrings() {
     this::class.java.getResourceAsStream("/blns.txt")!!.bufferedReader(Charsets.UTF_8).forEachLine {

protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/UByteSerializerTest.kt

@@ -18,11 +18,23 @@
  */
 package de.kuschku.libquassel.protocol.serializers.primitive
 
+import de.kuschku.libquassel.protocol.serializers.QtSerializers
 import de.kuschku.libquassel.protocol.testutil.byteBufferOf
 import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
+import de.kuschku.libquassel.protocol.variant.QtType
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 class UByteSerializerTest {
+  @Test
+  fun testIsRegistered() {
+    assertEquals(
+      UByteSerializer,
+      QtSerializers.find<UByte>(QtType.UChar),
+    )
+  }
+
   @Test
   fun testZero() = qtSerializerTest(
     UByteSerializer,

protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/UIntSerializerTest.kt

@@ -18,11 +18,23 @@
  */
 package de.kuschku.libquassel.protocol.serializers.primitive
 
+import de.kuschku.libquassel.protocol.serializers.QtSerializers
 import de.kuschku.libquassel.protocol.testutil.byteBufferOf
 import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
+import de.kuschku.libquassel.protocol.variant.QtType
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 class UIntSerializerTest {
+  @Test
+  fun testIsRegistered() {
+    assertEquals(
+      UIntSerializer,
+      QtSerializers.find<UInt>(QtType.UInt),
+    )
+  }
+
   @Test
   fun testZero() = qtSerializerTest(
     UIntSerializer,

protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/ULongSerializerTest.kt

@@ -18,11 +18,23 @@
  */
 package de.kuschku.libquassel.protocol.serializers.primitive
 
+import de.kuschku.libquassel.protocol.serializers.QtSerializers
 import de.kuschku.libquassel.protocol.testutil.byteBufferOf
 import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
+import de.kuschku.libquassel.protocol.variant.QtType
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 class ULongSerializerTest {
+  @Test
+  fun testIsRegistered() {
+    assertEquals(
+      ULongSerializer,
+      QtSerializers.find<ULong>(QtType.ULong),
+    )
+  }
+
   @Test
   fun testZero() = qtSerializerTest(
     ULongSerializer,

protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/UShortSerializerTest.kt

@@ -18,11 +18,23 @@
  */
 package de.kuschku.libquassel.protocol.serializers.primitive
 
+import de.kuschku.libquassel.protocol.serializers.QtSerializers
 import de.kuschku.libquassel.protocol.testutil.byteBufferOf
 import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
+import de.kuschku.libquassel.protocol.variant.QtType
+import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test
 
 class UShortSerializerTest {
+  @Test
+  fun testIsRegistered() {
+    assertEquals(
+      UShortSerializer,
+      QtSerializers.find<UShort>(QtType.UShort),
+    )
+  }
+
   @Test
   fun testZero() = qtSerializerTest(
     UShortSerializer,

protocol/src/test/kotlin/de/kuschku/libquassel/protocol/serializers/primitive/VoidSerializerTest.kt

+/*
+ * Quasseldroid - Quassel client for Android
+ *
+ * Copyright (c) 2020 Janne Mareike Koschinski
+ * Copyright (c) 2020 The Quassel Project
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package de.kuschku.libquassel.protocol.serializers.primitive
+
+import de.kuschku.libquassel.protocol.serializers.QtSerializers
+import de.kuschku.libquassel.protocol.testutil.byteBufferOf
+import de.kuschku.libquassel.protocol.testutil.qtSerializerTest
+import de.kuschku.libquassel.protocol.variant.QtType
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Test
+
+class VoidSerializerTest {
+  @Test
+  fun testIsRegistered() {
+    assertEquals(
+      VoidSerializer,
+      QtSerializers.find<Unit>(QtType.Void),
+    )
+  }
+
+  @Test
+  fun test() = qtSerializerTest(
+    VoidSerializer,
+    Unit,
+    byteBufferOf()
+  )
+}

protocol/src/test/kotlin/de/kuschku/libquassel/protocol/testutil/byteBufferOf.kt

@@ -20,5 +20,16 @@ package de.kuschku.libquassel.protocol.testutil
 
 import java.nio.ByteBuffer
 
-inline fun byteBufferOf(vararg elements: Byte) = ByteBuffer.wrap(byteArrayOf(*elements))
-inline fun byteBufferOf(vararg elements: UByte) = ByteBuffer.wrap(ubyteArrayOf(*elements).toByteArray())
+@Suppress("NOTHING_TO_INLINE")
+inline fun byteBufferOf(
+  vararg elements: Byte
+): ByteBuffer = ByteBuffer.wrap(byteArrayOf(*elements))
+
+@Suppress("NOTHING_TO_INLINE")
+inline fun byteBufferOf(
+  vararg elements: UByte
+): ByteBuffer = ByteBuffer.wrap(ubyteArrayOf(*elements).toByteArray())
+
+@Suppress("NOTHING_TO_INLINE")
+inline fun byteBufferOf(): ByteBuffer =
+  ByteBuffer.allocateDirect(0)

protocol/src/test/kotlin/de/kuschku/libquassel/protocol/variant/QVariantTest.kt

@@ -20,6 +20,7 @@
 package de.kuschku.libquassel.protocol.variant
 
 import de.kuschku.libquassel.protocol.testutil.byteBufferOf
+import de.kuschku.libquassel.protocol.types.BufferId
 import de.kuschku.libquassel.protocol.variant.QtType
 import de.kuschku.libquassel.protocol.variant.qVariant
 import org.junit.jupiter.api.Assertions.*
@@ -42,5 +43,12 @@ class QVariantTest {
         QtType.QString
       ).toString()
     )
+    assertEquals(
+      "QVariant(BufferIdSerializer, BufferId(-1))",
+      qVariant(
+        BufferId(-1),
+        QuasselType.BufferId
+      ).toString()
+    )
   }
 }