Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Failing sealed class list encoding / decoding tests #365

Merged
merged 9 commits into from
May 24, 2023
Merged

Failing sealed class list encoding / decoding tests #365

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d6a61f1
adds failing sealed class list encoding / decoding
brahyam Apr 7, 2023
f451cca
Merge branch 'GitLiveApp:master' into master
brahyam Apr 8, 2023
91ec63b
Merge branch 'master' into master
Reedyuk Apr 8, 2023
53ce257
Merge branch 'master' into master
Reedyuk Apr 9, 2023
2811137
fixes android & ios decoders
brahyam Apr 8, 2023
edb997a
fixes js decoders
brahyam Apr 9, 2023
60a4acd
uses kotlin assert instead of native
brahyam Apr 12, 2023
545b17a
Merge branch 'master' into master
brahyam Apr 12, 2023
33be9ed
splits encode and decode tests
brahyam Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion firebase-common/src/androidMain/kotlin/dev/gitlive/firebase/_decoders.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,14 @@ import kotlinx.serialization.descriptors.StructureKind

actual fun FirebaseDecoder.structureDecoder(descriptor: SerialDescriptor): CompositeDecoder = when(descriptor.kind) {
StructureKind.CLASS, StructureKind.OBJECT, PolymorphicKind.SEALED -> (value as Map<*, *>).let { map ->
FirebaseClassDecoder(map.size, { map.containsKey(it) }) { desc, index -> map[desc.getElementName(index)] }
FirebaseClassDecoder(map.size, { map.containsKey(it) }) { desc, index ->
val elementName = desc.getElementName(index)
if (desc.kind is PolymorphicKind && elementName == "value") {
map
} else {
map[desc.getElementName(index)]
}
}
}
StructureKind.LIST -> (value as List<*>).let {
FirebaseCompositeDecoder(it.size) { _, index -> it[index] }
Expand Down
34 changes: 34 additions & 0 deletions firebase-common/src/commonTest/kotlin/dev/gitlive/firebase/EncodersTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ sealed class TestSealed {
data class ChildClass(val map: Map<String, String>, val bool: Boolean = false): TestSealed()
}

@Serializable
data class TestSealedList(val list: List<TestSealed>)

class EncodersTest {
@Test
fun encodeMap() {
Expand Down Expand Up @@ -74,4 +77,35 @@ class EncodersTest {
val decoded = decode(TestSealed.serializer(), nativeMapOf("type" to "child", "map" to nativeMapOf("key" to "value"), "bool" to true))
assertEquals(TestSealed.ChildClass(mapOf("key" to "value"), true), decoded)
}

@Test
fun encodeDecodeSealedClass() {
val target = TestData(mapOf("key" to "value"), true)
val encoded = encode<TestData>(
TestData.serializer(),
target,
shouldEncodeElementDefault = false
)
val decoded = decode<TestData>(
TestData.serializer(),
encoded
)
assertEquals(target, decoded)
}

@Test
fun encodeDecodeSealedClassList() {
val target =
TestSealedList(list = listOf(TestSealed.ChildClass(map = emptyMap(), bool = false)))
val encoded = encode<TestSealedList>(
TestSealedList.serializer(),
target,
shouldEncodeElementDefault = true
)
val decoded = decode<TestSealedList>(
TestSealedList.serializer(),
encoded
)
assertEquals(target, decoded)
}
}
9 changes: 8 additions & 1 deletion firebase-common/src/iosMain/kotlin/dev/gitlive/firebase/_decoders.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,14 @@ import kotlinx.serialization.descriptors.StructureKind

actual fun FirebaseDecoder.structureDecoder(descriptor: SerialDescriptor): CompositeDecoder = when(descriptor.kind) {
StructureKind.CLASS, StructureKind.OBJECT, PolymorphicKind.SEALED -> (value as Map<*, *>).let { map ->
FirebaseClassDecoder(map.size, { map.containsKey(it) }) { desc, index -> map[desc.getElementName(index)] }
FirebaseClassDecoder(map.size, { map.containsKey(it) }) { desc, index ->
val elementName = desc.getElementName(index)
if (desc.kind is PolymorphicKind && elementName == "value") {
map
} else {
map[desc.getElementName(index)]
}
}
}
StructureKind.LIST -> (value as List<*>).let {
FirebaseCompositeDecoder(it.size) { _, index -> it[index] }
Expand Down
9 changes: 7 additions & 2 deletions firebase-common/src/jsMain/kotlin/dev/gitlive/firebase/_decoders.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,13 @@ import kotlin.js.Json
@Suppress("UNCHECKED_CAST_TO_EXTERNAL_INTERFACE")
actual fun FirebaseDecoder.structureDecoder(descriptor: SerialDescriptor): CompositeDecoder = when(descriptor.kind) {
StructureKind.CLASS, StructureKind.OBJECT, PolymorphicKind.SEALED -> (value as Json).let { json ->
FirebaseClassDecoder(js("Object").keys(value).length as Int, { json[it] != undefined }) {
desc, index -> json[desc.getElementName(index)]
FirebaseClassDecoder(js("Object").keys(value).length as Int, { json[it] != undefined }) { desc, index ->
val elementName = desc.getElementName(index)
if (desc.kind is PolymorphicKind && elementName == "value") {
json
} else {
json[desc.getElementName(index)]
}
}
}
StructureKind.LIST -> (value as Array<*>).let {
Expand Down