Store transformed objects with add_reference

The test_collections method now passes

Author: tcalmant

javaobj.py

@@ -755,15 +755,16 @@ def do_object(self, parent=None, ident=0):
                     self.TC_NULL, self.TC_REFERENCE))
         # self.TC_REFERENCE hasn't shown in spec, but actually is here
 
-        self._add_reference(java_object, ident)
-
         # classdata[]
 
         # Store classdesc of this object
         java_object.classdesc = classdesc
 
         if classdesc.flags & self.SC_EXTERNALIZABLE \
                 and not classdesc.flags & self.SC_BLOCK_DATA:
+            # Store the reference anyway (to avoid a delta in indices)
+            self._add_reference(java_object, ident)
+
             # TODO:
             raise NotImplementedError("externalContents isn't implemented yet")
 
@@ -825,6 +826,9 @@ def do_object(self, parent=None, ident=0):
                 java_object = tmp_object
                 break
 
+        # Store the reference
+        self._add_reference(java_object, ident)
+
         log_debug(">>> java_object: {0}".format(java_object), ident)
         return java_object
 
@@ -903,7 +907,9 @@ def do_reference(self, parent=None, ident=0):
         """
         (handle,) = self._readStruct(">L")
         log_debug("## Reference handle: 0x{0:X}".format(handle), ident)
-        return self.references[handle - self.BASE_REFERENCE_IDX]
+        ref = self.references[handle - self.BASE_REFERENCE_IDX]
+        log_debug("Reference: %s" % ref)
+        return ref
 
     @staticmethod
     def do_null(parent=None, ident=0):

tests/tests.py

@@ -265,17 +265,17 @@ def test_class(self):
 #        self.assertEqual(pobj.value, 19)
 #        self.assertFalse(pobj.next)
 #
-#    def test_collections(self):
-#        jobj = self.read_file("objCollections.ser")
-#        pobj = javaobj.loads(jobj)
-#        print pobj
-#
-#        print "arrayList:", pobj.arrayList
-#        self.assertTrue(isinstance(pobj.arrayList, list))
-#        print "hashMap:", pobj.hashMap
-#        self.assertTrue(isinstance(pobj.hashMap, dict))
-#        print "linkedList:", pobj.linkedList
-#        self.assertTrue(isinstance(pobj.linkedList, list)) # Fails
+    def test_collections(self):
+        jobj = self.read_file("objCollections.ser")
+        pobj = javaobj.loads(jobj)
+        _logger.debug(pobj)
+
+        _logger.debug("arrayList: %s", pobj.arrayList)
+        self.assertTrue(isinstance(pobj.arrayList, list))
+        _logger.debug("hashMap: %s", pobj.hashMap)
+        self.assertTrue(isinstance(pobj.hashMap, dict))
+        _logger.debug("linkedList: %s", pobj.linkedList)
+        self.assertTrue(isinstance(pobj.linkedList, list))
 
 # ------------------------------------------------------------------------------