[Checkins] SVN: Products.CMFCalendar/trunk/Products/CMFCalendar/ - set up vocabulary registry for all functional tests

[Yvo Schubbe]

Log message for revision 127345:
  - set up vocabulary registry for all functional tests

Changed:
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/browser/tests.py
  U   Products.CMFCalendar/trunk/Products/CMFCalendar/testing.py

-=-
Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/browser/tests.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/browser/tests.py	2012-07-16 07:45:18 UTC (rev 127344)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/browser/tests.py	2012-07-16 09:24:24 UTC (rev 127345)
@@ -16,25 +16,12 @@
 import unittest
 from Testing import ZopeTestCase
 
-from Zope2.App.schema import Zope2VocabularyRegistry
-
 from Products.CMFCalendar.testing import FunctionalLayer
 
-def _setupVocabulary(ztc):
-    from zope.schema.vocabulary import setVocabularyRegistry
-    setVocabularyRegistry(Zope2VocabularyRegistry())
 
-def _clearVocabulary(ztc):
-    from zope.schema.vocabulary import _clear
-    _clear()
-    
-
 def test_suite():
     suite = unittest.TestSuite()
-    s = ZopeTestCase.FunctionalDocFileSuite('event.txt',
-                                            setUp=_setupVocabulary,
-                                            tearDown=_clearVocabulary,
-                                           )
+    s = ZopeTestCase.FunctionalDocFileSuite('event.txt')
     s.layer = FunctionalLayer
     suite.addTest(s)
     return suite

Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/testing.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/testing.py	2012-07-16 07:45:18 UTC (rev 127344)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/testing.py	2012-07-16 09:24:24 UTC (rev 127345)
@@ -19,6 +19,7 @@
 
 import transaction
 from Zope2.App import zcml
+from Zope2.App.schema import configure_vocabulary_registry
 
 from Products.CMFCore.testing import FunctionalZCMLLayer
 from Products.CMFDefault.factory import addConfiguredSite
@@ -35,6 +36,7 @@
         zcml.load_config('configure.zcml', Products.CMFCalendar)
         zcml.load_config('configure.zcml', Products.CMFDefault)
         zcml.load_config('configure.zcml', Products.DCWorkflow)
+        configure_vocabulary_registry()
 
         app = ZopeTestCase.app()
         addConfiguredSite(app, 'site', 'Products.CMFDefault:default',