[Checkins] SVN: Products.CMFCore/branches/2.2/ Removed testing dependency on zope.app.testing (backport from trunk)

[Hano Schlichting]

Log message for revision 126491:
  Removed testing dependency on zope.app.testing (backport from trunk)
  

Changed:
  U   Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt
  U   Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CookieCrumbler.py
  U   Products.CMFCore/branches/2.2/setup.py

-=-
Modified: Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt	2012-05-24 17:50:22 UTC (rev 126490)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/CHANGES.txt	2012-05-24 17:56:17 UTC (rev 126491)
@@ -4,6 +4,8 @@
 2.2.7 (unreleased)
 ------------------
 
+- Removed testing dependency on zope.app.testing.
+
 - Deprecated aliases were replaced on tests.
 
 - Add GenericSetup export/import support for type information action

Modified: Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CookieCrumbler.py
===================================================================
--- Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CookieCrumbler.py	2012-05-24 17:50:22 UTC (rev 126490)
+++ Products.CMFCore/branches/2.2/Products/CMFCore/tests/test_CookieCrumbler.py	2012-05-24 17:56:17 UTC (rev 126491)
@@ -15,9 +15,11 @@
 import unittest
 import Testing
 
-from zope.app.testing.placelesssetup import PlacelessSetup
+from zope.component import eventtesting
 from zope.interface.verify import verifyClass
+from zope.testing.cleanup import cleanUp
 
+
 def makerequest(root, stdout, stdin=None):
     # Customized version of Testing.makerequest.makerequest()
     from cStringIO import StringIO
@@ -36,7 +38,7 @@
     return req
 
 
-class CookieCrumblerTests(unittest.TestCase, PlacelessSetup):
+class CookieCrumblerTests(unittest.TestCase):
 
     _CC_ID = 'cookie_authentication'
 
@@ -53,9 +55,9 @@
         from Products.CMFCore.interfaces import ICookieCrumbler
         from Products.CMFCore.CookieCrumbler import handleCookieCrumblerEvent
 
-        PlacelessSetup.setUp(self)
         self._finally = None
 
+        eventtesting.setUp()
         provideHandler(handleCookieCrumblerEvent,
                        adapts=(ICookieCrumbler, IObjectEvent))
 
@@ -66,7 +68,7 @@
             self._finally()
 
         noSecurityManager()
-        PlacelessSetup.tearDown(self)
+        cleanUp()
 
     def _makeSite(self):
         import base64

Modified: Products.CMFCore/branches/2.2/setup.py
===================================================================
--- Products.CMFCore/branches/2.2/setup.py	2012-05-24 17:50:22 UTC (rev 126490)
+++ Products.CMFCore/branches/2.2/setup.py	2012-05-24 17:56:17 UTC (rev 126491)
@@ -53,11 +53,10 @@
           ],
       tests_require=[
           'zope.testing >= 3.7.0',
-          'zope.app.testing',
           ],
       extras_require=dict(
         test=[
-          'zope.app.testing',
+          'zope.testing',
           ]),
       test_loader='zope.testing.testrunner.eggsupport:SkipLayers',
       test_suite='Products.%s' % NAME,