Rename JacksonTest.mapper to newMapper.

Author: nbauernfeind

src/test/scala/com/fasterxml/jackson/module/scala/JacksonTest.scala

@@ -6,7 +6,7 @@ abstract class JacksonTest extends BaseSpec {
 
   def module: Module
 
-  def mapper = {
+  def newMapper = {
     val result = new ObjectMapper
     result.registerModule(module)
     result

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

@@ -115,7 +115,7 @@ class CaseClassDeserializerTest extends DeserializerTest {
 
   it should "support serializing into instance var properties" in {
     val bean = new Bean("ctor")
-    val reader: ObjectReader = mapper.readerFor(bean.getClass)
+    val reader: ObjectReader = newMapper.readerFor(bean.getClass)
     reader.withValueToUpdate(bean).readValue("""{"prop":"readValue"}""")
     bean.prop should be ("readValue")
   }

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

@@ -13,10 +13,10 @@ import com.fasterxml.jackson.module.scala.JacksonTest
 
 trait DeserializerTest extends JacksonTest {
 
-  def serialize(o: AnyRef) = mapper.writeValueAsString(o)
+  def serialize(o: AnyRef) = newMapper.writeValueAsString(o)
 
   def deserialize[T: Manifest](value: String) : T =
-    mapper.readValue(value, typeReference[T])
+    newMapper.readValue(value, typeReference[T])
 
   private [this] def typeReference[T: Manifest] = new TypeReference[T] {
     override def getType = typeFromManifest(manifest[T])

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

@@ -15,7 +15,7 @@ class MiscTypesTest extends DeserializerTest {
   "Scala Module" should "deserialize UUID" in {
     val data: Seq[UUID] = Stream.continually(UUID.randomUUID).take(4).toList
 
-    val json = mapper.writeValueAsString(data)
+    val json = newMapper.writeValueAsString(data)
     val read = deserialize[List[UUID]](json)
 
     read shouldBe (data)

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

@@ -73,9 +73,9 @@ class OptionDeserializerTest extends DeserializerTest {
   }
 
   it should "deserialze defaulted parameters correctly (without defaults)" in {
-    val json = mapper.writeValueAsString(Defaulted(id = 1))
+    val json = newMapper.writeValueAsString(Defaulted(id = 1))
     json shouldBe """{"id":1,"name":""}"""
-    val d = mapper.readValue(json, classOf[Defaulted])
+    val d = newMapper.readValue(json, classOf[Defaulted])
     d.name should not be null
   }
 }

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

@@ -19,7 +19,7 @@ class OptionWithJodaTimeDeserializerTest extends DeserializerTest {
   }
 
   it should "deserialize a case class with Option with JodaModule" in {
-    mapper.registerModule(new JodaModule)
+    newMapper.registerModule(new JodaModule)
     deserialize[OptionalInt](stringValue) should be (OptionalInt(Some(123)))
   }
 

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

@@ -39,7 +39,7 @@ class SortedMapDeserializerTest extends DeserializerTest {
   }
 
   it should "handle key type information" in {
-    val result: SortedMap[UUID,Int] = mapper.readValue("""{"e79bf81e-3902-4801-831f-d161be435787":5}""", new TypeReference[SortedMap[UUID,Int]]{})
+    val result: SortedMap[UUID,Int] = newMapper.readValue("""{"e79bf81e-3902-4801-831f-d161be435787":5}""", new TypeReference[SortedMap[UUID,Int]]{})
     result.keys.head shouldBe UUID.fromString("e79bf81e-3902-4801-831f-d161be435787")
   }
 

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

@@ -36,7 +36,7 @@ class TestInnerClass extends DeserializerTest {
 
   "Deserializer" should "support nested inner classes as values" in {
     val input = Dog("Smurf", thinking = true)
-    val json = mapper.writeValueAsString(input)
+    val json = newMapper.writeValueAsString(input)
     val output = deserialize[Dog](json)
 
     output should have ('name ("Smurf"))

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

@@ -71,14 +71,14 @@ class TupleDeserializerTest extends DeserializerTest {
 
   it should "deserialize using type information" in {
     val value = TupleContainer(TupleValueLong(1), TupleValueString("foo"))
-    val json = mapper.writeValueAsString(value)
+    val json = newMapper.writeValueAsString(value)
     val result = deserialize[TupleContainer](json)
     result should be (value)
   }
 
   it should "deserialize using type information outside of field" in {
     val value = (TupleValueLong(1), TupleValueString("foo"))
-    val json = mapper.writeValueAsString(value)
+    val json = newMapper.writeValueAsString(value)
     val result = deserialize[(TupleValueBase, TupleValueBase)](json)
     result should be (value)
   }

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

@@ -48,7 +48,7 @@ class UnsortedMapDeserializerTest extends DeserializerTest {
   }
 
   it should "handle key type information" in {
-    val result: Map[UUID,Int] = mapper.readValue("""{"e79bf81e-3902-4801-831f-d161be435787":5}""", new TypeReference[Map[UUID,Int]]{})
+    val result: Map[UUID,Int] = newMapper.readValue("""{"e79bf81e-3902-4801-831f-d161be435787":5}""", new TypeReference[Map[UUID,Int]]{})
     result.keys.head shouldBe (UUID.fromString("e79bf81e-3902-4801-831f-d161be435787"))
   }