PR Comments (+ extra tests)

JodaOrg · May 8, 2019 · 2068e19 · 2068e19
1 parent 6fc1c19
commit 2068e19
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 12 deletions.
diff --git a/src/test/java/org/joda/beans/sample/JodaConvertInterface.java b/src/test/java/org/joda/beans/sample/JodaConvertInterface.java
@@ -25,17 +25,17 @@ public interface JodaConvertInterface {
 
     @FromString
     public static JodaConvertInterface of(String uniqueName) {
-        return uniqueName.equalsIgnoreCase(First.instance.toString()) ?
-            First.instance :
-            Second.instance;
+        return uniqueName.equalsIgnoreCase(First.INSTANCE.toString()) ?
+            First.INSTANCE :
+            Second.INSTANCE;
     }
 
     @ToString
     public abstract String toString();
 
     final class First implements JodaConvertInterface {
 
-        static final First instance = new First();
+        static final First INSTANCE = new First();
 
         @Override
         public String toString() {
@@ -45,7 +45,7 @@ public String toString() {
 
     final class Second implements JodaConvertInterface {
 
-        static final Second instance = new Second();
+        static final Second INSTANCE = new Second();
 
         @Override
         public String toString() {

diff --git a/src/test/java/org/joda/beans/ser/SerTestHelper.java b/src/test/java/org/joda/beans/ser/SerTestHelper.java
@@ -38,6 +38,7 @@
 import org.joda.beans.sample.ImmOptional;
 import org.joda.beans.sample.ImmPerson;
 import org.joda.beans.sample.ImmTreeNode;
+import org.joda.beans.sample.JodaConvertInterface;
 import org.joda.beans.sample.Person;
 import org.joda.beans.sample.PrimitiveBean;
 import org.joda.beans.sample.RiskLevel;
@@ -215,6 +216,14 @@ public static ImmGuava<String> testCollections() {
             .biMapInterface(bimap)
             .build();
     }
+
+    public static ImmGenericCollections<JodaConvertInterface> testGenericInterfaces() {
+        return ImmGenericCollections.<JodaConvertInterface>builder()
+            .map(ImmutableMap.of(
+                "First", JodaConvertInterface.of("First"),
+                "Second", JodaConvertInterface.of("Second")))
+            .build();
+    }
 
     public static ImmGenericCollections<Map<ImmJodaConvertBean, String>> testGenericNestedCollections() {
         return ImmGenericCollections.<Map<ImmJodaConvertBean, String>>builder()

diff --git a/src/test/java/org/joda/beans/ser/bin/TestSerializeReferencingBin.java b/src/test/java/org/joda/beans/ser/bin/TestSerializeReferencingBin.java
@@ -42,8 +42,6 @@
 import org.joda.beans.test.BeanAssert;
 import org.junit.Test;
 
-import com.google.common.collect.ImmutableMap;
-
 /**
  * Test property roundtrip using referencing binary.
  */
@@ -74,11 +72,7 @@ public void test_writeCollections() {
 
     @Test
     public void test_writeJodaConvertInterface() {
-        ImmGenericCollections<JodaConvertInterface> array = ImmGenericCollections.<JodaConvertInterface>builder()
-            .map(ImmutableMap.of(
-                "First", JodaConvertInterface.of("First"),
-                "Second", JodaConvertInterface.of("Second")))
-            .build();
+        ImmGenericCollections<JodaConvertInterface> array = SerTestHelper.testGenericInterfaces();
 
         byte[] bytes = JodaBeanSer.COMPACT.binWriterReferencing().write(array);
 //        System.out.println(JodaBeanBinReader.visualize(bytes));

diff --git a/src/test/java/org/joda/beans/ser/bin/TestSerializeStandardBin.java b/src/test/java/org/joda/beans/ser/bin/TestSerializeStandardBin.java
@@ -29,9 +29,11 @@
 import org.joda.beans.sample.Company;
 import org.joda.beans.sample.ImmAddress;
 import org.joda.beans.sample.ImmDoubleFloat;
+import org.joda.beans.sample.ImmGenericCollections;
 import org.joda.beans.sample.ImmGuava;
 import org.joda.beans.sample.ImmOptional;
 import org.joda.beans.sample.JodaConvertBean;
+import org.joda.beans.sample.JodaConvertInterface;
 import org.joda.beans.sample.JodaConvertWrapper;
 import org.joda.beans.sample.Person;
 import org.joda.beans.ser.JodaBeanSer;
@@ -90,6 +92,19 @@ public void test_writeCollections() {
         BeanAssert.assertBeanEquals(bean, optional);
     }
 
+    @Test
+    public void test_writeJodaConvertInterface() {
+        ImmGenericCollections<JodaConvertInterface> array = SerTestHelper.testGenericInterfaces();
+
+        byte[] bytes = JodaBeanSer.COMPACT.binWriter().write(array);
+//        System.out.println(JodaBeanBinReader.visualize(bytes));
+
+        @SuppressWarnings("unchecked")
+        ImmGenericCollections<JodaConvertInterface> bean = (ImmGenericCollections<JodaConvertInterface>) JodaBeanSer.COMPACT.binReader().read(bytes);
+//        System.out.println(bean);
+        BeanAssert.assertBeanEquals(bean, array);
+    }
+
     //-----------------------------------------------------------------------
     @Test
     public void test_readWrite_primitives() throws IOException {

diff --git a/src/test/java/org/joda/beans/ser/json/TestSerializeJson.java b/src/test/java/org/joda/beans/ser/json/TestSerializeJson.java
@@ -29,12 +29,14 @@
 import org.joda.beans.sample.ImmAddress;
 import org.joda.beans.sample.ImmDoubleFloat;
 import org.joda.beans.sample.ImmEmpty;
+import org.joda.beans.sample.ImmGenericCollections;
 import org.joda.beans.sample.ImmGuava;
 import org.joda.beans.sample.ImmKey;
 import org.joda.beans.sample.ImmMappedKey;
 import org.joda.beans.sample.ImmOptional;
 import org.joda.beans.sample.ImmPerson;
 import org.joda.beans.sample.JodaConvertBean;
+import org.joda.beans.sample.JodaConvertInterface;
 import org.joda.beans.sample.JodaConvertWrapper;
 import org.joda.beans.sample.Person;
 import org.joda.beans.sample.PrimitiveBean;
@@ -107,6 +109,19 @@ public void test_writeCollections() throws IOException {
         BeanAssert.assertBeanEquals(bean, optional);
     }
 
+    @Test
+    public void test_writeJodaConvertInterface() {
+        ImmGenericCollections<JodaConvertInterface> array = SerTestHelper.testGenericInterfaces();
+
+        String json = JodaBeanSer.COMPACT.jsonWriter().write(array);
+//        System.out.println(json);
+
+        @SuppressWarnings("unchecked")
+        ImmGenericCollections<JodaConvertInterface> bean = (ImmGenericCollections<JodaConvertInterface>) JodaBeanSer.COMPACT.jsonReader().read(json);
+//        System.out.println(bean);
+        BeanAssert.assertBeanEquals(bean, array);
+    }
+
     private void assertEqualsSerialization(String json, String expectedResource) throws IOException {
         URL url = TestSerializeJson.class.getResource(expectedResource);
         String expected = Resources.asCharSource(url, StandardCharsets.UTF_8).read();

diff --git a/src/test/java/org/joda/beans/ser/xml/TestSerializeXml.java b/src/test/java/org/joda/beans/ser/xml/TestSerializeXml.java
@@ -26,12 +26,14 @@
 import org.joda.beans.sample.ImmAddress;
 import org.joda.beans.sample.ImmDoubleFloat;
 import org.joda.beans.sample.ImmEmpty;
+import org.joda.beans.sample.ImmGenericCollections;
 import org.joda.beans.sample.ImmGuava;
 import org.joda.beans.sample.ImmKey;
 import org.joda.beans.sample.ImmMappedKey;
 import org.joda.beans.sample.ImmOptional;
 import org.joda.beans.sample.ImmPerson;
 import org.joda.beans.sample.JodaConvertBean;
+import org.joda.beans.sample.JodaConvertInterface;
 import org.joda.beans.sample.JodaConvertWrapper;
 import org.joda.beans.sample.Person;
 import org.joda.beans.sample.SimpleName;
@@ -106,6 +108,19 @@ public void test_writeCollections() {
 //        System.out.println(bean);
         BeanAssert.assertBeanEquals(bean, optional);
     }
+
+    @Test
+    public void test_writeJodaConvertInterface() {
+        ImmGenericCollections<JodaConvertInterface> array = SerTestHelper.testGenericInterfaces();
+
+        String xml = JodaBeanSer.COMPACT.xmlWriter().write(array);
+//        System.out.println(xml);
+
+        @SuppressWarnings("unchecked")
+        ImmGenericCollections<JodaConvertInterface> bean = (ImmGenericCollections<JodaConvertInterface>) JodaBeanSer.COMPACT.xmlReader().read(xml);
+//        System.out.println(bean);
+        BeanAssert.assertBeanEquals(bean, array);
+    }
 
     //-----------------------------------------------------------------------
     @Test