Adjusting names

src/five/formlib/metaconfigure.py

@@ -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

src/five/formlib/tests/configure.zcml

@@ -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"
       />
 

src/five/formlib/tests/formlib.txt

@@ -19,9 +19,9 @@ this test:
   >>> 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:

src/five/formlib/tests/forms.txt

@@ -9,10 +9,12 @@ manager account:
 
 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:

src/five/formlib/tests/schemacontent.py

@@ -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):

src/five/formlib/tests/test_formlib.py

@@ -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'),
+    ])

src/five/formlib/tests/view.py

@@ -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