[Checkins] SVN: Acquisition/trunk/src/Acquisition/tests.py Convert a __parent__ test to proper unittest syntax

[Hanno Schlichting]

Log message for revision 120448:
  Convert a __parent__ test to proper unittest syntax
  

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

-=-
Modified: Acquisition/trunk/src/Acquisition/tests.py
===================================================================
--- Acquisition/trunk/src/Acquisition/tests.py	2011-02-19 15:54:17 UTC (rev 120447)
+++ Acquisition/trunk/src/Acquisition/tests.py	2011-02-19 16:13:16 UTC (rev 120448)
@@ -2397,49 +2397,37 @@
       Traceback (most recent call last):
       ...
       AttributeError: non_existant_attr
-
     """
 
-def test___parent__parent__circles():
-    """
-    Acquisition won't follow circular __parent__ references:
 
-      >>> class Impl(Acquisition.Implicit):
-      ...     hello = 'world'
+import unittest
+from doctest import DocTestSuite, DocFileSuite
 
-      >>> class Impl2(Acquisition.Implicit):
-      ...     hello = 'world2'
-      ...     only = 'here'
 
-      >>> x = Impl()
-      >>> y = Impl2()
-      >>> x.__parent__ = y
-      >>> y.__parent__ = x
+class TestParent(unittest.TestCase):
 
-      >>> x.__parent__.__parent__ is x
-      True
+    def test_parent_parent_circles(self):
+        class Impl(Acquisition.Implicit):
+            hello = 'world'
+        class Impl2(Acquisition.Implicit):
+            hello = 'world2'
+            only = 'here'
 
-      >>> Acquisition.aq_acquire(x, 'hello')
-      'world'
-      >>> Acquisition.aq_acquire(x, 'only')
-      'here'
+        x = Impl()
+        y = Impl2()
+        x.__parent__ = y
+        y.__parent__ = x
 
-      >>> Acquisition.aq_acquire(x, 'non_existant_attr')
-      Traceback (most recent call last):
-      ...
-      AttributeError: non_existant_attr
+        self.assertTrue(x.__parent__.__parent__ is x)
+        self.assertEqual(Acquisition.aq_acquire(x, 'hello'), 'world')
+        self.assertEqual(Acquisition.aq_acquire(x, 'only'), 'here')
 
-      >>> Acquisition.aq_acquire(y, 'non_existant_attr')
-      Traceback (most recent call last):
-      ...
-      AttributeError: non_existant_attr
-    """
+        self.assertRaises(AttributeError, Acquisition.aq_acquire,
+            x, 'non_existant_attr')
+        self.assertRaises(AttributeError, Acquisition.aq_acquire,
+            y, 'non_existant_attr')
 
 
-import unittest
-from doctest import DocTestSuite, DocFileSuite
-
-
 class TestUnicode(unittest.TestCase):
 
     def test_implicit_aq_unicode_should_be_called(self):
@@ -2479,5 +2467,6 @@
     return unittest.TestSuite((
         DocTestSuite(),
         DocFileSuite('README.txt', package='Acquisition'),
+        unittest.makeSuite(TestParent),
         unittest.makeSuite(TestUnicode),
         ))