last minute fix for arrays and their unit tests

vbuell · vbuell · commit 0054c8a7f5f3 · 2011-03-27T12:35:09.000Z
git-svn-id: http://python-javaobj.googlecode.com/svn/trunk@17 003243c8-0679-609b-391f-34f4f14b4f20
diff --git a/javaobj.py b/javaobj.py
@@ -208,10 +208,10 @@ def do_classdesc(self, parent=None, ident=0):
 
             if field_type == self.TYPE_ARRAY:
                 field_type = self.read_and_exec_opcode(ident=ident+1, expect=[self.TC_STRING, self.TC_REFERENCE])
-                if field_type is not None:
-                    field_type = "array of " + field_type
-                else:
-                    field_type = "array of None"
+#                if field_type is not None:
+#                    field_type = "array of " + field_type
+#                else:
+#                    field_type = "array of None"
             elif field_type == self.TYPE_OBJECT:
                 field_type = self.read_and_exec_opcode(ident=ident+1, expect=[self.TC_STRING, self.TC_REFERENCE])
 
@@ -317,7 +317,6 @@ def do_array(self, parent=None, ident=0):
         (size, ) = self._readStruct(">i")
         self.print_ident("size: " + str(size), ident)
 
-#        for char in classdesc.name:
         type_char = classdesc.name[0]
         assert type_char == self.TYPE_ARRAY
         type_char = classdesc.name[1]
@@ -329,12 +328,11 @@ def do_array(self, parent=None, ident=0):
                 array.append(res)
         else:
             for i in range(size):
-                res = self.read_native(typestr, ident)
+                res = self.read_native(type_char, ident)
                 print "Native value:", res
                 array.append(res)
-#            raise RuntimeError("Native types aren't supported in arrays")
 
-        return None
+        return array
 
     def do_reference(self, parent=None, ident=0):
         (handle, ) = self._readStruct(">L")
diff --git a/tests.py b/tests.py
@@ -116,9 +116,15 @@ def test_arrays(self):
         print classdesc.fields_names
         print classdesc.fields_types
 
-        print pobj.childString
-        print pobj.bool
-        print pobj.integer
+#        public String[] stringArr = {"1", "2", "3"};
+#        public int[] integerArr = {1,2,3};
+#        public boolean[] boolArr = {true, false, true};
+#        public TestConcrete[] concreteArr = {new TestConcrete(), new TestConcrete()};
+
+        print pobj.stringArr
+        print pobj.integerArr
+        print pobj.boolArr
+        print pobj.concreteArr
 
 if __name__ == '__main__':
     unittest.main()
