Added tests for PR #27

Author: tcalmant

tests/java/src/test/java/OneTest.java

@@ -13,9 +13,11 @@
 import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Hashtable;
 import java.util.LinkedHashSet;
+import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.Vector;
@@ -326,6 +328,34 @@ public void testTime() throws Exception {
         oos.flush();
     }
 
+    /**
+     * Tests th pull request #27 by @qistoph:
+     * Add support for java.lang.Bool, Integer and Long classes
+     */
+    @Test
+    public void testBoolIntLong() throws Exception {
+        Map<String, Object> hm1 = new HashMap<String, Object>();
+        hm1.put("key1", "value1");
+        hm1.put("key2", "value2");
+        hm1.put("int", 9);
+        hm1.put("int2", new Integer(10));
+        hm1.put("bool", true);
+        hm1.put("bool2", new Boolean(true));
+
+        oos.writeObject(hm1);
+		oos.flush();
+
+        Map<String, Object> hm2 = new HashMap<String, Object>();
+        hm2.put("subMap", hm1);
+
+        ObjectOutputStream oos2 = new ObjectOutputStream(new FileOutputStream(name.getMethodName() + "-2.ser"));
+        try {
+            oos2.writeObject(hm2);
+        } finally {
+            oos2.close();
+        }
+    }
+
 	@Test
 	public void testSwingObject() throws Exception {
 

tests/tests.py

@@ -391,9 +391,35 @@ def test_jceks_issue_5(self):
         _logger.info(pobj)
         # self._try_marshalling(jobj, pobj)
 
+    def test_qistoph_pr_27(self):
+        """
+        Tests support for Bool, Integer, Long classes (PR #27)
+        """
+        # Load the basic map
+        jobj = self.read_file("testBoolIntLong.ser")
+        pobj = javaobj.loads(jobj)
+        _logger.debug(pobj)
+
+        # Basic checking
+        self.assertEqual(pobj["key1"], "value1")
+        self.assertEqual(pobj["key2"], "value2")
+        self.assertEqual(pobj["int"], 9)
+        self.assertEqual(pobj["int2"], 10)
+        self.assertEqual(pobj["bool"], True)
+        self.assertEqual(pobj["bool2"], True)
+
+        # Load the parent map
+        jobj2 = self.read_file("testBoolIntLong-2.ser")
+        pobj2 = javaobj.loads(jobj2)
+        _logger.debug(pobj2)
+
+        parent_map = pobj2["subMap"]
+        for key, value in pobj.items():
+            self.assertEqual(parent_map[key], value)
 
 # ------------------------------------------------------------------------------
 
+
 if __name__ == "__main__":
     # Setup logging
     logging.basicConfig(level=logging.INFO)