[pypy-svn] r62432 - in pypy/trunk/pypy: interpreter/test module/__builtin__/test

[hpk at codespeak.net]

Author: hpk
Date: Mon Mar  2 23:54:16 2009
New Revision: 62432

Modified:
   pypy/trunk/pypy/interpreter/test/test_module.py
   pypy/trunk/pypy/module/__builtin__/test/test_builtin.py
Log:
some examples for using space argument directly and getting rid of Class/Instance setup_*


Modified: pypy/trunk/pypy/interpreter/test/test_module.py
==============================================================================
--- pypy/trunk/pypy/interpreter/test/test_module.py	(original)
+++ pypy/trunk/pypy/interpreter/test/test_module.py	Mon Mar  2 23:54:16 2009
@@ -2,24 +2,20 @@
 from pypy.interpreter.module import Module
 
 class TestModule: 
-    def setup_class(cls):
-        cls.m = Module(cls.space, cls.space.wrap('m'))
-    def teardown_class(cls):
-        del cls.m 
-
-    def test_name(self):
-        w = self.space.wrap
-        w_m = w(self.m)
-        assert self.space.eq_w(self.space.getattr(w_m, w('__name__')), w('m'))
-
-    def test_attr(self):
-        w = self.space.wrap
-        w_m = w(self.m)
+    def test_name(self, space):
+        w = space.wrap
+        m = Module(space, space.wrap('m'))
+        w_m = w(m)
+        assert space.eq_w(space.getattr(w_m, w('__name__')), w('m'))
+
+    def test_attr(self, space):
+        w = space.wrap
+        w_m = w(Module(space, space.wrap('m')))
         self.space.setattr(w_m, w('x'), w(15))
-        assert self.space.eq_w(self.space.getattr(w_m, w('x')), w(15))
-        self.space.delattr(w_m, w('x'))
-        self.space.raises_w(self.space.w_AttributeError,
-                            self.space.delattr, w_m, w('x'))
+        assert space.eq_w(space.getattr(w_m, w('x')), w(15))
+        space.delattr(w_m, w('x'))
+        space.raises_w(space.w_AttributeError,
+                       space.delattr, w_m, w('x'))
 
 class AppTest_ModuleObject: 
     def test_attr(self):

Modified: pypy/trunk/pypy/module/__builtin__/test/test_builtin.py
==============================================================================
--- pypy/trunk/pypy/module/__builtin__/test/test_builtin.py	(original)
+++ pypy/trunk/pypy/module/__builtin__/test/test_builtin.py	Mon Mar  2 23:54:16 2009
@@ -545,30 +545,21 @@
 
 
 class TestInternal:
-
-    def setup_method(self,method):
-        space = self.space
-
-    def get_builtin(self, name):
-        return self.space.builtin.get(name) 
-
-    def test_execfile(self):
+    def test_execfile(self, space):
         from pypy.tool.udir import udir
         fn = str(udir.join('test_execfile'))
         f = open(fn, 'w')
         print >>f, "i=42"
         f.close()
 
-        w_execfile = self.get_builtin('execfile')
-        space = self.space
+        w_execfile = space.builtin.get("execfile")
         w_dict = space.newdict()
-        self.space.call_function(w_execfile,
+        space.call_function(w_execfile,
             space.wrap(fn), w_dict, space.w_None)
         w_value = space.getitem(w_dict, space.wrap('i'))
-        assert self.space.eq_w(w_value, space.wrap(42))
+        assert space.eq_w(w_value, space.wrap(42))
 
-    def test_execfile_different_lineendings(self): 
-        space = self.space
+    def test_execfile_different_lineendings(self, space): 
         from pypy.tool.udir import udir
         d = udir.ensure('lineending', dir=1)
         dos = d.join('dos.py')