[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/ Vocabulary setup for doctests.

Charlie Clark charlie at begeistert.org
Sat Sep 25 16:45:11 EDT 2010


Log message for revision 116937:
  Vocabulary setup for doctests.

Changed:
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/preferences.txt
  U   Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_preferences.py

-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/preferences.txt
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/preferences.txt	2010-09-25 20:44:45 UTC (rev 116936)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/preferences.txt	2010-09-25 20:45:11 UTC (rev 116937)
@@ -8,16 +8,6 @@
     >>> uf._doAddUser('mbr', 'mbrpw', ['Member'], [])
     >>> mbr_credentials = quote('mbr:mbrpw'.encode('base64').rstrip())
 
-Set up dummy skins vocabulary
-    >>> from zope.schema.interfaces import IVocabularyFactory
-    >>> from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm
-    >>> terms = [SimpleTerm('default', 'default', 'default'),        SimpleTerm('fancy', 'fancy', 'fancy')]
-    >>> vocab = lambda: SimpleVocabulary(terms)
-    >>> from zope.component import getSiteManager
-    >>> sm = getSiteManager()
-    >>> sm.registerUtility(vocab, IVocabularyFactory, u'cmf.portal_skins')
-    >>> from zope.component import getUtility
-
 Create the browser object we'll be using.
 
     # BBB for Zope 2.12
@@ -37,8 +27,6 @@
     
 Open the preferences form. E-mail field should be visible
 
-    >>> # browser.open("http://localhost/site/@@preferences.html")
-    >>> # browser.contents
-    >>> # browser.getControl(name='email').value == ''
+    >>> browser.open("http://localhost/site/@@preferences.html")
+    >>> browser.getControl(name='form.email').value == ''
     True
-    >>> # browser.contents
\ No newline at end of file

Modified: Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_preferences.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_preferences.py	2010-09-25 20:44:45 UTC (rev 116936)
+++ Products.CMFDefault/trunk/Products/CMFDefault/browser/membership/tests/test_preferences.py	2010-09-25 20:45:11 UTC (rev 116937)
@@ -17,6 +17,9 @@
 
 from zope.component.testing import PlacelessSetup
 
+from Products.CMFDefault.browser.content.tests.utils import clearVocabulary
+from Products.CMFDefault.browser.content.tests.utils import setupVocabulary
+
 from Products.CMFDefault.browser.skins.tests.test_ursa import (
                     DummyRequest, DummySite, DummyContext,
                     DummyPropertiesTool, DummyURLTool, DummyActionsTool
@@ -78,7 +81,11 @@
 from Testing import ZopeTestCase
 from Products.CMFDefault.testing import FunctionalLayer
 
-ftest_suite = ZopeTestCase.FunctionalDocFileSuite('preferences.txt')
+ftest_suite = ZopeTestCase.FunctionalDocFileSuite('preferences.txt',
+                setUp=setupVocabulary,
+                tearDown=clearVocabulary,
+                            )
+
 ftest_suite.layer = FunctionalLayer
 
 def test_suite():



More information about the checkins mailing list