Index: /main/waeup.sirp/trunk/src/waeup/sirp/widgets/tests/test_phonewidget.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/widgets/tests/test_phonewidget.py	(revision 7409)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/widgets/tests/test_phonewidget.py	(revision 7410)
@@ -49,4 +49,9 @@
         required = True)
 
+    bar = schema.TextLine(
+        title = u'Phone',
+        description = u'Phone number (not required)',
+        required = False)
+
 class SampleContent:
     implements(ISampleContent)
@@ -71,8 +76,11 @@
         self.field = ISampleContent['foo']
         self.field = self.field.bind(self.content)
+        self.field_nonreq = ISampleContent['bar']
+        self.field_nonreq = self.field_nonreq.bind(self.content)
 
         # create an empty request. We need one to create a widget
         self.request = TestRequest()
         self.widget = PhoneWidget(self.field, self.request)
+        self.widget_nonreq = PhoneWidget(self.field_nonreq, self.request)
         return
 
@@ -96,4 +104,5 @@
         self.assertEqual(self.widget.visible, True)
         self.assertEqual(self.widget.required, True)
+        self.assertEqual(self.widget_nonreq.required, False)
         return
 
@@ -422,2 +431,44 @@
         self.assertTrue('value="3333"' in widget())
         return
+
+    def test_render_changed_prefix(self):
+        # when the prefix is changed, the subwidgets will reflect that
+        # properly. This tests a regression: if setPrefix was called
+        # on the phone widget, the subwidgets were already assuming
+        # that there is no data in the request
+        request = TestRequest(form={
+                'field.foo.country': '11',
+                'field.foo.area': '222',
+                'field.foo.extension': '3333'})
+        self.content.foo = u'22-333-4444'
+        widget = PhoneWidget(self.field, request)
+        # when setting a wrong prefix (not in the form), subwidgets
+        # will display the content values assuming (correctly) there
+        # is no data sent for them in the request.
+        widget.setPrefix('not-existent.')
+        self.assertTrue('value="4444"' in widget())
+        # when setting the right prefix, subwidgets will display the
+        # sent form values and not the content values.
+        widget.setPrefix('field.')
+        self.assertTrue('value="3333"' in widget())
+        return
+
+    def test_non_required_no_input(self):
+        # if the bound field requires no input phone widget will cope
+        # with that.
+        class Content(object):
+            field = None
+
+        content = Content()
+        request = TestRequest(form={
+                'field.foo.country': '11',
+                'field.foo.area': '222',
+                'field.foo.extension': '3333'})
+        widget = PhoneWidget(self.field_nonreq, request)
+        result1 = widget.applyChanges(content)
+        result2 = widget.getInputValue()
+        self.assertEqual(result1, True)
+        # without input we get the default value set
+        self.assertEqual(content.bar, u'')
+        self.assertEqual(result2, u'')
+        return
