[pypy-svn] r67556 - pypy/trunk/pypy/jit/metainterp/test

[antocuni at codespeak.net]

Author: antocuni
Date: Mon Sep  7 15:09:25 2009
New Revision: 67556

Modified:
   pypy/trunk/pypy/jit/metainterp/test/test_virtual.py
Log:
enable ootype tests. They all pass


Modified: pypy/trunk/pypy/jit/metainterp/test/test_virtual.py
==============================================================================
--- pypy/trunk/pypy/jit/metainterp/test/test_virtual.py	(original)
+++ pypy/trunk/pypy/jit/metainterp/test/test_virtual.py	Mon Sep  7 15:09:25 2009
@@ -4,6 +4,7 @@
 from pypy.jit.metainterp.test.test_basic import LLJitMixin, OOJitMixin
 from pypy.rpython.lltypesystem import lltype, rclass
 from pypy.rpython.lltypesystem.lloperation import llop
+from pypy.rpython.ootypesystem import ootype
 from pypy.jit.metainterp import heaptracker
 
 class VirtualTests:
@@ -272,9 +273,9 @@
             return f
 
         res = self.meta_interp(f, [21], repeat=7)
-        # hack
-        assert (getattr(res, "inst_value", -100) == f(21).value or
-                getattr(res, "value", -100) == f(21).value)
+
+        fieldname = self._field_prefix + 'value'
+        assert getattr(res, fieldname, -100) == f(21).value
 
         self.check_tree_loop_count(2)      # the loop and the entry path
         # we get:
@@ -285,9 +286,6 @@
         self.check_enter_count(4)
 
 
-##class TestOOtype(VirtualTests, OOJitMixin):
-##    _new = staticmethod(ootype.new)
-
 # ____________________________________________________________
 # Run 1: all the tests instantiate a real RPython class
 
@@ -296,6 +294,17 @@
 
 class TestLLtype_Instance(VirtualTests, LLJitMixin):
     _new_op = 'new_with_vtable'
+    _field_prefix = 'inst_'
+    
+    @staticmethod
+    def _new():
+        return MyClass()
+
+
+class TestOOtype_Instance(VirtualTests, OOJitMixin):
+    _new_op = 'new_with_vtable'
+    _field_prefix = 'o'
+    
     @staticmethod
     def _new():
         return MyClass()
@@ -308,11 +317,25 @@
 
 class TestLLtype_NotObject(VirtualTests, LLJitMixin):
     _new_op = 'new'
-
+    _field_prefix = ''
+    
     @staticmethod
     def _new():
         return lltype.malloc(NODE)
 
+
+OONODE = ootype.Instance('NODE', ootype.ROOT, {})
+OONODE._add_fields({'value': ootype.Signed,
+                    'extra': ootype.Signed})
+
+class TestOOtype_NotObject(VirtualTests, OOJitMixin):
+    _new_op = 'new_with_vtable'
+    _field_prefix = ''
+    
+    @staticmethod
+    def _new():
+        return ootype.new(OONODE)
+
 # ____________________________________________________________
 # Run 3: all the tests use lltype.malloc to make a NODE2
 # (same as Run 2 but it is part of the OBJECT hierarchy)
@@ -326,6 +349,8 @@
 
 class TestLLtype_Object(VirtualTests, LLJitMixin):
     _new_op = 'new_with_vtable'
+    _field_prefix = ''
+    
     @staticmethod
     def _new():
         p = lltype.malloc(NODE2)