Merge pull request #955 from k163377/800

Add test cases for #800

Author: k163377

pom.xml

@@ -122,6 +122,11 @@
             <artifactId>jackson-dataformat-xml</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-csv</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <!-- needed for kotlin.time.Duration converter test -->
             <groupId>com.fasterxml.jackson.datatype</groupId>

src/test/kotlin/com/fasterxml/jackson/module/kotlin/test/github/GitHub800.kt

@@ -0,0 +1,103 @@
+package com.fasterxml.jackson.module.kotlin.test.github
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import com.fasterxml.jackson.core.JsonParser
+import com.fasterxml.jackson.databind.DeserializationContext
+import com.fasterxml.jackson.databind.JsonDeserializer
+import com.fasterxml.jackson.databind.ObjectReader
+import com.fasterxml.jackson.databind.module.SimpleModule
+import com.fasterxml.jackson.dataformat.csv.CsvMapper
+import com.fasterxml.jackson.dataformat.csv.CsvParser
+import com.fasterxml.jackson.dataformat.csv.CsvSchema
+import com.fasterxml.jackson.module.kotlin.kotlinModule
+import org.junit.jupiter.api.Test
+import kotlin.test.assertEquals
+
+class GitHub800 {
+    val CSV = """
+        BAR_HEADER,BAZ_HEADER
+        bar1,baz1
+    """.trimIndent()
+
+    val MAPPER =
+        CsvMapper
+            .builder()
+            .addModule(
+                SimpleModule()
+                    .addDeserializer(BazValueClass::class.java, object : JsonDeserializer<BazValueClass>() {
+                        override fun deserialize(p: JsonParser, ctxt: DeserializationContext) = BazValueClass(p.valueAsString)
+                    })
+                    .addDeserializer(BazDataClass::class.java, object : JsonDeserializer<BazDataClass>() {
+                        override fun deserialize(p: JsonParser, ctxt: DeserializationContext) = BazDataClass(p.valueAsString)
+                    })
+            )
+            .addModule(kotlinModule())
+            .build()
+
+    inline fun <reified T> createSchema(columnReordering: Boolean): CsvSchema =
+        MAPPER
+            .schemaFor(T::class.java)
+            .withColumnReordering(columnReordering)
+            .withHeader()
+
+    inline fun <reified T> createReader(columnReordering: Boolean): ObjectReader =
+        MAPPER
+            .readerFor(T::class.java)
+            .with(CsvParser.Feature.WRAP_AS_ARRAY)
+            .with(createSchema<T>(columnReordering))
+
+    data class FooWithValueClass(
+        @field:JsonProperty("BAR_HEADER")
+        val bar: String?,
+        @field:JsonProperty("BAZ_HEADER")
+        val baz: BazValueClass?,
+    )
+
+    data class FooWithDataClass(
+        @field:JsonProperty("BAR_HEADER")
+        val bar: String?,
+        @field:JsonProperty("BAZ_HEADER")
+        val baz: BazDataClass?,
+    )
+
+    @JvmInline
+    value class BazValueClass(val value: String)
+
+    data class BazDataClass(val value: String)
+
+    @Test
+    fun valueClassWithoutColumnReordering() {
+        val actual = createReader<FooWithValueClass>(false)
+            .readValues<FooWithValueClass>(CSV)
+            .readAll()
+
+        assertEquals(listOf(FooWithValueClass("bar1", BazValueClass("baz1"))), actual)
+    }
+
+    @Test
+    fun valueClassWithColumnReordering() {
+        val actual = createReader<FooWithValueClass>(true)
+            .readValues<FooWithValueClass>(CSV)
+            .readAll()
+
+        assertEquals(listOf(FooWithValueClass("bar1", BazValueClass("baz1"))), actual)
+    }
+
+    @Test
+    fun dataClassWithoutColumnReordering() {
+        val actual = createReader<FooWithDataClass>(false)
+            .readValues<FooWithDataClass>(CSV)
+            .readAll()
+
+        assertEquals(listOf(FooWithDataClass("bar1", BazDataClass("baz1"))), actual)
+    }
+
+    @Test
+    fun dataClassWithColumnReordering() {
+        val actual = createReader<FooWithDataClass>(true)
+            .readValues<FooWithDataClass>(CSV)
+            .readAll()
+
+        assertEquals(listOf(FooWithDataClass("bar1", BazDataClass("baz1"))), actual)
+    }
+}