test refactoring

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/cfg/DeserConfigTest.java renamed to src/test/java/com/fasterxml/jackson/databind/cfg/DeserializationConfigTest.java

@@ -5,11 +5,30 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.introspect.ClassIntrospector;
 
-public class DeserConfigTest extends BaseMapTest
+public class DeserializationConfigTest extends BaseMapTest
 {
     private final ObjectMapper MAPPER = new ObjectMapper();
 
+    public void testFeatureDefaults()
+    {
+        ObjectMapper m = new ObjectMapper();
+        DeserializationConfig cfg = m.getDeserializationConfig();
+
+        // Expected defaults:
+        assertTrue(cfg.isEnabled(MapperFeature.USE_ANNOTATIONS));
+        assertTrue(cfg.isEnabled(MapperFeature.AUTO_DETECT_SETTERS));
+        assertTrue(cfg.isEnabled(MapperFeature.AUTO_DETECT_CREATORS));
+        assertTrue(cfg.isEnabled(MapperFeature.USE_GETTERS_AS_SETTERS));
+        assertTrue(cfg.isEnabled(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS));
+
+        assertFalse(cfg.isEnabled(DeserializationFeature.USE_BIG_DECIMAL_FOR_FLOATS));
+        assertFalse(cfg.isEnabled(DeserializationFeature.USE_BIG_INTEGER_FOR_INTS));
+
+        assertTrue(cfg.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
+    }
+
     public void testBasicFeatures() throws Exception
     {
         DeserializationConfig config = MAPPER.getDeserializationConfig();
@@ -59,14 +78,39 @@ public void testFormatFeatures() throws Exception
         assertNotSame(config, config.withoutFeatures(BogusFormatFeature.FF_DISABLED_BY_DEFAULT,
                 BogusFormatFeature.FF_ENABLED_BY_DEFAULT));
     }
-    
+
+    /* Test to verify that we don't overflow number of features; if we
+     * hit the limit, need to change implementation -- this test just
+     * gives low-water mark
+     */
+    public void testEnumIndexes()
+    {
+        int max = 0;
+        
+        for (DeserializationFeature f : DeserializationFeature.values()) {
+            max = Math.max(max, f.ordinal());
+        }
+        if (max >= 31) { // 31 is actually ok; 32 not
+            fail("Max number of DeserializationFeature enums reached: "+max);
+        }
+    }
+
+    public void testOverrideIntrospectors()
+    {
+        ObjectMapper m = new ObjectMapper();
+        DeserializationConfig cfg = m.getDeserializationConfig();
+        // and finally, ensure we could override introspectors
+        cfg = cfg.with((ClassIntrospector) null); // no way to verify tho
+        cfg = cfg.with((AnnotationIntrospector) null);
+        assertNull(cfg.getAnnotationIntrospector());
+    }
+
     public void testMisc() throws Exception
     {
         DeserializationConfig config = MAPPER.getDeserializationConfig();
         assertEquals(JsonInclude.Value.empty(), config.getDefaultPropertyInclusion());
         assertEquals(JsonInclude.Value.empty(), config.getDefaultPropertyInclusion(String.class));
 
-        
         assertSame(config, config.withRootName((PropertyName) null)); // defaults to 'none'
 
         DeserializationConfig newConfig = config.withRootName(PropertyName.construct("foobar"));

src/test/java/com/fasterxml/jackson/databind/deser/TestAnnotationIgnore.java renamed to src/test/java/com/fasterxml/jackson/databind/deser/IgnoreWithDeserTest.java

@@ -8,7 +8,7 @@
  * This unit test suite that tests use of {@link JsonIgnore}
  * annotation with deserialization.
  */
-public class TestAnnotationIgnore
+public class IgnoreWithDeserTest
     extends BaseMapTest
 {
     // Class for testing {@link JsonIgnore} annotations with setters

src/test/java/com/fasterxml/jackson/databind/deser/TestBasicAnnotations.java

@@ -3,7 +3,7 @@
 import java.io.*;
 
 import com.fasterxml.jackson.annotation.*;
-
+import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility;
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -18,12 +18,6 @@
 public class TestBasicAnnotations
     extends BaseMapTest
 {
-    /*
-    /**********************************************************
-    /* Annotated helper classes
-    /**********************************************************
-     */
-
     /// Class for testing {@link JsonProperty} annotations
     final static class SizeClassSetter
     {
@@ -88,6 +82,24 @@ static class BeanWithDeserialize {
         @JsonDeserialize protected int a;
     }
 
+    @JsonAutoDetect(setterVisibility=Visibility.NONE)
+    final static class Dummy { }
+
+    final static class EmptyDummy { }
+
+    static class AnnoBean {
+        int value = 3;
+        
+        @JsonProperty("y")
+            public void setX(int v) { value = v; }
+    }
+
+    enum Alpha { A, B, C; }
+
+    public static class SimpleBean {
+        public int x, y;
+    }
+
     /*
     /**********************************************************
     /* Other helper classes
@@ -104,10 +116,10 @@ public int[] deserialize(JsonParser jp, DeserializationContext ctxt)
             return new int[] { jp.getIntValue() };
         }
     }
-    
+
     /*
     /**********************************************************
-    /* Test methods
+    /* Test methods, basic
     /**********************************************************
      */
 
@@ -168,4 +180,46 @@ public void testIssue442PrivateUnwrapped() throws Exception
         Issue442Bean bean = MAPPER.readValue("{\"i\":5}", Issue442Bean.class);
         assertEquals(5, bean.w.i);
     }
+
+    /*
+    /**********************************************************
+    /* Test methods, annotations disabled
+    /**********************************************************
+     */
+    
+    public void testAnnotationsDisabled() throws Exception
+    {
+        // first: verify that annotation introspection is enabled by default
+        ObjectMapper m = new ObjectMapper();
+        assertTrue(m.getDeserializationConfig().isEnabled(MapperFeature.USE_ANNOTATIONS));
+        // with annotations, property is renamed
+        AnnoBean bean = m.readValue("{ \"y\" : 0 }", AnnoBean.class);
+        assertEquals(0, bean.value);
+
+        m = new ObjectMapper();
+        m.configure(MapperFeature.USE_ANNOTATIONS, false);
+        // without annotations, should default to default bean-based name...
+        bean = m.readValue("{ \"x\" : 0 }", AnnoBean.class);
+        assertEquals(0, bean.value);
+    }
+
+    public void testEnumsWhenDisabled() throws Exception
+    {
+        ObjectMapper m = new ObjectMapper();
+        assertEquals(Alpha.B, m.readValue(quote("B"), Alpha.class));
+
+        m = new ObjectMapper();
+        m.configure(MapperFeature.USE_ANNOTATIONS, false);
+        // should still use the basic name handling here
+        assertEquals(Alpha.B, m.readValue(quote("B"), Alpha.class));
+    }
+
+    public void testNoAccessOverrides() throws Exception
+    {
+        ObjectMapper m = new ObjectMapper();
+        m.disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS);
+        SimpleBean bean = m.readValue("{\"x\":1,\"y\":2}", SimpleBean.class);
+        assertEquals(1, bean.x);
+        assertEquals(2, bean.y);
+    }    
 }