Only swap i and j when reporting items moved if using iterable_compare_func.

Fix unittests to represent the branching deeper

Author: dtorres-sf

deepdiff/diff.py

@@ -840,13 +840,15 @@ def _diff_by_forming_pairs_and_comparing_one_by_one(
             if self._count_diff() is StopIteration:
                 return  # pragma: no cover. This is already covered for addition.
 
+            reference_param1 = i
+            reference_param2 = j
             if y is ListItemRemovedOrAdded:  # item removed completely
                 change_level = level.branch_deeper(
                     x,
                     notpresent,
                     child_relationship_class=child_relationship_class,
-                    child_relationship_param=i,
-                    child_relationship_param2=j,
+                    child_relationship_param=reference_param1,
+                    child_relationship_param2=reference_param2,
                     )
                 self._report_result('iterable_item_removed', change_level, local_tree=local_tree)
 
@@ -855,8 +857,8 @@ def _diff_by_forming_pairs_and_comparing_one_by_one(
                     notpresent,
                     y,
                     child_relationship_class=child_relationship_class,
-                    child_relationship_param=i,
-                    child_relationship_param2=j,
+                    child_relationship_param=reference_param1,
+                    child_relationship_param2=reference_param2,
                     )
                 self._report_result('iterable_item_added', change_level, local_tree=local_tree)
 
@@ -868,26 +870,30 @@ def _diff_by_forming_pairs_and_comparing_one_by_one(
                         x,
                         y,
                         child_relationship_class=child_relationship_class,
-                        child_relationship_param=i,
-                        child_relationship_param2=j
+                        child_relationship_param=reference_param1,
+                        child_relationship_param2=reference_param2
                     )
                     self._report_result('iterable_item_moved', change_level, local_tree=local_tree)
 
+                    if self.iterable_compare_func:
+                        # Intentionally setting j as the first child relationship param in cases of a moved item.
+                        # If the item was moved using an iterable_compare_func then we want to make sure that the index
+                        # is relative to t2.
+                        reference_param1 = j
+                        reference_param2 = i
+
                 item_id = id(x)
                 if parents_ids and item_id in parents_ids:
                     continue
                 parents_ids_added = add_to_frozen_set(parents_ids, item_id)
 
                 # Go one level deeper
-                # Intentionally setting j as the first child relationship param in cases of a moved item.
-                # If the item was moved using an iterable_compare_func then we want to make sure that the index
-                # is relative to t2.
                 next_level = level.branch_deeper(
                     x,
                     y,
                     child_relationship_class=child_relationship_class,
-                    child_relationship_param=j,
-                    child_relationship_param2=i
+                    child_relationship_param=reference_param1,
+                    child_relationship_param2=reference_param2
                 )
                 self._diff(next_level, parents_ids_added, local_tree=local_tree)
 

tests/test_delta.py

@@ -1879,7 +1879,14 @@ def test_compare_func_with_duplicates_removed(self):
                         "val": 3
                     }
                 }
-            }
+            },
+            'values_changed': {
+                "root[2]['val']": {
+                    'new_value': 3,
+                    'old_value': 1,
+                    'new_path': "root[0]['val']"
+                }
+            },
         }
         assert expected == ddiff
         delta = Delta(ddiff)
@@ -1888,6 +1895,7 @@ def test_compare_func_with_duplicates_removed(self):
 
         flat_result = delta.to_flat_rows()
         flat_expected = [
+            {'path': [2, 'val'], 'value': 3, 'action': 'values_changed', 'type': int, 'new_path': [0, 'val']},
             {'path': [2], 'value': {'id': 1, 'val': 3}, 'action': 'iterable_item_removed', 'type': dict},
             {'path': [0], 'value': {'id': 1, 'val': 3}, 'action': 'iterable_item_removed', 'type': dict},
             {'path': [3], 'value': {'id': 3, 'val': 3}, 'action': 'iterable_item_removed', 'type': dict},
@@ -1930,6 +1938,12 @@ def test_compare_func_with_duplicates_removed(self):
                         'val': 3
                     }
                 }
+            },
+            'values_changed': {
+                "root[2]['val']": {
+                    'new_value': 3,
+                    'new_path': "root[0]['val']"
+                }
             }
         }
         assert expected_delta_dict == delta_again.diff
@@ -1961,7 +1975,14 @@ def test_compare_func_with_duplicates_added(self):
                         'val': 1
                     }
                 }
-            }
+            },
+            'values_changed': {
+                "root[0]['val']": {
+                    'new_value': 1,
+                    'old_value': 3,
+                    'new_path': "root[2]['val']"
+                }
+            },
         }
         assert expected == ddiff
         delta = Delta(ddiff)