From e53fee52237b382965d30cd12072257b041ecb6e Mon Sep 17 00:00:00 2001 From: Janne Mareike Koschinski <janne@kuschku.de> Date: Mon, 15 Feb 2021 10:52:31 +0100 Subject: [PATCH] Further corrections of broken code --- .../libquassel/protocol/testutil/testQtSerializerVariant.kt | 6 +++--- .../protocol/testutil/testQuasselSerializerVariant.kt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQtSerializerVariant.kt b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQtSerializerVariant.kt index 81df45a..cba0242 100644 --- a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQtSerializerVariant.kt +++ b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQtSerializerVariant.kt @@ -34,14 +34,14 @@ fun <T> testQtSerializerVariant( matcher: Matcher<in T>? = null ) { val buffer = ChainedByteBuffer(limit = 16384) - QVariantSerializer.serialize(buffer, QVariant.of(data, serializer), featureSet) + QVariantSerializer.serialize(buffer, QVariant.Typed(data, serializer), featureSet) val result = buffer.toBuffer() val after = QVariantSerializer.deserialize(result, featureSet) assertEquals(0, result.remaining()) if (matcher != null) { @Suppress("UNCHECKED_CAST") - assertThat(after.value() as T, matcher) + assertThat(after.data as T, matcher) } else { - assertEquals(data, after.value()) + assertEquals(data, after.data) } } diff --git a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQuasselSerializerVariant.kt b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQuasselSerializerVariant.kt index 7f06649..3d3a7db 100644 --- a/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQuasselSerializerVariant.kt +++ b/libquassel-protocol/src/test/kotlin/de/justjanne/libquassel/protocol/testutil/testQuasselSerializerVariant.kt @@ -34,14 +34,14 @@ fun <T> testQuasselSerializerVariant( matcher: Matcher<in T>? = null ) { val buffer = ChainedByteBuffer(limit = 16384) - QVariantSerializer.serialize(buffer, QVariant.of(data, serializer), featureSet) + QVariantSerializer.serialize(buffer, QVariant.Custom(data, serializer), featureSet) val result = buffer.toBuffer() val after = QVariantSerializer.deserialize(result, featureSet) assertEquals(0, result.remaining()) if (matcher != null) { @Suppress("UNCHECKED_CAST") - assertThat(after.value() as T, matcher) + assertThat(after.data as T, matcher) } else { - assertEquals(data, after.value()) + assertEquals(data, after.data) } } -- GitLab