Update MergeTest.scala

(cherry picked from commit 98bc8e1)
FasterXML · Dec 20, 2020 · dc51439 · dc51439
1 parent 9a56d6e
commit dc51439
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/src/test/scala/com/fasterxml/jackson/module/scala/deser/MergeTest.scala b/src/test/scala/com/fasterxml/jackson/module/scala/deser/MergeTest.scala
@@ -35,17 +35,17 @@ class MergeTest extends DeserializerTest {
   behavior of "The DefaultScalaModule when reading for updating"
 
   it should "merge both lists" in {
-    val typeReference = new TypeReference[ClassWithLists] {}
-    val initial = deserialize(classJson(firstListJson), typeReference)
-    val result = updateValue(newMergeableScalaMapper, initial, typeReference, classJson(secondListJson))
+    val clazz = classOf[ClassWithLists]
+    val initial = deserialize(classJson(firstListJson), clazz)
+    val result = updateValue(newMergeableScalaMapper, initial, clazz, classJson(secondListJson))
 
     result shouldBe ClassWithLists(mergedList, mergedList)
   }
 
   it should "merge only the annotated list" in {
-    val typeReference = new TypeReference[ClassWithLists] {}
-    val initial = deserialize(classJson(firstListJson), typeReference)
-    val result = updateValue(newScalaMapper, initial, typeReference, classJson(secondListJson))
+    val clazz = classOf[ClassWithLists]
+    val initial = deserialize(classJson(firstListJson), clazz)
+    val result = updateValue(newScalaMapper, initial, clazz, classJson(secondListJson))
 
     result shouldBe ClassWithLists(secondList, mergedList)
   }
@@ -120,8 +120,18 @@ class MergeTest extends DeserializerTest {
     objectReaderFor(mapper, valueToUpdate, typeReference).readValue(src)
   }
 
+  private def updateValue[T](mapper: ObjectMapper, valueToUpdate: T,
+                             clazz: Class[T], src: String): T = {
+    objectReaderFor(mapper, valueToUpdate, clazz).readValue(src)
+  }
+
   private def objectReaderFor[T](mapper: ObjectMapper, valueToUpdate: T,
                                  typeReference: TypeReference[T]): ObjectReader = {
     mapper.readerForUpdating(valueToUpdate).forType(typeReference)
   }
+
+  private def objectReaderFor[T](mapper: ObjectMapper, valueToUpdate: T,
+                                 clazz: Class[T]): ObjectReader = {
+    mapper.readerForUpdating(valueToUpdate).forType(clazz)
+  }
 }