[Checkins] SVN: Products.CMF Use the new Products.Five.schema vocabulary registry cleanly when testing.
Tres Seaver
tseaver at palladion.com
Fri Sep 18 18:43:32 EDT 2009
Log message for revision 104367:
Use the new Products.Five.schema vocabulary registry cleanly when testing.
Changed:
U Products.CMFCalendar/trunk/Products/CMFCalendar/browser/tests.py
U Products.CMFDefault/trunk/Products/CMFDefault/browser/tests/test_document.py
-=-
Modified: Products.CMFCalendar/trunk/Products/CMFCalendar/browser/tests.py
===================================================================
--- Products.CMFCalendar/trunk/Products/CMFCalendar/browser/tests.py 2009-09-18 22:40:23 UTC (rev 104366)
+++ Products.CMFCalendar/trunk/Products/CMFCalendar/browser/tests.py 2009-09-18 22:43:32 UTC (rev 104367)
@@ -17,13 +17,25 @@
import unittest
from Testing import ZopeTestCase
+from Products.Five.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')
+ s = ZopeTestCase.FunctionalDocFileSuite('event.txt',
+ setUp=_setupVocabulary,
+ tearDown=_clearVocabulary,
+ )
s.layer = FunctionalLayer
suite.addTest(s)
return suite
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/tests/test_document.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/tests/test_document.py 2009-09-18 22:40:23 UTC (rev 104366)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/tests/test_document.py 2009-09-18 22:43:32 UTC (rev 104367)
@@ -17,11 +17,24 @@
import unittest
from Testing import ZopeTestCase
+from Products.Five.schema import Zope2VocabularyRegistry
from Products.CMFDefault.testing import FunctionalLayer
+def _setupVocabulary(ztc):
+ from zope.schema.vocabulary import setVocabularyRegistry
+ setVocabularyRegistry(Zope2VocabularyRegistry())
-ftest_suite = ZopeTestCase.FunctionalDocFileSuite('document.txt')
+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():
More information about the checkins
mailing list