...

Author: cowtowncoder

…ckson/databind/TestJDKSerialization.java …databind/MapperJDKSerializationTest.javasrc/test/java/com/fasterxml/jackson/databind/TestJDKSerialization.java renamed to src/test/java/com/fasterxml/jackson/databind/MapperJDKSerializationTest.java src/test/java/com/fasterxml/jackson/databind/TestJDKSerialization.java renamed to src/test/java/com/fasterxml/jackson/databind/MapperJDKSerializationTest.java

@@ -22,7 +22,7 @@
  * platforms, such as Android, where memory management is handled
  * much more aggressively.
  */
-public class TestJDKSerialization extends BaseMapTest
+public class MapperJDKSerializationTest extends BaseMapTest
 {
     static class MyPojo {
         public int x;
@@ -82,7 +82,7 @@ public void testConfigs() throws IOException
         assertNotNull(jdkDeserialize(base));
 
         // first things first: underlying BaseSettings
-        
+
         DeserializationConfig origDC = MAPPER.deserializationConfig();
         SerializationConfig origSC = MAPPER.serializationConfig();
         byte[] dcBytes = jdkSerialize(origDC);
@@ -185,7 +185,7 @@ public void testMapperWithModule() throws IOException
             byte[] b = jdkSerialize(module);
             assertNotNull(b);
         }
-
+        
         ObjectMapper mapper = ObjectMapper.builder()
                 .enable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS)
                 .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
@@ -199,12 +199,30 @@ public void testMapperWithModule() throws IOException
 
         byte[] bytes = jdkSerialize(mapper);
         ObjectMapper mapper2 = jdkDeserialize(bytes);
+
+        // verify settings
+        assertTrue(mapper.isEnabled(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS));
+        assertTrue(mapper.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY));
+        
         assertEquals(EXP_JSON, mapper2.writeValueAsString(p));
         MyPojo p2 = mapper2.readValue(EXP_JSON, MyPojo.class);
         assertEquals(p.x, p2.x);
         assertEquals(p.y, p2.y);
+
+        // and then reconfigure a bit
+        ObjectMapper mapper3 = mapper2.rebuild()
+                .disable(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS)
+                .disable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+                .build();
+        assertFalse(mapper3.isEnabled(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS));
+        assertFalse(mapper3.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY));
+        bytes = jdkSerialize(mapper3);
+        ObjectMapper mapper4 = jdkDeserialize(bytes);
+
+        assertFalse(mapper4.isEnabled(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS));
+        assertFalse(mapper4.isEnabled(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY));
     }
-    
+
     public void testTypeFactory() throws Exception
     {
         TypeFactory orig = TypeFactory.defaultInstance();