Add a test for Optional; update release notes wrt #65

Author: cowtowncoder

release-notes/CREDITS

@@ -10,3 +10,5 @@ Stephan Schroevers: (Stephan202@github)
 
 * Contributed #56: Add support `HashCode`
  (2.5.0)
+* Contributed #65: Add deserialization support for SortedMultiset and ImmutableSortedMultiset
+ (2.5.3)

release-notes/VERSION

@@ -4,6 +4,11 @@ Project: jackson-datatype-guava
 === Releases ===
 ------------------------------------------------------------------------
 
+2.5.3 (not released yet)
+
+#65: Add deserialization support for SortedMultiset and ImmutableSortedMultiset
+ (contributed by Stephan S, Stephan202@github)
+
 2.5.2 (29-Mar-2015)
 
 #62: Add `com.google.common.hash` to OSGi import list
@@ -16,7 +21,7 @@ No changes since 2.5.0
 2.5.0 (01-Jan-2015)
 
 #56: Add support `HashCode`
- (contributed by Stephan202@github)
+ (contributed by Stephan S, Stephan202@github)
 
 2.4.6 (not yet released)
 

src/test/java/com/fasterxml/jackson/datatype/guava/TestOptional.java

@@ -115,13 +115,34 @@ public void testSerNonNull() throws Exception {
         String value = mapperWithModule().setSerializationInclusion(JsonInclude.Include.NON_NULL).writeValueAsString(data);
         assertEquals("{}", value);
     }
+
+    public void testSerOptDefault() throws Exception {
+        OptionalData data = new OptionalData();
+        data.myString = Optional.absent();
+        String value = mapperWithModule().setSerializationInclusion(JsonInclude.Include.ALWAYS).writeValueAsString(data);
+        assertEquals("{\"myString\":null}", value);
+    }
 
     public void testSerOptNull() throws Exception {
         OptionalData data = new OptionalData();
         data.myString = null;
         String value = mapperWithModule().setSerializationInclusion(JsonInclude.Include.NON_NULL).writeValueAsString(data);
         assertEquals("{}", value);
     }
+
+    public void testSerOptNonEmpty() throws Exception {
+        OptionalData data = new OptionalData();
+        data.myString = null;
+        String value = mapperWithModule().setSerializationInclusion(JsonInclude.Include.NON_EMPTY).writeValueAsString(data);
+        assertEquals("{}", value);
+    }
+
+    public void testSerOptNonDefault() throws Exception {
+        OptionalData data = new OptionalData();
+        data.myString = null;
+        String value = mapperWithModule().setSerializationInclusion(JsonInclude.Include.NON_DEFAULT).writeValueAsString(data);
+        assertEquals("{}", value);
+    }
 
     public void testWithTypingEnabled() throws Exception
     {