Merge remote-tracking branch 'FasterXML/2.x' into 3.x

Author: k163377

src/test/kotlin/tools/jackson/module/kotlin/test/UnsignedNumbersOnKeyTest.kt

@@ -4,6 +4,7 @@ import tools.jackson.core.exc.InputCoercionException
 import tools.jackson.module.kotlin.jacksonObjectMapper
 import tools.jackson.module.kotlin.readValue
 import org.junit.jupiter.api.Assertions.assertThrows
+import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.Test
 import java.math.BigInteger
 import kotlin.test.assertEquals
@@ -13,7 +14,8 @@ internal class UnsignedNumbersOnKeyTest {
         val MAPPER = jacksonObjectMapper()
     }
 
-    class ForUByte {
+    @Nested
+    inner class ForUByte {
         private fun makeSrc(v: Int): String = MAPPER.writeValueAsString(mapOf(v to 0))
 
         @Test
@@ -37,7 +39,8 @@ internal class UnsignedNumbersOnKeyTest {
         }
     }
 
-    class ForUShort {
+    @Nested
+    inner class ForUShort {
         private fun makeSrc(v: Int): String = MAPPER.writeValueAsString(mapOf(v to 0))
 
         @Test
@@ -61,7 +64,8 @@ internal class UnsignedNumbersOnKeyTest {
         }
     }
 
-    class ForUInt {
+    @Nested
+    inner class ForUInt {
         private fun makeSrc(v: Long): String = MAPPER.writeValueAsString(mapOf(v to 0))
 
         @Test
@@ -85,7 +89,8 @@ internal class UnsignedNumbersOnKeyTest {
         }
     }
 
-    class ForULong {
+    @Nested
+    inner class ForULong {
         private fun makeSrc(v: BigInteger): String = MAPPER.writeValueAsString(mapOf(v to 0))
 
         @Test

src/test/kotlin/tools/jackson/module/kotlin/test/github/Github101.kt

@@ -10,12 +10,14 @@ import kotlin.test.assertEquals
 class TestGithub101_JacksonInjectTest {
     @Test
     fun `JacksonInject-annotated parameters are populated when constructing Kotlin data classes`() {
-        val mapper = jacksonObjectMapper()
         val contextualValue = UUID.randomUUID()
-        assertEquals(SomeDatum("test", contextualValue),
-                mapper.readerFor(SomeDatum::class.java)
-                        .with(InjectableValues.Std(mapOf("context" to contextualValue)))
-                        .readValue("""{ "value": "test" }"""))
+        val reader = jacksonObjectMapper()
+            .readerFor(SomeDatum::class.java)
+            .with(InjectableValues.Std(mapOf("context" to contextualValue)))
+        assertEquals(
+            SomeDatum("test", contextualValue),
+            reader.readValue("""{ "value": "test" }""")
+        )
     }
 
     data class SomeDatum(val value: String, @JacksonInject("context") val contextualValue: UUID)

src/test/kotlin/tools/jackson/module/kotlin/test/github/Github148.kt

@@ -1,5 +1,6 @@
 package tools.jackson.module.kotlin.test.github
 
+import org.junit.jupiter.api.Nested
 import tools.jackson.module.kotlin.jacksonObjectMapper
 import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
@@ -32,7 +33,8 @@ class TestGithub148 {
         val type: IncorrectType
     )
 
-    class DemoApplicationTests {
+    @Nested
+    inner class DemoApplicationTests {
         val objectMapper = jacksonObjectMapper()
 
         @Test
@@ -45,4 +47,4 @@ class TestGithub148 {
             assertEquals("{\"name\":\"incorrent\",\"type\":\"TYPEA\"}", objectMapper.writeValueAsString(IncorrentBean("incorrent", IncorrectType.TYPEA)))
         }
     }
-}
+}

src/test/kotlin/tools/jackson/module/kotlin/test/github/Github168.kt

@@ -18,7 +18,7 @@ class TestGithub168 {
 
     @Test
     fun testIfRequiredIsReallyRequiredWhenNullUsed() {
-        val obj = MAPPER.readValue<TestClass>("""{"foo":null,"baz":"whatever"}""")
+        val obj = jacksonObjectMapper().readValue<TestClass>("""{"foo":null,"baz":"whatever"}""")
         assertEquals("whatever", obj.baz)
     }
 
@@ -32,7 +32,7 @@ class TestGithub168 {
 
     @Test
     fun testIfRequiredIsReallyRequiredWhenValuePresent() {
-        val obj = MAPPER.readValue<TestClass>("""{"foo":"yay!","baz":"whatever"}""")
+        val obj = jacksonObjectMapper().readValue<TestClass>("""{"foo":"yay!","baz":"whatever"}""")
         assertNotNull(obj)
         assertEquals("whatever", obj.baz)
     }

src/test/kotlin/tools/jackson/module/kotlin/test/github/Github722.kt

@@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonProperty
 import tools.jackson.databind.InjectableValues
 import tools.jackson.databind.ObjectMapper
 import tools.jackson.module.kotlin.jacksonObjectMapper
-import kotlin.math.exp
 import org.junit.jupiter.api.Test
 import kotlin.test.assertEquals
 
@@ -38,11 +37,13 @@ class Github722 {
     @Test
     fun failing() {
         // The kotlin mapper uses the Kotlin default value instead of the Inject value.
-        val kotlinMapper = jacksonObjectMapper()
-        val result = kotlinMapper.readerFor(FailingDto::class.java)
+        val reader = jacksonObjectMapper()
+            .readerFor(FailingDto::class.java)
             .with(InjectableValues.Std(injectValues))
-            .readValue<FailingDto>("{}")
+        val result = reader.readValue<FailingDto>("{}")
 
+        // fixed
+        // assertNotEquals(result, expected, "GitHubXXX fixed.")
         assertEquals(expected, result)
     }
 
@@ -55,10 +56,10 @@ class Github722 {
 
     @Test
     fun withoutDefaultValue() {
-        val kotlinMapper = jacksonObjectMapper()
-        val result = kotlinMapper.readerFor(WithoutDefaultValue::class.java)
+        val reader = jacksonObjectMapper()
+            .readerFor(WithoutDefaultValue::class.java)
             .with(InjectableValues.Std(injectValues))
-            .readValue<WithoutDefaultValue>("{}")
+        val result = reader.readValue<WithoutDefaultValue>("{}")
 
         // If there is no default value, the problem does not occur.
         assertEquals(WithoutDefaultValue(1, 2), result)