- Resolved all my outstanding XXX comments.

- Wrote all final deprecation warnings.
- Made sure that all tests pass without deprecation warnings being raised.

The day of days is nearing! :-)

README.txt

@@ -152,7 +152,7 @@ the title to a repr of the event info:
   >>> def add_info(event):
   ...     event.principal.title = `event.info`
 
-  >>> from zope.app.tests.ztapi import subscribe
+  >>> from zope.app.testing.ztapi import subscribe
   >>> subscribe([interfaces.IPrincipalCreated], None, add_info)
 
 Now, if we authenticate a principal, its title will be set:
@@ -319,7 +319,7 @@ Our pluggable-authentication utility will not find a principal with
 the ID '123'. Therefore it will delegate to the next utility. To make
 sure that it's delegated, we put in place a fake utility.
 
-  >>> from zope.app.utility.utility import testingNextUtility
+  >>> from zope.app.component.testing import testingNextUtility
   >>> from zope.app.security.interfaces import IAuthentication
 
   >>> class FakeAuthUtility:

browser/ftests.py

@@ -18,7 +18,7 @@
 import unittest
 
 def test_suite():
-    from zope.app.tests import functional
+    from zope.app.testing import functional
     return unittest.TestSuite((
         functional.FunctionalDocFileSuite('principalfolder.txt'),
         functional.FunctionalDocFileSuite('groupfolder.txt'),

browser/schemasearch.txt

@@ -3,11 +3,11 @@ The Query View for Schema Search Plugins
 
 Placefull setup for making the search plugin IPhysicallyLocatable:
 
-  >>> from zope.app.tests import ztapi
+  >>> from zope.app.testing import ztapi
   >>> from zope.schema.interfaces import ITextLine
   >>> from zope.app.form.browser import TextWidget
   >>> from zope.app.form.interfaces import IInputWidget
-  >>> from zope.app.tests.setup import placefulSetUp, placefulTearDown
+  >>> from zope.app.testing.setup import placefulSetUp, placefulTearDown
   >>> site = placefulSetUp(True)
   >>> ztapi.browserView(ITextLine, '', TextWidget, providing=IInputWidget)
 

browser/tests.py

@@ -18,7 +18,7 @@
 __docformat__ = "reStructuredText"
 import unittest
 from zope.testing import doctest
-from zope.app.tests.setup import placefulSetUp, placefulTearDown
+from zope.app.testing.setup import placefulSetUp, placefulTearDown
 
 
 def schemaSearchSetUp(self):

browserplugins.py

@@ -168,7 +168,7 @@ class FormChallenger(Persistent, Contained):
 
         First we need a request and a response.
 
-        >>> from zope.app.tests.setup import placefulSetUp
+        >>> from zope.app.testing.setup import placefulSetUp
         >>> site = placefulSetUp(True)
 
 

groupfolder.txt

@@ -65,7 +65,7 @@ is normally called as an event subscriber, when principals are
 created.  In order for `setGroupsForPrincipal` to find out group
 folder, we have to register it as a utility:
 
-  >>> from zope.app.tests import ztapi
+  >>> from zope.app.testing import ztapi
   >>> ztapi.provideUtility(zope.app.authentication.groupfolder.IGroupFolder,
   ...                      groups)
 

tests.py

@@ -25,9 +25,9 @@
 from zope.publisher.tests.httprequest import TestRequest
 
 from zope.app import zapi
-from zope.app.tests import placelesssetup, ztapi
+from zope.app.testing import placelesssetup, ztapi
 from zope.app.event.tests.placelesssetup import getEvents
-from zope.app.tests.setup import placefulSetUp, placefulTearDown
+from zope.app.testing.setup import placefulSetUp, placefulTearDown
 from zope.app.session.interfaces import \
         IClientId, IClientIdManager, ISession, ISessionDataContainer, \
         ISessionPkgData, ISessionData