refactor option deserialization tests

Author: pjfanning

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

@@ -0,0 +1,58 @@
+package com.fasterxml.jackson.module.scala.deser
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize
+import com.fasterxml.jackson.module.scala.DefaultScalaModule
+
+object OptionWithNumberDeserializerTest {
+  case class AnnotatedOptionLong(@JsonDeserialize(contentAs = classOf[java.lang.Long]) valueLong: Option[Long])
+  case class AnnotatedOptionPrimitiveLong(@JsonDeserialize(contentAs = classOf[Long]) valueLong: Option[Long])
+  case class OptionLong(valueLong: Option[Long])
+  case class OptionJavaLong(valueLong: Option[java.lang.Long])
+  case class OptionBigInt(value: Option[BigInt])
+}
+
+class OptionWithNumberDeserializerTest extends DeserializerTest {
+  lazy val module: DefaultScalaModule.type = DefaultScalaModule
+  import OptionWithNumberDeserializerTest._
+
+  private def useOptionLong(v: Option[Long]): Long = v.map(_ * 2).getOrElse(0L)
+  private def useOptionJavaLong(v: Option[java.lang.Long]): Long = v.map(_ * 2).getOrElse(0L)
+  private def useOptionBigInt(v: Option[BigInt]): Long = v.map(_ * 2).map(_.toLong).getOrElse(0L)
+
+  "JacksonModuleScala" should "support AnnotatedOptionLong" in {
+    val v1 = deserialize("""{"valueLong":151}""", classOf[AnnotatedOptionLong])
+    v1 shouldBe AnnotatedOptionLong(Some(151L))
+    v1.valueLong.get shouldBe 151L
+    useOptionLong(v1.valueLong) shouldBe 302L
+  }
+
+  it should "support AnnotatedOptionPrimitiveLong" in {
+    val v1 = deserialize("""{"valueLong":151}""", classOf[AnnotatedOptionPrimitiveLong])
+    v1 shouldBe AnnotatedOptionPrimitiveLong(Some(151L))
+    v1.valueLong.get shouldBe 151L
+    useOptionLong(v1.valueLong) shouldBe 302L
+  }
+
+  it should "support OptionLong" in {
+    val v1 = deserialize("""{"valueLong":151}""", classOf[OptionLong])
+    v1 shouldBe OptionLong(Some(151L))
+    v1.valueLong.get shouldBe 151L
+    //next assert fails due to unboxing issue -- without the @JsonDeserialize to help, jackson will
+    //erroneously create an Option[Int] instead of Option[Long] leading to a class cast exception
+    //useOptionLong(v1.valueLong) shouldBe 302L
+  }
+
+  it should "support OptionJavaLong" in {
+    val v1 = deserialize("""{"valueLong":151}""", classOf[OptionJavaLong])
+    v1 shouldBe OptionJavaLong(Some(151L))
+    v1.valueLong.get shouldBe 151L
+    useOptionJavaLong(v1.valueLong) shouldBe 302L
+  }
+
+  it should "support OptionBigInt" in {
+    val v1 = deserialize("""{"value":151}""", classOf[OptionBigInt])
+    v1 shouldBe OptionBigInt(Some(BigInt(151L)))
+    v1.value.get shouldBe 151L
+    useOptionBigInt(v1.value) shouldBe 302L
+  }
+}

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

@@ -6,8 +6,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 
 object ParamWithDashNameDeserializerTest {
-  case class AnnotatedOptionLong(@JsonDeserialize(contentAs = classOf[java.lang.Long]) valueLong: Option[Long])
-
   case class OptionLongWithDash(`value-long`: Option[Long])
 
   case class AnnotatedOptionLongWithDash(@JsonDeserialize(contentAs = classOf[java.lang.Long]) `value-long`: Option[Long])
@@ -21,19 +19,7 @@ class ParamWithDashNameDeserializerTest extends DeserializerTest {
 
   private def useOptionLong(v: Option[Long]): Long = v.map(_ * 2).getOrElse(0L)
 
-  "JacksonModuleScala" should "support standard param names" in {
-    // check deserialization
-    val v1 = deserialize("""{"valueLong":151}""", classOf[AnnotatedOptionLong])
-    v1 shouldBe AnnotatedOptionLong(Some(151L))
-    v1.valueLong.get shouldBe 151L
-
-    val v2 = deserialize(serialize(AnnotatedOptionLong(Some(152))), classOf[AnnotatedOptionLong])
-    v2 shouldBe AnnotatedOptionLong(Some(152L))
-    v2.valueLong.get shouldBe 152L
-    useOptionLong(v2.valueLong) shouldBe 304L
-  }
-
-  it should "support param names with dashes" in {
+  "JacksonModuleScala" should "support param names with dashes" in {
     // check deserialization
     val typeRef = new TypeReference[OptionLongWithDash] {}
     val v1 = deserialize("""{"value-long":251}""", typeRef)