Merge lp:~vds/desktopcouch/fieldmapping_fixes into lp:desktopcouch

[Vincenzo Di Somma]

Making desktopcouch more robusts when dealing with mergeable lists.
If a key is still in private application annotation for a certain application but it has been removed from it's root_list the mergeable list code traces back with a key error.

Making desktopcouch more robusts when dealing with mergeable lists.

[Martin Albisetti (beuno)]

review: Approve

[Eric Casteleijn (thisfred)]

Looks good, tests pass. Thanks for fixing this!

review: Approve

[Chad Miller (cmiller)]

review: Approve

=== modified file 'desktopcouch/records/field_registry.py'
--- desktopcouch/records/field_registry.py	2009-07-08 17:48:11 +0000
+++ desktopcouch/records/field_registry.py	2010-04-05 17:59:21 +0000
@@ -118,9 +118,8 @@
         uuid_key = self._uuidLookup(record)
         if not uuid_key:
             return
-        application_annotations = self.get_application_annotations(record)
-        if self._field_name in root_list._data[uuid_key]:
-            del root_list._data[uuid_key][self._field_name]
+        if self._field_name in root_list._data.get(uuid_key, []):
+             del root_list._data[uuid_key][self._field_name]
 
     def setValue(self, record, value):
         """set the value for the registered field"""

=== modified file 'desktopcouch/records/tests/test_field_registry.py'
--- desktopcouch/records/tests/test_field_registry.py	2010-01-29 22:14:25 +0000
+++ desktopcouch/records/tests/test_field_registry.py	2010-04-05 17:59:21 +0000
@@ -68,7 +68,7 @@
         mapping.setValue(r, 'Fnord')
         self.assertEqual('Fnord', mapping.getValue(r))
 
-    def test_mergeable_list_field_mapping(self):
+    def test_mergeable_list_field_mapping0(self):
         """Test the MergeableListFieldMapping object."""
         record = Record(self.test_record)
         mapping = MergeableListFieldMapping(
@@ -76,6 +76,19 @@
         self.assertEqual('the value', mapping.getValue(record))
         mapping.setValue(record, 'a new value')
         self.assertEqual('a new value', mapping.getValue(record))
+        mapping.deleteValue(record)
+        self.assertEqual(None, mapping.getValue(record))
+
+    def test_mergeable_list_field_mapping1(self):
+        """Test the MergeableListFieldMapping object."""
+        record = Record(self.test_record)
+        mapping = MergeableListFieldMapping(
+            'Test App', 'test_field', 'test_fields', 'the_field')
+        self.assertEqual('the value', mapping.getValue(record))
+        del record._data['test_fields'][
+            'e47455fb-da05-481e-a2c7-88f14d5cc163']
+        mapping.deleteValue(record)
+        self.assertEqual(None, mapping.getValue(record))
 
     def test_mergeable_list_field_mapping_empty_field(self):
         """Test setting empty values in the MergeableListFieldMapping object."""