Tests for generic descriptors

Kotlin · Sep 27, 2018 · b24f0fb · b24f0fb
1 parent 17c6f37
commit b24f0fb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/runtime/common/src/main/kotlin/kotlinx/serialization/internal/SerialClassDescImpl.kt b/runtime/common/src/main/kotlin/kotlinx/serialization/internal/SerialClassDescImpl.kt
@@ -97,7 +97,7 @@ open class SerialClassDescImpl @JvmOverloads constructor(
  if (other !is SerialClassDescImpl) return false
 
  if (name != other.name) return false
- if (descriptors != other.descriptors) return false
+ if (elementDescriptors() != other.elementDescriptors()) return false
 
  return true
  }

diff --git a/runtime/common/src/test/kotlin/kotlinx/serialization/features/SchemaTest.kt b/runtime/common/src/test/kotlin/kotlinx/serialization/features/SchemaTest.kt
@@ -38,6 +38,11 @@ data class Data1(@Optional val l: List<Int> = emptyList(), val s: String) {
 @Serializable
 data class Data2(@Optional val l: List<Int> = emptyList(), val s: String)
 
+
+@Serializable data class Box<T>(val boxed: T)
+
+@Serializable data class BoxHolder(val stringBox: Box<String>, val intBox: Box<Int>)
+
 @Serializable
 data class DataZoo(
  @Transient val invisible: String = "",
@@ -105,4 +110,14 @@ class SchemaTest {
 
  assertEquals(desc1.elementDescriptors(), desc2.elementDescriptors())
  }
+
+ @Test
+ fun genericDescriptors() {
+ val boxes = BoxHolder.serializer().descriptor.elementDescriptors()
+ assertTrue(boxes[0].getElementDescriptor(0) is StringDescriptor)
+ assertTrue(boxes[1].getElementDescriptor(0) is IntDescriptor)
+ assertNotEquals(boxes[0], boxes[1])
+ val intBox = Box.serializer(IntSerializer).descriptor
+ assertEquals(intBox, boxes[1])
+ }
 }