[Checkins] SVN: five.customerize/trunk/ Made tests compatible with Zope 2.13 and avoid deprecation warnings.

[Hanno Schlichting]

Log message for revision 113399:
  Made tests compatible with Zope 2.13 and avoid deprecation warnings.
  

Changed:
  U   five.customerize/trunk/CHANGES.txt
  U   five.customerize/trunk/src/five/customerize/browser.txt
  U   five.customerize/trunk/src/five/customerize/customerize.txt
  U   five.customerize/trunk/src/five/customerize/tests.py
  U   five.customerize/trunk/src/five/customerize/zpt.txt

-=-
Modified: five.customerize/trunk/CHANGES.txt
===================================================================
--- five.customerize/trunk/CHANGES.txt	2010-06-12 16:56:57 UTC (rev 113398)
+++ five.customerize/trunk/CHANGES.txt	2010-06-12 18:27:02 UTC (rev 113399)
@@ -4,6 +4,8 @@
 1.0b2 - unreleased
 ------------------
 
+- Made tests compatible with Zope 2.13 and avoid deprecation warnings.
+  [hannosch]
 
 1.0b1 - 2010-05-01
 ------------------

Modified: five.customerize/trunk/src/five/customerize/browser.txt
===================================================================
--- five.customerize/trunk/src/five/customerize/browser.txt	2010-06-12 16:56:57 UTC (rev 113398)
+++ five.customerize/trunk/src/five/customerize/browser.txt	2010-06-12 18:27:02 UTC (rev 113399)
@@ -10,20 +10,7 @@
     >>> from zope.testing import module
     >>> module.setUp(test, name='five.customerize.browsertest')
 
-Load all of Five's configuration (this is a functional test):
 
-    >>> import Products.Five
-    >>> import five.customerize
-    >>> from Products.Five.zcml import load_config
-    >>> load_config('configure.zcml', package=Products.Five)
-    >>> load_config('configure.zcml', package=five.customerize)
-
-Enable local component lookup hooks:
-
-    >>> from zope.site.hooks import setHooks
-    >>> setHooks()
-
-
 Making a site
 -------------
 
@@ -32,7 +19,12 @@
 
 Create the test browser we'll be using:
 
-    >>> from Products.Five.testbrowser import Browser
+    # BBB Zope 2.12
+    >>> try:
+    ...     from Testing.testbrowser import Browser
+    ... except ImportError:
+    ...     from Products.Five.testbrowser import Browser
+
     >>> browser = Browser()
     >>> browser.addHeader('Authorization', 'Basic manager:r00t')
 

Modified: five.customerize/trunk/src/five/customerize/customerize.txt
===================================================================
--- five.customerize/trunk/src/five/customerize/customerize.txt	2010-06-12 16:56:57 UTC (rev 113398)
+++ five.customerize/trunk/src/five/customerize/customerize.txt	2010-06-12 18:27:02 UTC (rev 113399)
@@ -21,14 +21,6 @@
 Setup
 -----
 
-Before we can start we need to load some important ZCML:
-
-  >>> from Products.Five import zcml
-  >>> import Products.Five.component
-  >>> import five.customerize
-  >>> zcml.load_config('configure.zcml', Products.Five)
-  >>> zcml.load_config('configure.zcml', five.customerize)
-
 Make this test a usable module
 
   >>> from zope.testing import module
@@ -224,7 +216,13 @@
   ...     def foo_method(self):
   ...         return 'baz'
   >>> from Products.Five.browser.metaconfigure import makeClassForTemplate
-  >>> from Products.Five.security import getSecurityInfo, protectClass
+
+  # BBB Zope 2.12
+  >>> try:
+  ...     from AccessControl.security import getSecurityInfo, protectClass
+  ... except ImportError:
+  ...     from Products.Five.security import getSecurityInfo, protectClass
+
   >>> from App.class_init import InitializeClass
   >>> cdict = getSecurityInfo(TestView)
   >>> cdict['__name__'] = 'simpleview.html'

Modified: five.customerize/trunk/src/five/customerize/tests.py
===================================================================
--- five.customerize/trunk/src/five/customerize/tests.py	2010-06-12 16:56:57 UTC (rev 113398)
+++ five.customerize/trunk/src/five/customerize/tests.py	2010-06-12 18:27:02 UTC (rev 113399)
@@ -6,22 +6,37 @@
 from zope.traversing.adapters import DefaultTraversable
 from zope.publisher.browser import BrowserLanguages
 from zope.publisher.http import HTTPCharsets
+from zope.site.hooks import setHooks
 
-__docformat__ = "reStructuredText"
+# BBB Zope 2.12
+try:
+    from Zope2.App.zcml import load_config
+    load_config # pyflakes
+except ImportError:
+    from Products.Five.zcml import load_config
 
+
 def setUp(test):
     testing.setUp(test)
     provideAdapter(DefaultTraversable, (None,))
     provideAdapter(BrowserLanguages)
     provideAdapter(HTTPCharsets)
 
+    import Products.Five
+    import five.customerize
+    load_config('configure.zcml', package=Products.Five)
+    load_config('configure.zcml', package=five.customerize)
+    setHooks()
+
+
 def test_suite():
     return TestSuite([
-        #DocTestSuite('five.customerize.browser'),
         ZopeDocFileSuite('zpt.txt', package="five.customerize",
                          setUp=setUp, tearDown=testing.tearDown),
-        ZopeDocFileSuite('customerize.txt', package="five.customerize"),
-        FunctionalDocFileSuite('browser.txt', package="five.customerize")
+        ZopeDocFileSuite('customerize.txt', package="five.customerize",
+                         setUp=setUp),
+        FunctionalDocFileSuite('browser.txt', package="five.customerize",
+                               setUp=setUp)
         ])
 
 if __name__ == '__main__':

Modified: five.customerize/trunk/src/five/customerize/zpt.txt
===================================================================
--- five.customerize/trunk/src/five/customerize/zpt.txt	2010-06-12 16:56:57 UTC (rev 113398)
+++ five.customerize/trunk/src/five/customerize/zpt.txt	2010-06-12 18:27:02 UTC (rev 113399)
@@ -26,4 +26,3 @@
     test_folder_1_
     bar
     None
-