[Checkins] SVN: Products.CMFDefault/trunk/ Removed testing dependency on zope.app.testing.

[Tres Seaver]

Log message for revision 107138:
  Removed testing dependency on zope.app.testing.
  
  Clean out module-scope imports in unit tests.
  

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/tests/test_utils.py
  U   Products.CMFDefault/trunk/setup.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2009-12-27 04:39:57 UTC (rev 107137)
+++ Products.CMFDefault/trunk/Products/CMFDefault/CHANGES.txt	2009-12-27 04:42:25 UTC (rev 107138)
@@ -4,6 +4,8 @@
 2.3.0-alpha (unreleased)
 ------------------------
 
+- Removed testing dependency on zope.app.testing.
+
 - Upgrade steps: Merged faulty utility registration fixup script,
   tool utility registration and new-style actions upgrade from 
   an older migration script in Products.CMFCore for pre-2.1.0 

Modified: Products.CMFDefault/trunk/Products/CMFDefault/tests/test_utils.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/tests/test_utils.py	2009-12-27 04:39:57 UTC (rev 107137)
+++ Products.CMFDefault/trunk/Products/CMFDefault/tests/test_utils.py	2009-12-27 04:42:25 UTC (rev 107138)
@@ -16,13 +16,7 @@
 """
 
 import unittest
-import Testing
 
-from Products.CMFCore.tests.base.content import FAUX_HTML_LEADING_TEXT
-from Products.CMFCore.tests.base.content import SIMPLE_HTML
-from Products.CMFCore.tests.base.content import SIMPLE_STRUCTUREDTEXT
-from Products.CMFCore.tests.base.content import SIMPLE_XHTML
-from Products.CMFCore.tests.base.content import STX_WITH_HTML
 
 
 class DefaultUtilsTests(unittest.TestCase):
@@ -44,6 +38,14 @@
 Header: value
 '''
 
+    def setUp(self):
+        from zope.component.testing import setUp
+        setUp()
+
+    def tearDown(self):
+        from zope.component.testing import tearDown
+        tearDown()
+
     def test_parseHeadersBody_no_body( self ):
         from Products.CMFDefault.utils import parseHeadersBody
 
@@ -145,10 +147,11 @@
                           '<meta name="title" content="" /><meta />' )
 
     def test_scrubHTML_with_adapter(self):
-        from zope.interface import implements
         from zope.component.testing import setUp
         from zope.component.testing import tearDown
-        from zope.app.testing import ztapi
+        from zope.component import getSiteManager
+        from zope.interface import implements
+
         from Products.CMFDefault.interfaces import IHTMLScrubber
         from Products.CMFDefault.utils import scrubHTML
 
@@ -159,8 +162,10 @@
 
 
         setUp()
+
+        sm = getSiteManager()
         try:
-            ztapi.provideUtility(IHTMLScrubber, _Scrubber())
+            sm.registerUtility(_Scrubber(), IHTMLScrubber)
             self.assertEqual( scrubHTML('<a href="foo.html">bar</a>'),
                             '<A HREF="FOO.HTML">BAR</A>' )
             self.assertEqual( scrubHTML('<b>bar</b>'),
@@ -185,6 +190,11 @@
             tearDown()
 
     def test_bodyfinder(self):
+        from Products.CMFCore.tests.base.content import FAUX_HTML_LEADING_TEXT
+        from Products.CMFCore.tests.base.content import SIMPLE_HTML
+        from Products.CMFCore.tests.base.content import SIMPLE_STRUCTUREDTEXT
+        from Products.CMFCore.tests.base.content import SIMPLE_XHTML
+        from Products.CMFCore.tests.base.content import STX_WITH_HTML
         from Products.CMFDefault.utils import bodyfinder
 
         self.assertEqual( bodyfinder(FAUX_HTML_LEADING_TEXT),
@@ -199,6 +209,11 @@
                           '<p>Hello world, I am Bruce.</p>' )
 
     def test_html_headcheck(self):
+        from Products.CMFCore.tests.base.content import FAUX_HTML_LEADING_TEXT
+        from Products.CMFCore.tests.base.content import SIMPLE_HTML
+        from Products.CMFCore.tests.base.content import SIMPLE_STRUCTUREDTEXT
+        from Products.CMFCore.tests.base.content import SIMPLE_XHTML
+        from Products.CMFCore.tests.base.content import STX_WITH_HTML
         from Products.CMFDefault.utils import html_headcheck
 
         self.assertEqual( html_headcheck(FAUX_HTML_LEADING_TEXT), 0 )

Modified: Products.CMFDefault/trunk/setup.py
===================================================================
--- Products.CMFDefault/trunk/setup.py	2009-12-27 04:39:57 UTC (rev 107137)
+++ Products.CMFDefault/trunk/setup.py	2009-12-27 04:42:25 UTC (rev 107138)
@@ -52,7 +52,6 @@
           ],
       tests_require=[
           'zope.testing >= 3.7.0',
-          'zope.app.testing',
           'Products.DCWorkflow',
           ],
       extras_require=dict(