disable SORT_PROPERTIES_ALPHABETICALLY in tests

Author: pjfanning

src/test/scala/tools/jackson/module/scala/BaseFixture.scala

@@ -1,6 +1,6 @@
 package tools.jackson.module.scala
 
-import tools.jackson.databind.ObjectMapper
+import tools.jackson.databind.{MapperFeature, ObjectMapper}
 import tools.jackson.databind.json.JsonMapper
 import org.scalatest.Outcome
 import org.scalatest.flatspec.FixtureAnyFlatSpec
@@ -11,7 +11,9 @@ class BaseFixture extends FixtureAnyFlatSpec with Matchers {
   type FixtureParam = ObjectMapper
 
   def withFixture(test: OneArgTest): Outcome = {
-    val builder = JsonMapper.builder().addModule(DefaultScalaModule)
+    val builder = JsonMapper.builder()
+      .disable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
+      .addModule(DefaultScalaModule)
     val mapper = builder.build()
     test(mapper)
   }

src/test/scala/tools/jackson/module/scala/JacksonTest.scala

@@ -1,13 +1,15 @@
 package tools.jackson.module.scala
 
 import tools.jackson.databind.json.JsonMapper
-import tools.jackson.databind.{JacksonModule => DatabindModule}
+import tools.jackson.databind.{MapperFeature, JacksonModule => DatabindModule}
 
 abstract class JacksonTest extends BaseSpec {
   def module: DatabindModule
 
   def newBuilder: JsonMapper.Builder = {
-    JsonMapper.builder().addModule(module)
+    JsonMapper.builder()
+      .addModule(module)
+      .disable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
   }
 
   def newMapper: JsonMapper = newBuilder.build()

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

@@ -155,7 +155,9 @@ class CreatorTest extends DeserializationFixture {
       .addAllBuiltinModules()
       .applyDefaultValuesWhenDeserializing(false)
       .build()
-    val mapper = JsonMapper.builder().addModule(scalaModule).build()
+    val mapper = initBuilder()
+      .addModule(scalaModule)
+      .build()
     val deser = mapper.readValue("""{}""", classOf[ConstructorWithDefaultValues])
     deser.s shouldEqual null
     deser.i shouldEqual 0
@@ -170,7 +172,9 @@ class CreatorTest extends DeserializationFixture {
       .addModule(ScalaAnnotationIntrospectorModule)
       .applyDefaultValuesWhenDeserializing(false)
       .build()
-    val mapper = JsonMapper.builder().addModule(scalaModule).build()
+    val mapper = initBuilder()
+      .addModule(scalaModule)
+      .build()
     val deser = mapper.readValue("""{}""", classOf[ConstructorWithDefaultValues])
     deser.s shouldEqual null
     deser.i shouldEqual 0
@@ -181,7 +185,9 @@ class CreatorTest extends DeserializationFixture {
   }
 
   it should "ignore default values (when MapperFeature is overridden)" in { _ =>
-    val builder = JsonMapper.builder().disable(MapperFeature.APPLY_DEFAULT_VALUES).addModule(DefaultScalaModule)
+    val builder = initBuilder()
+      .disable(MapperFeature.APPLY_DEFAULT_VALUES)
+      .addModule(DefaultScalaModule)
     val mapper = builder.build()
     val deser = mapper.readValue("""{}""", classOf[ConstructorWithDefaultValues])
     deser.s shouldEqual null
@@ -237,4 +243,9 @@ class CreatorTest extends DeserializationFixture {
     val node: JsonNode = f.valueToTree[IntNode](10)
     f.convertValue(node, new TypeReference[PositiveLong] {}).value shouldEqual node.asLong()
   }
+
+  private def initBuilder(): JsonMapper.Builder = {
+    JsonMapper.builder()
+      .disable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
+  }
 }

src/test/scala/tools/jackson/module/scala/ser/CaseClassSerializerTest.scala

@@ -2,7 +2,6 @@ package tools.jackson.module.scala.ser
 
 import com.fasterxml.jackson.annotation.JsonProperty.Access
 import com.fasterxml.jackson.annotation._
-import tools.jackson.databind.json.JsonMapper
 import tools.jackson.databind.{ObjectMapper, PropertyNamingStrategies}
 import tools.jackson.module.scala.DefaultScalaModule
 
@@ -139,7 +138,7 @@ class CaseClassSerializerTest extends SerializerTest {
   }
 
   def propertyNamingStrategyMapper: ObjectMapper = {
-    val builder = JsonMapper.builder()
+    val builder = newBuilder
     val settings = builder.baseSettings().`with`(PropertyNamingStrategies.SNAKE_CASE)
     builder.baseSettings(settings).addModule(module).build()
   }