expanding the test to also serialize / deserialize list, and map

marenzo · marenzo · commit da2f54abcd99 · 2016-04-12T01:19:15.000+03:00
diff --git a/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackDataformatForPojoTest.java b/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackDataformatForPojoTest.java
@@ -20,14 +20,13 @@
 
 import java.io.IOException;
 import java.nio.charset.Charset;
-import java.util.Arrays;
 
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.CoreMatchers.containsString;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertArrayEquals;
 
 public class MessagePackDataformatForPojoTest
         extends MessagePackDataformatTestBase
@@ -44,7 +43,7 @@ public void testNormal()
         assertEquals(normalPojo.l, value.l);
         assertEquals(normalPojo.f, value.f, 0.000001f);
         assertEquals(normalPojo.d, value.d, 0.000001f);
-        assertTrue(Arrays.equals(normalPojo.b, value.b));
+        assertArrayEquals(normalPojo.b, value.b);
         assertEquals(normalPojo.bi, value.bi);
         assertEquals(normalPojo.suit, Suit.HEART);
     }
@@ -56,7 +55,7 @@ public void testNestedList()
         byte[] bytes = objectMapper.writeValueAsBytes(nestedListPojo);
         NestedListPojo value = objectMapper.readValue(bytes, NestedListPojo.class);
         assertEquals(nestedListPojo.s, value.s);
-        assertTrue(Arrays.equals(nestedListPojo.strs.toArray(), value.strs.toArray()));
+        assertArrayEquals(nestedListPojo.strs.toArray(), value.strs.toArray());
     }
 
     @Test
@@ -112,12 +111,13 @@ public void testSerializationWithoutSchema()
     {
         ObjectMapper objectMapper = new ObjectMapper(factory); // to not affect shared objectMapper state
         objectMapper.setAnnotationIntrospector(new JsonArrayFormat());
-        UsingCustomConstructorPojo orig = new UsingCustomConstructorPojo("komamitsu", 55);
-        byte[] bytes = objectMapper.writeValueAsBytes(orig);
+        byte[] bytes = objectMapper.writeValueAsBytes(complexPojo);
         String scheme = new String(bytes, Charset.forName("UTF-8"));
-        assertThat(scheme, not(containsString("name")));
-        UsingCustomConstructorPojo value = objectMapper.readValue(bytes, UsingCustomConstructorPojo.class);
+        assertThat(scheme, not(containsString("name"))); // validating schema doesn't contains keys, that's just array
+        ComplexPojo value = objectMapper.readValue(bytes, ComplexPojo.class);
         assertEquals("komamitsu", value.name);
-        assertEquals(55, value.age);
+        assertEquals(20, value.age);
+        assertArrayEquals(complexPojo.values.toArray(), value.values.toArray());
+        assertEquals(complexPojo.grades.get("math"), value.grades.get("math"));
     }
 }
diff --git a/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackDataformatTestBase.java b/msgpack-jackson/src/test/java/org/msgpack/jackson/dataformat/MessagePackDataformatTestBase.java
@@ -32,6 +32,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.Collections;
 
 public class MessagePackDataformatTestBase
 {
@@ -43,6 +45,7 @@ public class MessagePackDataformatTestBase
     protected NestedListPojo nestedListPojo;
     protected NestedListComplexPojo nestedListComplexPojo;
     protected TinyPojo tinyPojo;
+    protected ComplexPojo complexPojo;
 
     @Before
     public void setup()
@@ -65,14 +68,21 @@ public void setup()
 
         nestedListPojo = new NestedListPojo();
         nestedListPojo.s = "a string";
-        nestedListPojo.strs = Arrays.asList(new String[] {"string", "another string", "another string"});
+        nestedListPojo.strs = Arrays.asList("string", "another string", "another string");
 
         tinyPojo = new TinyPojo();
         tinyPojo.t = "t string";
+
         nestedListComplexPojo = new NestedListComplexPojo();
         nestedListComplexPojo.s = "a string";
         nestedListComplexPojo.foos = new ArrayList<TinyPojo>();
         nestedListComplexPojo.foos.add(tinyPojo);
+
+        complexPojo = new ComplexPojo();
+        complexPojo.name = "komamitsu";
+        complexPojo.age = 20;
+        complexPojo.grades = Collections.singletonMap("math", 97);
+        complexPojo.values = Arrays.asList("one", "two", "three");
     }
 
     @After
@@ -108,6 +118,14 @@ public static class NestedListPojo
         public List<String> strs;
     }
 
+    public static class ComplexPojo
+    {
+        public String name;
+        public int age;
+        public List<String> values;
+        public Map<String, Integer> grades;
+    }
+
     public static class TinyPojo
     {
         public String t;
