[Checkins] SVN: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/ - make all tests pass by backporting several import changes

[Jens Vagelpohl]

Log message for revision 105535:
  - make all tests pass by backporting several import changes 
    from trunk as well as a method to correctly register 
    vocabularies for tests.
  

Changed:
  U   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/Favorite.py
  U   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/configure.zcml
  U   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/tests/document.txt
  U   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/tests/new_folder.txt
  U   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/tests/test_document.py
  U   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/tests/test_new_folder.py
  U   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/factory.py
  U   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/formlib/form.py
  U   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/RegistrationTool.txt
  U   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/test_DiscussionReply.py
  U   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/test_Image.py
  U   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/test_Portal.py
  U   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/test_join.py

-=-
Modified: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/Favorite.py
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/Favorite.py	2009-11-09 07:37:17 UTC (rev 105534)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/Favorite.py	2009-11-09 08:57:12 UTC (rev 105535)
@@ -20,10 +20,10 @@
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from Acquisition import aq_base
 from App.class_init import InitializeClass
-from zope.app.container.interfaces import IObjectAddedEvent
 from zope.component import adapter
 from zope.component import getUtility
 from zope.component.factory import Factory
+from zope.container.interfaces import IObjectAddedEvent
 from zope.interface import implements
 
 from Products.CMFCore.interfaces import ISiteRoot

Modified: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/configure.zcml
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/configure.zcml	2009-11-09 07:37:17 UTC (rev 105534)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/configure.zcml	2009-11-09 08:57:12 UTC (rev 105535)
@@ -203,7 +203,7 @@
   <adapter
       for="Products.CMFCore.interfaces.IFolderish"
       factory=".folder.PortalFolderNameChooser"
-      provides="zope.app.container.interfaces.INameChooser"
+      provides="zope.container.interfaces.INameChooser"
       />
 
 </configure>

Modified: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/tests/document.txt
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/tests/document.txt	2009-11-09 07:37:17 UTC (rev 105534)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/tests/document.txt	2009-11-09 08:57:12 UTC (rev 105535)
@@ -8,7 +8,7 @@
 
     >>> uf = app.site.acl_users
     >>> uf._doAddUser('mgr', 'mgrpw', ['Manager'], [])
-    >>> from zope.app.component.hooks import setSite
+    >>> from zope.site.hooks import setSite
     >>> setSite(app.site)
 
 Create the browser object we'll be using.

Modified: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/tests/new_folder.txt
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/tests/new_folder.txt	2009-11-09 07:37:17 UTC (rev 105534)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/tests/new_folder.txt	2009-11-09 08:57:12 UTC (rev 105535)
@@ -5,7 +5,7 @@
 
     >>> uf = app.site.acl_users
     >>> uf._doAddUser('mgr', 'mgrpw', ['Manager'], [])
-    >>> from zope.app.component.hooks import setSite
+    >>> from zope.site.hooks import setSite
     >>> setSite(app.site)
 
 Create the browser object we'll be using.

Modified: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/tests/test_document.py
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/tests/test_document.py	2009-11-09 07:37:17 UTC (rev 105534)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/tests/test_document.py	2009-11-09 08:57:12 UTC (rev 105535)
@@ -17,11 +17,25 @@
 
 import unittest
 from Testing import ZopeTestCase
+from Products.Five.schema import Zope2VocabularyRegistry
 
 from Products.CMFDefault.testing import FunctionalLayer
 
 
-ftest_suite = ZopeTestCase.FunctionalDocFileSuite('document.txt')
+def _setupVocabulary(ztc):
+    from zope.schema.vocabulary import setVocabularyRegistry
+    setVocabularyRegistry(Zope2VocabularyRegistry())
+
+def _clearVocabulary(ztc):
+    from zope.schema.vocabulary import _clear
+    _clear()
+
+
+ftest_suite = ZopeTestCase.FunctionalDocFileSuite(
+                'document.txt',
+                setUp=_setupVocabulary,
+                tearDown=_clearVocabulary,
+               )
 ftest_suite.layer = FunctionalLayer
 
 def test_suite():

Modified: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/tests/test_new_folder.py
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/tests/test_new_folder.py	2009-11-09 07:37:17 UTC (rev 105534)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/tests/test_new_folder.py	2009-11-09 08:57:12 UTC (rev 105535)
@@ -175,9 +175,23 @@
 
 
 from Testing import ZopeTestCase
+from Products.Five.schema import Zope2VocabularyRegistry
+
 from Products.CMFDefault.testing import FunctionalLayer
 
-ftest_suite = ZopeTestCase.FunctionalDocFileSuite('new_folder.txt')
+def _setupVocabulary(ztc):
+    from zope.schema.vocabulary import setVocabularyRegistry
+    setVocabularyRegistry(Zope2VocabularyRegistry())
+
+def _clearVocabulary(ztc):
+    from zope.schema.vocabulary import _clear
+    _clear()
+
+ftest_suite = ZopeTestCase.FunctionalDocFileSuite(
+                'new_folder.txt',
+                setUp=_setupVocabulary,
+                tearDown=_clearVocabulary,
+               )
 ftest_suite.layer = FunctionalLayer   
 
 def test_suite():
