partial re-enable of MergeTest (#818)

Author: pjfanning

src/test/scala-2.+/tools/jackson/module/scala/deser/MergeScala2Test.scala

@@ -0,0 +1,49 @@
+package tools.jackson.module.scala.deser
+
+import com.fasterxml.jackson.annotation.JsonMerge
+import tools.jackson.core.`type`.TypeReference
+import tools.jackson.databind.{MapperFeature, ObjectMapper, ObjectReader}
+import tools.jackson.module.scala.DefaultScalaModule
+
+import scala.collection.{Map, mutable}
+
+class MergeScala2Test extends DeserializerTest {
+
+  val module: DefaultScalaModule.type = DefaultScalaModule
+
+  // This test relies on enabling MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS
+  // which is not enabled by default in the Jackson v2 but not in Jackson v3
+  def newScalaMapper: ObjectMapper = newBuilder
+    .enable(MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS)
+    .build()
+
+
+  val firstPairMapJson = """{"one":{"first":"1"},"two":{"second":"2"},"three":{"first":"3","second":"4"}}"""
+  val secondPairMapJson = """{"two":{"first":"22"},"three":{"second":"33"}}"""
+  val secondPairMap = Map("two" -> Pair("22", null), "three" -> Pair(null, "33"))
+  val mergedPairMap = Map("one" -> Pair("1", null), "two" -> Pair("22", "2"), "three" -> Pair("3", "33"))
+
+  behavior of "The DefaultScalaModule when reading for updating"
+
+  // started failing in jackson-module-scala v3.2.0 but only for Scala 3
+  // see https://github.com/FasterXML/jackson-module-scala/issues/817
+  it should "merge only the annotated pair map" in {
+    val typeReference = new TypeReference[ClassWithMaps[Pair]]{}
+    val initial = deserialize(classJson(firstPairMapJson), typeReference)
+    val result = updateValue(newScalaMapper, initial, typeReference, classJson(secondPairMapJson))
+
+    result shouldBe ClassWithMaps(secondPairMap, mergedPairMap)
+  }
+
+  def classJson(nestedJson: String) = s"""{"field1":$nestedJson,"field2":$nestedJson}"""
+
+  private def updateValue[T](mapper: ObjectMapper, valueToUpdate: T,
+                             typeReference: TypeReference[T], src: String): T = {
+    objectReaderFor(mapper, valueToUpdate, typeReference).readValue(src)
+  }
+
+  private def objectReaderFor[T](mapper: ObjectMapper, valueToUpdate: T,
+                                 typeReference: TypeReference[T]): ObjectReader = {
+    mapper.readerForUpdating(valueToUpdate).forType(typeReference)
+  }
+}

src/test/scala/tools/jackson/module/scala/deser/MergeTest.scala

@@ -17,7 +17,7 @@ class MergeTest extends DeserializerTest {
 
   val module: DefaultScalaModule.type = DefaultScalaModule
 
-  // This test replies on enabling MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS
+  // This test relies on enabling MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS
   // which is not enabled by default in the Jackson v2 but not in Jackson v3
   def newScalaMapper: ObjectMapper = newBuilder
     .enable(MapperFeature.ALLOW_FINAL_FIELDS_AS_MUTATORS)
@@ -28,6 +28,21 @@ class MergeTest extends DeserializerTest {
     .defaultMergeable(true)
     .build()
 
+  val firstListJson = """["one","two"]"""
+  val secondListJson = """["three"]"""
+  val secondList = List("three")
+  val mergedList = List("one", "two", "three")
+
+  val firstStringMapJson = """{"one":"1","two":"2"}"""
+  val secondStringMapJson = """{"two":"22","three":"33"}"""
+  val secondStringMap = Map("two" -> "22", "three" -> "33")
+  val mergedStringMap = Map("one" -> "1", "two" -> "22", "three" -> "33")
+
+  val firstPairMapJson = """{"one":{"first":"1"},"two":{"second":"2"},"three":{"first":"3","second":"4"}}"""
+  val secondPairMapJson = """{"two":{"first":"22"},"three":{"second":"33"}}"""
+  val secondPairMap = Map("two" -> Pair("22", null), "three" -> Pair(null, "33"))
+  val mergedPairMap = Map("one" -> Pair("1", null), "two" -> Pair("22", "2"), "three" -> Pair("3", "33"))
+
   behavior of "The DefaultScalaModule when reading for updating"
 
   it should "merge both lists" in {
@@ -69,16 +84,7 @@ class MergeTest extends DeserializerTest {
 
     result shouldBe ClassWithMaps(mergedPairMap, mergedPairMap)
   }
-
-  // https://github.com/FasterXML/jackson-module-scala/issues/817
-  it should "merge only the annotated pair map" ignore {
-    val typeReference = new TypeReference[ClassWithMaps[Pair]]{}
-    val initial = deserialize(classJson(firstPairMapJson), typeReference)
-    val result = updateValue(newScalaMapper, initial, typeReference, classJson(secondPairMapJson))
-
-    result shouldBe ClassWithMaps(secondPairMap, mergedPairMap)
-  }
-
+  
   it should "merge both mutable maps" in {
     val typeReference = new TypeReference[ClassWithMutableMaps[String]]{}
     val initial = deserialize(classJson(firstStringMapJson), typeReference)
@@ -95,22 +101,7 @@ class MergeTest extends DeserializerTest {
     result shouldBe ClassWithMutableMaps(mutable.Map() ++ secondStringMap, mutable.Map() ++ mergedStringMap)
   }
 
-  def classJson(nestedJson: String) = s"""{"field1":$nestedJson,"field2":$nestedJson}"""
-
-  val firstListJson = """["one","two"]"""
-  val secondListJson = """["three"]"""
-  val secondList = List("three")
-  val mergedList = List("one", "two", "three")
-
-  val firstStringMapJson = """{"one":"1","two":"2"}"""
-  val secondStringMapJson = """{"two":"22","three":"33"}"""
-  val secondStringMap = Map("two" -> "22", "three" -> "33")
-  val mergedStringMap = Map("one" -> "1", "two" -> "22", "three" -> "33")
-
-  val firstPairMapJson = """{"one":{"first":"1"},"two":{"second":"2"},"three":{"first":"3","second":"4"}}"""
-  val secondPairMapJson = """{"two":{"first":"22"},"three":{"second":"33"}}"""
-  val secondPairMap = Map("two" -> Pair("22", null), "three" -> Pair(null, "33"))
-  val mergedPairMap = Map("one" -> Pair("1", null), "two" -> Pair("22", "2"), "three" -> Pair("3", "33"))
+  private def classJson(nestedJson: String) = s"""{"field1":$nestedJson,"field2":$nestedJson}"""
 
   private def updateValue[T](mapper: ObjectMapper, valueToUpdate: T,
                              typeReference: TypeReference[T], src: String): T = {