update MapperFeature.SORT_PROPERTIES_ALPHABETICALLY code 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.{MapperFeature, ObjectMapper}
+import tools.jackson.databind.ObjectMapper
 import tools.jackson.databind.json.JsonMapper
 import org.scalatest.Outcome
 import org.scalatest.flatspec.FixtureAnyFlatSpec
@@ -11,9 +11,7 @@ class BaseFixture extends FixtureAnyFlatSpec with Matchers {
   type FixtureParam = ObjectMapper
 
   def withFixture(test: OneArgTest): Outcome = {
-    val builder = JsonMapper.builder()
-      .disable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
-      .addModule(DefaultScalaModule)
+    val builder = JsonMapper.builder().addModule(DefaultScalaModule)
     val mapper = builder.build()
     test(mapper)
   }

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

@@ -136,7 +136,8 @@ class ClassTagExtensionsTest extends JacksonTest {
     val result = mapper.writerWithView[PublicView].writeValueAsString(instance)
     result should equal("""{"foo":"foo"}""")
     val resultInView = mapper.writerWithView[PrivateView].writeValueAsString(instance)
-    resultInView should equal("""{"foo":"foo","bar":42}""")
+    // JSON order for non-constructor params changed in Jackson 3 due to https://github.com/FasterXML/jackson-databind/pull/4572
+    resultInView should equal("""{"bar":42,"foo":"foo"}""")
   }
 
   it should "produce writer with type" in {

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

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

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

@@ -244,8 +244,5 @@ class CreatorTest extends DeserializationFixture {
     f.convertValue(node, new TypeReference[PositiveLong] {}).value shouldEqual node.asLong()
   }
 
-  private def initBuilder(): JsonMapper.Builder = {
-    JsonMapper.builder()
-      .disable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
-  }
+  private def initBuilder(): JsonMapper.Builder = JsonMapper.builder()
 }

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

@@ -160,7 +160,8 @@ class CaseClassSerializerTest extends SerializerTest {
     val bean = new NonCaseWithBeanProperty
     bean.id = 1
     bean.bar = "foo"
-    serialize(bean) should equal( """{"id":1,"bar":"foo"}""")
+    // JSON order for non-constructor params changed in Jackson 3 due to https://github.com/FasterXML/jackson-databind/pull/4572
+    serialize(bean) should equal( """{"bar":"foo","id":1}""")
   }
 
   it should "serialize a nested case class" in {
@@ -185,7 +186,8 @@ class CaseClassSerializerTest extends SerializerTest {
       def isBoolean = boolean
     }
     val foo = new Foo("str", false)
-    serialize(foo) should equal ("""{"string":"str","boolean":false}""")
+    // JSON order for non-constructor params changed in Jackson 3 due to https://github.com/FasterXML/jackson-databind/pull/4572
+    serialize(foo) should equal ("""{"boolean":false,"string":"str"}""")
   }
 
   it should "serialize java getters returning java collections" in {

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

@@ -2,7 +2,7 @@ package tools.jackson.module.scala.ser
 
 import com.fasterxml.jackson.annotation._
 import tools.jackson.databind.jsontype.DefaultBaseTypeLimitingValidator
-import tools.jackson.databind.{JsonNode, ObjectMapper}
+import tools.jackson.databind.{JsonNode, MapperFeature, ObjectMapper}
 import tools.jackson.module.scala.{DefaultScalaModule, JacksonModule}
 
 import java.util
@@ -130,11 +130,13 @@ class OptionSerializerTest extends SerializerTest {
 
   it should "support default typing" in {
     case class User(name: String, email: Option[String] = None)
-    val mapper = newMapper
+    val mapper = newBuilder.disable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY).build()
     val user = User("John Smith", Some("john.smith@unit.uk"))
     val expected = """{"name":"John Smith","email":"john.smith@unit.uk"}"""
     mapper.writeValueAsString(user) shouldEqual expected
-    val mapper2 = newBuilder.activateDefaultTyping(new DefaultBaseTypeLimitingValidator).build()
+    val mapper2 = newBuilder.disable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
+      .activateDefaultTyping(new DefaultBaseTypeLimitingValidator)
+      .build()
     mapper2.writeValueAsString(user) shouldEqual expected
   }