Merge branch 'test-for-kotlin-instantiators' into fix-findValueInstantiator

Author: dinomite

pom.xml

@@ -8,12 +8,12 @@
     <parent>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-base</artifactId>
-        <version>2.14.0-SNAPSHOT</version>
+        <version>2.13.1-SNAPSHOT</version>
     </parent>
     <groupId>com.fasterxml.jackson.module</groupId>
     <artifactId>jackson-module-kotlin</artifactId>
     <name>jackson-module-kotlin</name>
-    <version>2.14.0-SNAPSHOT</version>
+    <version>2.13.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <description>Add-on module for Jackson (https://github.com/FasterXML/jackson/) to support
         Kotlin language, specifically introspection of method/constructor parameter names,

src/test/kotlin/com/fasterxml/jackson/module/kotlin/KotlinInstantiatorsTest.kt

@@ -0,0 +1,65 @@
+package com.fasterxml.jackson.module.kotlin
+
+import com.fasterxml.jackson.databind.deser.std.StdValueInstantiator
+import org.junit.Assert.*
+import org.junit.Test
+
+class KotlinInstantiatorsTest {
+    private val mapper = jacksonObjectMapper()
+    private val deserConfig = mapper.deserializationConfig
+
+    private val kotlinInstantiators = KotlinInstantiators(
+        ReflectionCache(10),
+        nullToEmptyCollection = false,
+        nullToEmptyMap = false,
+        nullIsSameAsDefault = false,
+        strictNullChecks = false
+    )
+
+    @Test
+    fun `Provides default instantiator for Java class`() {
+        val javaType = mapper.constructType(String::class.java)
+        val defaultInstantiator = StdValueInstantiator(deserConfig, javaType)
+        val instantiator = kotlinInstantiators.findValueInstantiator(
+            deserConfig,
+            deserConfig.introspect(javaType),
+            defaultInstantiator
+        )
+
+        assertEquals(defaultInstantiator, instantiator)
+    }
+
+    @Test
+    fun `Provides KotlinValueInstantiator for Kotlin class`() {
+        class TestClass
+
+        val javaType = mapper.constructType(TestClass::class.java)
+        val instantiator = kotlinInstantiators.findValueInstantiator(
+            deserConfig,
+            deserConfig.introspect(javaType),
+            StdValueInstantiator(deserConfig, javaType)
+        )
+
+        assertTrue(instantiator is StdValueInstantiator)
+        assertTrue(instantiator::class == KotlinValueInstantiator::class)
+    }
+
+    @Test
+    fun `Throws for Kotlin class when default instantiator isn't StdValueInstantiator`() {
+        class TestClass
+        class DefaultClass
+
+        val subClassInstantiator = object : StdValueInstantiator(
+            deserConfig,
+            mapper.constructType(DefaultClass::class.java)
+        ) {}
+
+        assertThrows(IllegalStateException::class.java) {
+            kotlinInstantiators.findValueInstantiator(
+                deserConfig,
+                deserConfig.introspect(mapper.constructType(TestClass::class.java)),
+                subClassInstantiator
+            )
+        }
+    }
+}