Index: /main/waeup.sirp/trunk/src/waeup/sirp/utils/tests/test_converters.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/utils/tests/test_converters.py	(revision 6266)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/utils/tests/test_converters.py	(revision 6267)
@@ -43,4 +43,11 @@
 from waeup.sirp.utils.converters import IObjectConverter
 from waeup.sirp.utils.helpers import attrs_to_fields
+from waeup.sirp.interfaces import SimpleWAeUPVocabulary
+
+colors = SimpleWAeUPVocabulary(
+    ('Red', u'red'),
+    ('Green', u'green'),
+    ('Blue', u'blue'),
+    )
 
 class IContact(Interface):
@@ -68,4 +75,9 @@
         title = u'Birthday',
         default = None,
+        )
+    fav_color = schema.Choice(
+        title = u'Favourite color',
+        default = u'red',
+        vocabulary = colors,
         )
     @invariant
@@ -255,4 +267,22 @@
         # ...with the values from the dict set.
         self.assertEqual(contact.name, 'Gabi')
+        return
+
+    def test_choice_vocab(self):
+        # We can handle vocabularies
+        converter = IObjectConverter(IContact) # a converter to IContact
+        err, inv_err, contact = converter.applyRowData(
+            dict(fav_color='blue'), 'contact')
+        assert contact.fav_color == u'blue'
+        assert isinstance(contact.fav_color, unicode)
+        return
+
+    def test_choice_vocab_invalid_value(self):
+        # We can handle vocabularies
+        converter = IObjectConverter(IContact) # a converter to IContact
+        err, inv_err, contact = converter.applyRowData(
+            dict(fav_color='magenta'), 'contact')
+        self.assertEqual(err, [('fav_color', u'Invalid value')])
+        assert contact.fav_color == u'red'
         return
 
