[Checkins] SVN: Acquisition/trunk/src/Acquisition/tests.py Expand tests, only test_explicit_wrapper_(true|false) segfault

[Hanno Schlichting]

Log message for revision 121912:
  Expand tests, only test_explicit_wrapper_(true|false) segfault
  

Changed:
  U   Acquisition/trunk/src/Acquisition/tests.py

-=-
Modified: Acquisition/trunk/src/Acquisition/tests.py
===================================================================
--- Acquisition/trunk/src/Acquisition/tests.py	2011-06-11 15:00:14 UTC (rev 121911)
+++ Acquisition/trunk/src/Acquisition/tests.py	2011-06-11 15:09:38 UTC (rev 121912)
@@ -2466,49 +2466,38 @@
 
 class TestAcquire(unittest.TestCase):
 
-    def test_explicit_default(self):
+    def setUp(self):
         class Impl(Acquisition.Implicit):
             pass
         class Expl(Acquisition.Explicit):
             pass
-
         a = Impl('a')
         a.y = 42
         a.b = Expl('b')
         a.b.z = 3
         a.b.c = Impl('c')
-        value = a.b.c.aq_acquire('z')
-        self.assertEqual(value, 3)
+        self.a = a
+        self.acquire = Acquisition.aq_acquire
 
-    def test_explicit_true(self):
-        class Impl(Acquisition.Implicit):
-            pass
-        class Expl(Acquisition.Explicit):
-            pass
+    def test_explicit_module_default(self):
+        self.assertEqual(self.acquire(self.a.b.c, 'z'), 3)
 
-        a = Impl('a')
-        a.y = 42
-        a.b = Expl('b')
-        a.b.z = 3
-        a.b.c = Impl('c')
-        value = a.b.c.aq_acquire('z', explicit=True)
-        self.assertEqual(value, 3)
+    def test_explicit_module_true(self):
+        self.assertEqual(self.acquire(self.a.b.c, 'z', explicit=True), 3)
 
-    def test_explicit_false(self):
-        class Impl(Acquisition.Implicit):
-            pass
-        class Expl(Acquisition.Explicit):
-            pass
+    def test_explicit_module_false(self):
+        self.assertEqual(self.acquire(self.a.b.c, 'z', explicit=False), 3)
 
-        a = Impl('a')
-        a.y = 42
-        a.b = Expl('b')
-        a.b.z = 3
-        a.b.c = Impl('c')
-        value = a.b.c.aq_acquire('z', explicit=False)
-        self.assertEqual(value, 3)
+    def test_explicit_wrapper_default(self):
+        self.assertEqual(self.a.b.c.aq_acquire('z'), 3)
 
+    def test_explicit_wrapper_true(self):
+        self.assertEqual(self.a.b.c.aq_acquire('z', explicit=True), 3)
 
+    def test_explicit_wrapper_false(self):
+        self.assertEqual(self.a.b.c.aq_acquire('z', explicit=False), 3)
+
+
 class TestUnicode(unittest.TestCase):
 
     def test_implicit_aq_unicode_should_be_called(self):