Changeset 237

Timestamp:

07/04/06 16:08:25 (3 years ago)

Author:

matt

Message:

Check the number of values Composite is asked to validate to ensure that the
final dict will be correct.

Files:

• branches/composite/formal/examples/composite.py (modified) (1 diff)
• branches/composite/formal/test/test_types.py (modified) (1 diff)

branches/composite/formal/examples/composite.py

@@ -27 +27 @@
-
-    def validate(self, value):
+
+        # Check we have the correct number of values, otherwise the final value
+        # could be completely wrong because we're relying on zip to build the
+        # dict.
+        if len(value) != len(self.composition):
+            raise ValueError("Incorrect number of values to validate")
-
-        # If nothing has been entered then we'll have a sequence of None

branches/composite/formal/test/test_types.py

@@ -252 +252 @@
-            ('bar', formal.Integer(required=True))
-            ], required=True).validate, [u'foo', None])
+
+    def test_wrongNumberOfValues(self):
+        self.assertRaises(ValueError, Composite([
+            ('foo', formal.Integer()),
+            ('bar', formal.String()),
+            ]).validate, [123])
+