adding more tests

Author: seperman

deepdiff/diff.py

@@ -879,9 +879,10 @@ def _get_most_in_common_pairs_in_iterables(
                 if id(removed_hash_obj.item) in parents_ids:
                     continue
 
+                _distance = None
                 if pre_calced_distances:
-                    _distance = pre_calced_distances["{}--{}".format(added_hash, removed_hash)]
-                else:
+                    _distance = pre_calced_distances.get("{}--{}".format(added_hash, removed_hash))
+                if _distance is None:
                     _distance = self._get_rough_distance_of_hashed_objs(
                         added_hash, removed_hash, added_hash_obj, removed_hash_obj, _original_type)
                 # Left for future debugging

tests/test_ignore_order.py

@@ -783,28 +783,6 @@ def test_ignore_order_and_group_by(self):
 
 class TestCompareFuncIgnoreOrder:
 
-    EXPECTED = {
-        'values_changed': {
-            "root[2]['id']": {
-                'new_value': 2,
-                'old_value': 3
-            },
-            "root[1]['id']": {
-                'new_value': 3,
-                'old_value': 2
-            }
-        }
-    }
-
-    EXPECTED_WITH_COMPARE_FUNC = {
-        'iterable_item_added': {
-            "root[2]['value'][2]": 1
-        },
-        'iterable_item_removed': {
-            "root[1]['value'][2]": 1
-        }
-    }
-
     def test_ignore_order_with_compare_func_to_guide_comparison(self):
         t1 = [
             {
@@ -836,9 +814,31 @@ def test_ignore_order_with_compare_func_to_guide_comparison(self):
             },
         ]
 
+        expected = {
+            'values_changed': {
+                "root[2]['id']": {
+                    'new_value': 2,
+                    'old_value': 3
+                },
+                "root[1]['id']": {
+                    'new_value': 3,
+                    'old_value': 2
+                }
+            }
+        }
+
+        expected_with_compare_func = {
+            'iterable_item_added': {
+                "root[2]['value'][2]": 1
+            },
+            'iterable_item_removed': {
+                "root[1]['value'][2]": 1
+            }
+        }
+
         ddiff = DeepDiff(t1, t2, ignore_order=True)
 
-        assert self.EXPECTED == ddiff
+        assert expected == ddiff
 
         def compare_func(x, y, level=None):
             try:
@@ -847,12 +847,12 @@ def compare_func(x, y, level=None):
                 raise CannotCompare() from None
 
         ddiff2 = DeepDiff(t1, t2, ignore_order=True, iterable_compare_func=compare_func)
-        assert self.EXPECTED_WITH_COMPARE_FUNC == ddiff2
+        assert expected_with_compare_func == ddiff2
         assert ddiff != ddiff2
 
     def test_ignore_order_with_compare_func_can_throw_cannot_compare(self):
         t1 = [
-            {},
+            {1},
             {
                 'id': 2,
                 'value': [7, 8, 1]
@@ -875,15 +875,52 @@ def test_ignore_order_with_compare_func_can_throw_cannot_compare(self):
             {},
         ]
 
-        ddiff = DeepDiff(t1, t2, ignore_order=True)
-        assert self.EXPECTED == ddiff
+        expected = {
+            'type_changes': {
+                'root[0]': {
+                    'old_type': set,
+                    'new_type': dict,
+                    'old_value': {1},
+                    'new_value': {}
+                }
+            },
+            'values_changed': {
+                "root[2]['id']": {
+                    'new_value': 2,
+                    'old_value': 3
+                },
+                "root[1]['id']": {
+                    'new_value': 3,
+                    'old_value': 2
+                }
+            }
+        }
+        expected_with_compare_func = {
+            'type_changes': {
+                'root[0]': {
+                    'old_type': set,
+                    'new_type': dict,
+                    'old_value': {1},
+                    'new_value': {}
+                }
+            },
+            'iterable_item_added': {
+                "root[2]['value'][2]": 1
+            },
+            'iterable_item_removed': {
+                "root[1]['value'][2]": 1
+            }
+        }
+
+        ddiff = DeepDiff(t1, t2, cutoff_intersection_for_pairs=1, cutoff_distance_for_pairs=1, ignore_order=True)
+        assert expected == ddiff
 
         def compare_func(x, y, level=None):
             try:
                 return x['id'] == y['id']
             except Exception:
                 raise CannotCompare() from None
 
-        ddiff2 = DeepDiff(t1, t2, ignore_order=True, iterable_compare_func=compare_func)
-        assert self.EXPECTED_WITH_COMPARE_FUNC == ddiff2
+        ddiff2 = DeepDiff(t1, t2, ignore_order=True, cutoff_intersection_for_pairs=1, cutoff_distance_for_pairs=1, iterable_compare_func=compare_func)
+        assert expected_with_compare_func == ddiff2
         assert ddiff != ddiff2