Update OptionWithNumberDeserializerTest.scala

Author: pjfanning

src/test/scala/com/fasterxml/jackson/module/scala/deser/OptionWithNumberDeserializerTest.scala

@@ -3,7 +3,8 @@ package com.fasterxml.jackson.module.scala.deser
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.fasterxml.jackson.databind.exc.InvalidFormatException
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
-import com.fasterxml.jackson.module.scala.introspect.ScalaAnnotationIntrospector
+import com.fasterxml.jackson.module.scala.deser.PrimitiveContainerTest.OptionLongWithDefault
+import com.fasterxml.jackson.module.scala.introspect.ScalaAnnotationIntrospectorModule
 import org.scalatest.BeforeAndAfterEach
 
 object OptionWithNumberDeserializerTest {
@@ -25,7 +26,7 @@ class OptionWithNumberDeserializerTest extends DeserializerTest with BeforeAndAf
 
   override def afterEach(): Unit = {
     super.afterEach()
-    ScalaAnnotationIntrospector.clearRegisteredReferencedTypes()
+    ScalaAnnotationIntrospectorModule.clearRegisteredReferencedTypes()
   }
 
   "JacksonModuleScala" should "deserialize AnnotatedOptionLong" in {
@@ -43,7 +44,7 @@ class OptionWithNumberDeserializerTest extends DeserializerTest with BeforeAndAf
   }
 
   it should "deserialize OptionLong when registerReferencedValueType is used" in {
-    ScalaAnnotationIntrospector.registerReferencedValueType(classOf[OptionLong], "valueLong", classOf[Long])
+    ScalaAnnotationIntrospectorModule.registerReferencedValueType(classOf[OptionLong], "valueLong", classOf[Long])
     try {
       val v1 = deserialize("""{"valueLong":151}""", classOf[OptionLong])
       v1 shouldBe OptionLong(Some(151L))
@@ -52,12 +53,26 @@ class OptionWithNumberDeserializerTest extends DeserializerTest with BeforeAndAf
       //or use one of the equivalent classes in OptionWithNumberDeserializerTest
       useOptionLong(v1.valueLong) shouldBe 302L
     } finally {
-      ScalaAnnotationIntrospector.clearRegisteredReferencedTypes()
+      ScalaAnnotationIntrospectorModule.clearRegisteredReferencedTypes()
+    }
+  }
+
+  it should "deserialize OptionLongWithDefault when registerReferencedValueType is used" in {
+    ScalaAnnotationIntrospectorModule.registerReferencedValueType(classOf[OptionLongWithDefault], "valueLong", classOf[Long])
+    try {
+      val v1 = deserialize("""{"valueLong":151}""", classOf[OptionLong])
+      v1 shouldBe OptionLong(Some(151L))
+      v1.valueLong.get shouldBe 151L
+      //this next call will fail with a Scala unboxing exception unless you call ScalaAnnotationIntrospectorModule.registerReferencedValueType
+      //or use one of the equivalent classes in OptionWithNumberDeserializerTest
+      useOptionLong(v1.valueLong) shouldBe 302L
+    } finally {
+      ScalaAnnotationIntrospectorModule.clearRegisteredReferencedTypes()
     }
   }
 
   it should "deserialize WrappedOptionLong when registerReferencedValueType is used" in {
-    ScalaAnnotationIntrospector.registerReferencedValueType(classOf[OptionLong], "valueLong", classOf[Long])
+    ScalaAnnotationIntrospectorModule.registerReferencedValueType(classOf[OptionLong], "valueLong", classOf[Long])
     try {
       val v1 = deserialize("""{"text":"myText","wrappedLong":{"valueLong":151}}""", classOf[WrappedOptionLong])
       v1 shouldBe WrappedOptionLong("myText", OptionLong(Some(151L)))
@@ -66,7 +81,7 @@ class OptionWithNumberDeserializerTest extends DeserializerTest with BeforeAndAf
       //or use one of the equivalent classes in OptionWithNumberDeserializerTest
       useOptionLong(v1.wrappedLong.valueLong) shouldBe 302L
     } finally {
-      ScalaAnnotationIntrospector.clearRegisteredReferencedTypes()
+      ScalaAnnotationIntrospectorModule.clearRegisteredReferencedTypes()
     }
   }