[Checkins] SVN: five.formlib/trunk/src/five/formlib/ Adjusting names
Hanno Schlichting
hannosch at hannosch.eu
Sat Dec 26 17:08:12 EST 2009
Log message for revision 107125:
Adjusting names
Changed:
U five.formlib/trunk/src/five/formlib/metaconfigure.py
U five.formlib/trunk/src/five/formlib/tests/configure.zcml
U five.formlib/trunk/src/five/formlib/tests/formlib.txt
U five.formlib/trunk/src/five/formlib/tests/forms.txt
U five.formlib/trunk/src/five/formlib/tests/schemacontent.py
U five.formlib/trunk/src/five/formlib/tests/test_formlib.py
D five.formlib/trunk/src/five/formlib/tests/test_forms.py
U five.formlib/trunk/src/five/formlib/tests/view.py
-=-
Modified: five.formlib/trunk/src/five/formlib/metaconfigure.py
===================================================================
--- five.formlib/trunk/src/five/formlib/metaconfigure.py 2009-12-26 21:49:19 UTC (rev 107124)
+++ five.formlib/trunk/src/five/formlib/metaconfigure.py 2009-12-26 22:08:11 UTC (rev 107125)
@@ -30,7 +30,7 @@
from AccessControl.security import protectClass
-from Products.Five.form import EditView, AddView
+from five.formlib import EditView, AddView
from Products.Five.metaclass import makeClass
from Products.Five.browser.pagetemplatefile import ZopeTwoPageTemplateFile
from Products.Five.browser.metaconfigure import makeClassForTemplate
Modified: five.formlib/trunk/src/five/formlib/tests/configure.zcml
===================================================================
--- five.formlib/trunk/src/five/formlib/tests/configure.zcml 2009-12-26 21:49:19 UTC (rev 107124)
+++ five.formlib/trunk/src/five/formlib/tests/configure.zcml 2009-12-26 22:08:11 UTC (rev 107125)
@@ -31,7 +31,7 @@
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.IObject"
provides="zope.app.form.interfaces.IInputWidget"
- factory="Products.Five.form.objectwidget.ObjectWidget"
+ factory="five.formlib.objectwidget.ObjectWidget"
permission="zope.Public"
/>
Modified: five.formlib/trunk/src/five/formlib/tests/formlib.txt
===================================================================
--- five.formlib/trunk/src/five/formlib/tests/formlib.txt 2009-12-26 21:49:19 UTC (rev 107124)
+++ five.formlib/trunk/src/five/formlib/tests/formlib.txt 2009-12-26 22:08:11 UTC (rev 107125)
@@ -19,9 +19,9 @@
>>> from Products.Five import zcml
>>> import Products.Five
>>> zcml.load_config('meta.zcml', Products.Five)
- >>> import Products.Five.form.tests
+ >>> import five.formlib.tests
>>> zcml.load_config('configure.zcml', package=Products.Five)
- >>> zcml.load_config('configure.zcml', package=Products.Five.formlib.tests)
+ >>> zcml.load_config('configure.zcml', package=five.formlib.tests)
Finally, we need to setup a traversable folder. Otherwise, Five won't get
to to do its view lookup:
Modified: five.formlib/trunk/src/five/formlib/tests/forms.txt
===================================================================
--- five.formlib/trunk/src/five/formlib/tests/forms.txt 2009-12-26 21:49:19 UTC (rev 107124)
+++ five.formlib/trunk/src/five/formlib/tests/forms.txt 2009-12-26 22:08:11 UTC (rev 107125)
@@ -9,10 +9,12 @@
We need to configure all of Five for the functional test:
- >>> import Products.Five.form.tests
>>> from Products.Five import zcml
+ >>> import Products.Five
+ >>> zcml.load_config('meta.zcml', Products.Five)
+ >>> import five.formlib.tests
>>> zcml.load_config('configure.zcml', package=Products.Five)
- >>> zcml.load_config('configure.zcml', package=Products.Five.form.tests)
+ >>> zcml.load_config('configure.zcml', package=five.formlib.tests)
Finally, we need to setup a traversable folder. Otherwise, Five won't
get to to do its view lookup:
Modified: five.formlib/trunk/src/five/formlib/tests/schemacontent.py
===================================================================
--- five.formlib/trunk/src/five/formlib/tests/schemacontent.py 2009-12-26 21:49:19 UTC (rev 107124)
+++ five.formlib/trunk/src/five/formlib/tests/schemacontent.py 2009-12-26 22:08:11 UTC (rev 107125)
@@ -17,13 +17,14 @@
"""
from App.class_init import InitializeClass
from OFS.SimpleItem import SimpleItem
-from Products.Five.form.objectwidget import ObjectWidget
from zope.i18nmessageid import MessageFactory
from zope.interface import implements, Interface
from zope.schema import TextLine, Text, Object, Int, List
from zope.app.form import CustomWidgetFactory
+from five.formlib.objectwidget import ObjectWidget
+
_ = MessageFactory('formtest')
class IFieldContent(Interface):
Modified: five.formlib/trunk/src/five/formlib/tests/test_formlib.py
===================================================================
--- five.formlib/trunk/src/five/formlib/tests/test_formlib.py 2009-12-26 21:49:19 UTC (rev 107124)
+++ five.formlib/trunk/src/five/formlib/tests/test_formlib.py 2009-12-26 22:08:11 UTC (rev 107125)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2006 Zope Corporation and Contributors.
+# Copyright (c) 2004, 2005 Zope Corporation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -16,10 +16,57 @@
$Id$
"""
+import unittest
+from zope.testing.doctest import DocTestSuite
+from Testing.ZopeTestCase import FunctionalDocFileSuite
+
+
+def test_get_widgets_for_schema_fields():
+ """
+ Test widget lookup for schema fields
+
+ First, load the configuration files:
+
+ >>> import Products.Five
+ >>> from Products.Five import zcml
+ >>> zcml.load_config('configure.zcml', Products.Five)
+
+ Now for some actual testing...
+
+ >>> from zope.schema import Choice, TextLine
+ >>> salutation = Choice(title=u'Salutation',
+ ... values=("Mr.", "Mrs.", "Captain", "Don"))
+ >>> contactname = TextLine(title=u'Name')
+
+ >>> from zope.publisher.browser import TestRequest
+ >>> request = TestRequest()
+ >>> salutation = salutation.bind(request)
+ >>> contactname = contactname.bind(request)
+
+ >>> from zope.component import getMultiAdapter
+ >>> from zope.app.form.interfaces import IInputWidget
+ >>> from zope.app.form.browser.textwidgets import TextWidget
+ >>> from zope.app.form.browser.itemswidgets import DropdownWidget
+
+ >>> view1 = getMultiAdapter((contactname, request), IInputWidget)
+ >>> view1.__class__ == TextWidget
+ True
+
+ >>> view2 = getMultiAdapter((salutation, request), IInputWidget)
+ >>> view2.__class__ == DropdownWidget
+ True
+
+ Clean up:
+
+ >>> from zope.component.testing import tearDown
+ >>> tearDown()
+ """
+
def test_suite():
- import unittest
- from Testing.ZopeTestCase import FunctionalDocFileSuite
- return unittest.TestSuite((
+ return unittest.TestSuite([
+ DocTestSuite(),
+ FunctionalDocFileSuite('forms.txt',
+ package="five.formlib.tests",),
FunctionalDocFileSuite(
- 'formlib.txt', package='Products.Five.formlib.tests'),
- ))
+ 'formlib.txt', package='five.formlib.tests'),
+ ])
Deleted: five.formlib/trunk/src/five/formlib/tests/test_forms.py
===================================================================
--- five.formlib/trunk/src/five/formlib/tests/test_forms.py 2009-12-26 21:49:19 UTC (rev 107124)
+++ five.formlib/trunk/src/five/formlib/tests/test_forms.py 2009-12-26 22:08:11 UTC (rev 107125)
@@ -1,68 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2004, 2005 Zope Corporation and Contributors.
-# All Rights Reserved.
-#
-# This software is subject to the provisions of the Zope Public License,
-# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
-# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE.
-#
-##############################################################################
-"""Test forms
-
-$Id$
-"""
-
-def test_get_widgets_for_schema_fields():
- """
- Test widget lookup for schema fields
-
- First, load the configuration files:
-
- >>> import Products.Five
- >>> from Products.Five import zcml
- >>> zcml.load_config('configure.zcml', Products.Five)
-
- Now for some actual testing...
-
- >>> from zope.schema import Choice, TextLine
- >>> salutation = Choice(title=u'Salutation',
- ... values=("Mr.", "Mrs.", "Captain", "Don"))
- >>> contactname = TextLine(title=u'Name')
-
- >>> from zope.publisher.browser import TestRequest
- >>> request = TestRequest()
- >>> salutation = salutation.bind(request)
- >>> contactname = contactname.bind(request)
-
- >>> from zope.component import getMultiAdapter
- >>> from zope.app.form.interfaces import IInputWidget
- >>> from zope.app.form.browser.textwidgets import TextWidget
- >>> from zope.app.form.browser.itemswidgets import DropdownWidget
-
- >>> view1 = getMultiAdapter((contactname, request), IInputWidget)
- >>> view1.__class__ == TextWidget
- True
-
- >>> view2 = getMultiAdapter((salutation, request), IInputWidget)
- >>> view2.__class__ == DropdownWidget
- True
-
- Clean up:
-
- >>> from zope.component.testing import tearDown
- >>> tearDown()
- """
-
-def test_suite():
- import unittest
- from zope.testing.doctest import DocTestSuite
- from Testing.ZopeTestCase import FunctionalDocFileSuite
- return unittest.TestSuite((
- DocTestSuite(),
- FunctionalDocFileSuite('forms.txt',
- package="Products.Five.form.tests",),
- ))
Modified: five.formlib/trunk/src/five/formlib/tests/view.py
===================================================================
--- five.formlib/trunk/src/five/formlib/tests/view.py 2009-12-26 21:49:19 UTC (rev 107124)
+++ five.formlib/trunk/src/five/formlib/tests/view.py 2009-12-26 22:08:11 UTC (rev 107125)
@@ -17,8 +17,8 @@
"""
from zope.formlib import form
-from Products.Five.formlib.formbase import AddForm, EditForm
-from Products.Five.formlib.tests.content import IContent, Content
+from five.formlib.formbase import AddForm, EditForm
+from five.formlib.tests.content import IContent, Content
class AddContentForm(AddForm):
"""AddForm for creating and adding IContent objects
More information about the checkins
mailing list