Changeset 7849

Timestamp:

12 Mar 2012, 16:19:40 (13 years ago)

Author:

uli

Message:

Fix tests to reflect really expected behaviour with missing_values.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/widgets/tests/test_phonewidget.py (modified) (9 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/widgets/tests/test_phonewidget.py

@@ -44 +44 @@
         title = u'Phone',
         description = u'Phone number',
-        required = True)
+        required = True,
+        default=u'+234-1-1')
 
     bar = schema.TextLine(
@@ -55 +56 @@
         title = u'Phone',
         description = u'Required phone with a default',
-        required = True,
-        #default=u'234--'
+        required = False,
+        #default=u'+234--'
         )
 
@@ -62 +63 @@
     implements(ISampleContent)
 
-    foo = None
-    bar = 'bar'
-    baz = None
+    def __init__(self):
+        self.foo = None
+        self.bar = 'bar'
+        self.baz = None
 
 class PhoneWidgetTests(unittest.TestCase):
@@ -529 +531 @@
     widgets = [
         (ITextLine, TextWidget),
+        (ITextLine, TextWidget),
+        (ITextLine, TextWidget),
         ]
 
     def setUp(self):
         super(PhoneWidget2Tests, self).setUp()
+        # register the phone prefixes utility
         self.gsm = getGlobalSiteManager()
         self.reg_prefixes = PhonePrefixes()
@@ -561 +566 @@
 
         # submit edit view
-        request.form['form.foo.country'] = u'123'
+        request.form['form.foo.country'] = u'+123'
         request.form['form.foo.area'] = u'456'
         request.form['form.foo.ext'] = u'7890'
@@ -568 +573 @@
 
         # check new values in object
-        self.assertEqual(content.foo, u'123-456-7890')
+        self.assertEqual(content.foo, u'+123-456-7890')
         return
 
@@ -577 +582 @@
 
         # submit invalid type for text line
-        request.form['form.foo.country'] = '123'
+        request.form['form.foo.country'] = '+123'
         request.form['form.foo.area'] = '456'
         request.form['form.foo.ext'] = '7890'
@@ -592 +597 @@
         request = TestRequest()
 
-        request.form['form.foo.country'] = u'123'
+        request.form['form.foo.country'] = u'+123'
         request.form['form.foo.area'] = u'456'
         request.form['form.foo.ext'] = u'7890'
@@ -602 +607 @@
         request.form['form.baz.ext'] = u''
         request.form['form.actions.apply'] = u''
+
         SampleForm(content, request)()
 
         # check new values in object
-        self.assertEqual(content.foo, u'123-456-7890')
-        self.assertEqual(content.bar, u'--') # default missing value
-        self.assertEqual(content.baz, u'--')
-        return
+        self.assertEqual(content.foo, u'+123-456-7890')
+        self.assertEqual(content.bar, u'') # default missing value
+        self.assertEqual(content.baz, None)
+        return