@@ -187,4 +201,4 @@
                                     ftest_suite,
                                     ))
                  )
-    return suite
\ No newline at end of file
+    return suite

Modified: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/factory.py
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/factory.py	2009-11-09 07:37:17 UTC (rev 105534)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/factory.py	2009-11-09 08:57:12 UTC (rev 105535)
@@ -16,7 +16,7 @@
 """
 
 from Products.PageTemplates.PageTemplateFile import PageTemplateFile
-from zope.app.component.hooks import setSite
+from zope.site.hooks import setSite
 
 from Products.CMFCore.interfaces import ISiteRoot
 from Products.CMFCore.utils import getToolByName

Modified: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/formlib/form.py
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/formlib/form.py	2009-11-09 07:37:17 UTC (rev 105534)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/formlib/form.py	2009-11-09 08:57:12 UTC (rev 105535)
@@ -22,10 +22,10 @@
 from Products.Five.formlib.formbase import PageAddForm
 from Products.Five.formlib.formbase import PageDisplayForm
 from Products.Five.formlib.formbase import PageForm
-from zope.app.container.interfaces import INameChooser
 from zope.component import adapts
 from zope.component import getUtility
 from zope.component.interfaces import IFactory
+from zope.container.interfaces import INameChooser
 from zope.datetime import parseDatetimetz
 from zope.formlib import form
 from zope.formlib.interfaces import IPageForm

Modified: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/RegistrationTool.txt
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/RegistrationTool.txt	2009-11-09 07:37:17 UTC (rev 105534)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/RegistrationTool.txt	2009-11-09 08:57:12 UTC (rev 105535)
@@ -26,7 +26,7 @@
 
   Now we can set up a RegistrationTool with dummy context::
 
-    >>> from zope.app.component.hooks import setSite
+    >>> from zope.site.hooks import setSite
     >>> from zope.component import getSiteManager
     >>> from zope.component import getUtility
     >>> from Products.MailHost.interfaces import IMailHost
@@ -96,7 +96,7 @@
     MIME-Version: 1.0
     Content-Transfer-Encoding: 7bit
     To: <foo at example.org>
-    From: WEBMASTER =?utf-8?b?w4TDlsOc?= <WEBMASTER at EXAMPLE.ORG>
+    From: WEBMASTER =?utf-8?...?= <WEBMASTER at EXAMPLE.ORG>
     Subject: [[cmf_default][WWW.EXAMPLE.ORG: Membership reminder]]
     <BLANKLINE>
     [[cmf_default][Your password: secret]]
@@ -142,10 +142,10 @@
     >>> print s.registered_email()
     Content-Type: text/plain; charset="utf-8"
     MIME-Version: 1.0
-    Content-Transfer-Encoding: base64
+    Content-Transfer-Encoding: ...
     To: <foo at example.org>
-    From: WEBMASTER =?utf-8?b?w4TDlsOc?= <WEBMASTER at EXAMPLE.ORG>
+    From: WEBMASTER =?utf-8?...?= <WEBMASTER at EXAMPLE.ORG>
     Subject: [[cmf_default][WWW.EXAMPLE.ORG: Your Membership Information]]
     <BLANKLINE>
-    W1tj...
+    ...
     <BLANKLINE>

Modified: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/test_DiscussionReply.py
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/test_DiscussionReply.py	2009-11-09 07:37:17 UTC (rev 105534)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/test_DiscussionReply.py	2009-11-09 08:57:12 UTC (rev 105535)
@@ -20,7 +20,7 @@
 
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.SecurityManagement import getSecurityManager
-from zope.app.component.hooks import setSite
+from zope.site.hooks import setSite
 
 from Products.CMFDefault.testing import FunctionalLayer
 

Modified: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/test_Image.py
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/test_Image.py	2009-11-09 07:37:17 UTC (rev 105534)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/test_Image.py	2009-11-09 08:57:12 UTC (rev 105535)
@@ -24,8 +24,8 @@
 import transaction
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.User import UnrestrictedUser
-from zope.app.component.hooks import setSite
 from zope.interface.verify import verifyClass
+from zope.site.hooks import setSite
 from zope.testing.cleanup import cleanUp
 
 from Products.CMFCore.testing import ConformsToContent

Modified: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/test_Portal.py
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/test_Portal.py	2009-11-09 07:37:17 UTC (rev 105534)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/test_Portal.py	2009-11-09 08:57:12 UTC (rev 105535)
@@ -21,7 +21,7 @@
 from AccessControl.SecurityManagement import newSecurityManager
 from AccessControl.User import UnrestrictedUser
 from Acquisition import aq_base
-from zope.app.component.hooks import setSite
+from zope.site.hooks import setSite
 
 from Products.CMFDefault.testing import FunctionalLayer
 

Modified: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/test_join.py
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/test_join.py	2009-11-09 07:37:17 UTC (rev 105534)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/tests/test_join.py	2009-11-09 08:57:12 UTC (rev 105535)
@@ -18,7 +18,7 @@
 import unittest
 from Testing import ZopeTestCase
 
-from zope.app.component.hooks import setSite
+from zope.site.hooks import setSite
 
 from Products.CMFDefault.testing import FunctionalLayer