[pypy-svn] r18661 - pypy/dist/pypy/rpython/ootypesystem/test

[mwh at codespeak.net]

Author: mwh
Date: Sat Oct 15 20:00:55 2005
New Revision: 18661

Modified:
   pypy/dist/pypy/rpython/ootypesystem/test/test_ooclean.py
Log:
use this llinterpreter in our tests, and an inprogress test.


Modified: pypy/dist/pypy/rpython/ootypesystem/test/test_ooclean.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/test/test_ooclean.py	(original)
+++ pypy/dist/pypy/rpython/ootypesystem/test/test_ooclean.py	Sat Oct 15 20:00:55 2005
@@ -1,6 +1,8 @@
 from pypy.translator.translator import Translator
 from pypy.rpython import lltype
 from pypy.rpython.ootypesystem import ootype
+from pypy.rpython.test.test_llinterp import interpret
+import py
 
 def specialize(f, input_types, viewBefore=False, viewAfter=False):
     t = Translator(f)
@@ -28,7 +30,8 @@
 def test_simple():
     def f(a, b):
         return a + b
-    specialize(f, [int, int])
+    result = interpret(f, [1, 2], type_system='ootype')
+    assert result == 3
 
 def test_simple_call():
     def f(a, b):
@@ -36,7 +39,8 @@
 
     def g():
         return f(5, 3)
-    specialize(g, [])
+    result = interpret(g, [], type_system='ootype')
+    assert result == 8
 
 # Adjusted from test_rclass.py
 class EmptyBase(object):
@@ -46,7 +50,8 @@
     def dummyfn():
         x = EmptyBase()
         return x
-    specialize(dummyfn, [])
+    result = interpret(dummyfn, [], type_system='ootype')
+    assert isinstance(ootype.typeOf(result), ootype.Instance)
 
 
 def test_instance_attribute():
@@ -54,7 +59,8 @@
         x = EmptyBase()
         x.a = 1
         return x.a
-    specialize(dummyfn, [])
+    result = interpret(dummyfn, [], type_system='ootype')
+    assert result == 1
 
 class Subclass(EmptyBase):
     pass
@@ -67,6 +73,16 @@
         y.a = 2
         y.b = 3
         return x.a + y.a + y.b
-    specialize(dummyfn, [])
-    
+    result = interpret(dummyfn, [], type_system='ootype')
+    assert result == 1 + 2 + 3
+
+class HasAMethod(object):
+    def f(self):
+        return 1
         
+def test_method():
+    py.test.skip('in progress')
+    def dummyfn():
+        inst = HasAMethod()
+        return inst.f()
+    specialize(dummyfn, [])#, viewBefore=True)