improve #1327 test

FasterXML · Aug 18, 2016 · 747f000 · 747f000
1 parent dd55294
commit 747f000
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/SerializationFeature.java b/src/main/java/com/fasterxml/jackson/databind/SerializationFeature.java
@@ -295,7 +295,7 @@ public enum SerializationFeature implements ConfigFeature
      * Feature is enabled by default.
      *
      * @deprecated Since 2.8 there are better mechanism for specifying filtering; specifically
-     *   using {@link com.fasterxml.jackson.annotation.JsonFormat} or configuration overrides.
+     *   using {@link com.fasterxml.jackson.annotation.JsonInclude} or configuration overrides.
      */
     @Deprecated // since 2.8
     WRITE_EMPTY_JSON_ARRAYS(true),

diff --git a/src/test/java/com/fasterxml/jackson/failing/JsonInclude1327Test.java b/src/test/java/com/fasterxml/jackson/failing/JsonInclude1327Test.java
@@ -16,27 +16,42 @@ public class JsonInclude1327Test
     extends BaseMapTest
 {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public static class Issues1327Bean {
+    static class Issue1327BeanEmpty {
         public String myString = "stuff";
         public List<String> myList = new ArrayList<String>();
     }
 
+    static class Issue1327BeanAlways {
+        @JsonInclude(JsonInclude.Include.ALWAYS)
+        public List<String> strings = new ArrayList<String>();
+    }
+
     /*
     /**********************************************************
     /* Unit tests
     /**********************************************************
      */
 
     // for [databind#1327]
-    public void testIssue1327() throws Exception {
+    public void testClassDefaultsForEmpty() throws Exception {
         ObjectMapper om = new ObjectMapper();
         om.setSerializationInclusion(JsonInclude.Include.NON_NULL);
 
-        final Issues1327Bean input = new Issues1327Bean();
-        final String jsonString = om.writeValueAsString(input);
+        final String jsonString = om.writeValueAsString(new Issue1327BeanEmpty());
 
         if (jsonString.contains("myList")) {
             fail("Should not contain `myList`: "+jsonString);
         }
     }
+
+    public void testClassDefaultsForAlways() throws Exception {
+        ObjectMapper om = new ObjectMapper();
+        om.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
+
+        final String jsonString = om.writeValueAsString(new Issue1327BeanAlways());
+
+        if (!jsonString.contains("myList")) {
+            fail("Should contain `myList` with Include.ALWAYS: "+jsonString);
+        }
+    }
 }