arrays

vbuell · vbuell · commit 62aca43cc2e2 · 2011-03-08T08:12:02.000Z
git-svn-id: http://python-javaobj.googlecode.com/svn/trunk@12 003243c8-0679-609b-391f-34f4f14b4f20
diff --git a/eip_tests.py b/eip_tests.py
@@ -16,6 +16,10 @@ def test_0(self):
         print peiping.endpoint(self.simple_generator()).to("")
         peiping.run()
 
+    def test_parsing(self):
+        print peiping.from_ascii("[http:/serv]->(mymethod)->[file:~/serv]")
+        peiping.run()
+
 
 if __name__ == '__main__':
     unittest.main()
diff --git a/java/src/OneTest.java b/java/src/OneTest.java
@@ -12,6 +12,15 @@
 import org.junit.Before;
 import org.junit.Test;
 
+class ArrayClass implements Serializable {
+
+    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()};
+    
+}   
+
 class SuperAaaa implements Serializable {
 
     public String superString = "Super!!";
@@ -166,6 +175,15 @@ public void testSuper() throws Exception {
         oos.writeObject(ts);
         oos.flush();
     }
+    
+    @Test
+    public void testArrays() throws Exception {
+        oos = new ObjectOutputStream(fos = new FileOutputStream("objArrays.ser"));
+        oos.writeObject(new ArrayClass());
+        oos.flush();
+    }
+    
+    
 	
 //    public void test_readObject() throws Exception {
 //        String s = "HelloWorld";
diff --git a/javaobj.py b/javaobj.py
@@ -82,6 +82,7 @@ def __init__(self):
             self.TC_CLASSDESC: self.do_classdesc,
             self.TC_OBJECT: self.do_object,
             self.TC_STRING: self.do_string,
+            self.TC_ARRAY: self.do_array,
             self.TC_CLASS: self.do_class,
             self.TC_BLOCKDATA: self.do_blockdata,
             self.TC_REFERENCE: self.do_reference
@@ -288,6 +289,18 @@ def do_string(self, parent=None, ident=0):
         ba = self._readString()
         return str(ba)
 
+    def do_array(self, parent=None, ident=0):
+        # TC_ARRAY classDesc newHandle (int)<size> values[size]
+        self.print_ident("[array]", ident)
+        classdesc = self.read_and_exec_opcode(ident=ident+1, expect=[self.TC_CLASSDESC, self.TC_PROXYCLASSDESC, self.TC_NULL])
+        (size, ) = self._readStruct(">i")
+        self.print_ident("size: " + str(size), ident)
+        for i in range(size):
+            res = self.read_and_exec_opcode(ident=ident+1)
+            print res
+
+        return None
+
     def do_reference(self, parent=None, ident=0):
         # TODO: Reference isn't supported yed
         (handle, reference) = self._readStruct(">HH")
diff --git a/peiping.py b/peiping.py
@@ -1,3 +1,15 @@
+import re
+import peiping_http as http
+
+uri_map = {
+    "http": http.HttpEndpoint,
+    "cui": http.ConsoleEndpoint,
+    "file": http.FileEndpoint
+}
+
+routes = []
+
+
 class Endpoint():
     def to(self, object):
         print type(object)
@@ -10,4 +22,20 @@ def endpoint(object):
 
 def run():
     for route in routes:
-        route.run()
+        route.run()
+
+def from_ascii(str):
+    pat_endpoint = re.compile(r"\[(.+?)\]")
+    # something like "[http:/serv]->(mymethod)->[file:~/serv]"
+    res = pat_endpoint.findall(str)
+    if res:
+        print res#.group(1)
+    pass
+
+def route(destination):
+  def wrap(function):
+    def wrap_function(self, message):
+      function(self, message)
+    Stomping.add_route(destination, wrap_function)
+    return wrap_function
+  return wrap
diff --git a/peiping_http.py b/peiping_http.py
@@ -0,0 +1,45 @@
+
+
+class Endpoint():
+    def create_producer():
+        pass
+
+    def create_consumer():
+        pass
+
+
+class ConsoleEndpoint(Endpoint):
+    def create_producer():
+        pass
+
+    def create_consumer():
+        pass
+
+class FileEndpoint(Endpoint):
+    def create_producer():
+        pass
+
+    def create_consumer():
+        pass
+
+class HttpEndpoint(Endpoint):
+    def create_producer():
+        pass
+
+    def create_consumer():
+        pass
+
+
+
+class Producer():
+    pass
+
+class HttProducer():
+    # http://93z.org/notes/writing-werkzeug-routing-converter/
+    pass
+
+class FileProducer():
+    pass
+
+class ConsoleProducer():
+    pass
diff --git a/tests.py b/tests.py
@@ -106,5 +106,19 @@ def test_super(self):
         print pobj.bool
         print pobj.integer
 
+    def test_arrays(self):
+        jobj = self.read_file("objArrays.ser")
+        pobj = javaobj.loads(jobj)
+        print pobj
+
+        classdesc = pobj.get_class()
+        print classdesc
+        print classdesc.fields_names
+        print classdesc.fields_types
+
+        print pobj.childString
+        print pobj.bool
+        print pobj.integer
+
 if __name__ == '__main__':
     unittest.main()
