TC_Exception test added

Author: vbuell

java/src/OneTest.java

@@ -12,6 +12,27 @@
 import org.junit.Before;
 import org.junit.Test;
 
+class MyExceptionWhenDumping implements java.io.Serializable {
+    private static class MyException extends java.io.IOException {
+    };
+
+    public boolean anInstanceVar = false;
+
+    public MyExceptionWhenDumping() {
+        super();
+    }
+
+    private void readObject(java.io.ObjectInputStream in)
+            throws java.io.IOException, ClassNotFoundException {
+        in.defaultReadObject();
+    }
+
+    private void writeObject(java.io.ObjectOutputStream out)
+            throws java.io.IOException, ClassNotFoundException {
+        throw new MyException();
+    }
+}
+
 enum Color
 {
     RED("RED"), GREEN("GREEN"), BLUE("BLUE"), UNKNOWN("UNKNOWN");
@@ -197,6 +218,15 @@ public void testEnums() throws Exception {
         oos.flush();
     }
 
+    @Test
+    public void testException() throws Exception {
+        oos = new ObjectOutputStream(fos = new FileOutputStream("objException.ser"));
+        MyExceptionWhenDumping ts = new MyExceptionWhenDumping();
+
+        oos.writeObject(ts);
+        oos.flush();
+    }
+
 //    public void test_readObject() throws Exception {
 //        String s = "HelloWorld";
 //        oos.writeObject(s);

javaobj.py

@@ -75,6 +75,14 @@ class JavaObject(object):
     def get_class(self):
         return self.classdesc
 
+    def __str__(self):
+        return self.__repr__()
+
+    def __repr__(self):
+        name = "UNKNOWN"
+        if self.classdesc:
+            name = self.classdesc.name
+        return "<javaobj:%s>" % name
 
 class JavaObjectConstants:
 
@@ -232,21 +240,23 @@ def do_classdesc(self, parent=None, ident=0):
         clazz.fields_names = []
         clazz.fields_types = []
         for fieldId in range(length):
-            (type, ) = self._readStruct(">B")
+            (typecode, ) = self._readStruct(">B")
             field_name = self._readString()
             field_type = None
-            field_type = self._convert_char_to_type(type)
+            field_type = self._convert_char_to_type(typecode)
 
             if field_type == self.TYPE_ARRAY:
                 field_type = self._read_and_exec_opcode(ident=ident+1, expect=[self.TC_STRING, self.TC_REFERENCE])
+                assert type(field_type) is str
 #                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])
+                assert type(field_type) is str
 
-            log_debug("FieldName: 0x%X" % type + " " + str(field_name) + " " + str(field_type), ident)
+            log_debug("FieldName: 0x%X" % typecode + " " + str(field_name) + " " + str(field_type), ident)
             assert field_name is not None
             assert field_type is not None
 
@@ -257,9 +267,9 @@ def do_classdesc(self, parent=None, ident=0):
             parent.__types = clazz.fields_types
         # classAnnotation
         (opid, ) = self._readStruct(">B")
+        log_debug("OpCode: 0x%X" % opid, ident)
         if opid != self.TC_ENDBLOCKDATA:
             raise NotImplementedError("classAnnotation isn't implemented yet")
-        log_debug("OpCode: 0x%X" % opid, ident)
         # superClassDesc
         superclassdesc = self._read_and_exec_opcode(ident=ident+1, expect=[self.TC_CLASSDESC, self.TC_NULL, self.TC_REFERENCE])
         log_debug(str(superclassdesc), ident)
@@ -310,6 +320,7 @@ def do_object(self, parent=None, ident=0):
             megatypes = []
             while tempclass:
                 log_debug(">>> " + str(tempclass.fields_names) + " " + str(tempclass), ident)
+                log_debug(">>> " + str(tempclass.fields_types), ident)
                 fieldscopy = tempclass.fields_names[:]
                 fieldscopy.extend(megalist)
                 megalist = fieldscopy
@@ -331,12 +342,17 @@ def do_object(self, parent=None, ident=0):
         if classdesc.flags & self.SC_SERIALIZABLE and classdesc.flags & self.SC_WRITE_METHOD or classdesc.flags & self.SC_EXTERNALIZABLE and classdesc.flags & self.SC_BLOCK_DATA:
             # objectAnnotation
             (opid, ) = self._readStruct(">B")
-            if opid != self.TC_ENDBLOCKDATA: # 0x78:
+            log_debug("OpCode: 0x%X" % opid, ident)
+            if opid == self.TC_ENDBLOCKDATA: # 0x78:
+                log_debug("TC_ENDBLOCKDATA: no object annotation")
+            elif opid == self.TC_OBJECT:
+                self.object_stream.seek(-1, mode=1)
+                obj = self._read_and_exec_opcode(ident=ident+1, expect=[self.TC_OBJECT, self.TC_NULL, self.TC_REFERENCE])
+                log_debug("objectAnnotation: " + str(obj))
+            else:
                 self.object_stream.seek(-1, mode=1)
-#                print self._create_hexdump(self.object_stream.read())
                 raise NotImplementedError("objectAnnotation isn't fully implemented yet") # TODO:
 
-
         return java_object
 
     def do_string(self, parent=None, ident=0):

objException.ser

@@ -137,6 +137,16 @@ def test_enums(self):
         print classdesc.fields_names
         print classdesc.fields_types
 
+    def test_exception(self):
+        jobj = self.read_file("objException.ser")
+        pobj = javaobj.loads(jobj)
+        print pobj
+
+        classdesc = pobj.get_class()
+        print classdesc
+        print classdesc.fields_names
+        print classdesc.fields_types
+
     def test_sun_example(self):
         marshaller = javaobj.JavaObjectUnmarshaller(open("sunExample.ser"))
         pobj = marshaller.readObject()