patch tests improved

mr-mixas · Oct 12, 2019 · 7324d89 · 7324d89
1 parent ce425e7
commit 7324d89
Show file tree

Hide file tree

Showing 107 changed files with 527 additions and 378 deletions.
diff --git a/tests/ext/test_0_vs_0.py b/tests/ext/test_0_vs_0.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = 0
-    b = 0
     diff = {'U': 0}
-    assert b == nested_diff.patch(a, diff)
+    target = 0
+    patched = 0
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_0_vs_0_noU.py b/tests/ext/test_0_vs_0_noU.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = 0
-    b = 0
     diff = {}
-    assert b == nested_diff.patch(a, diff)
+    target = 0
+    patched = 0
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_0_vs_1.py b/tests/ext/test_0_vs_1.py
@@ -8,13 +8,13 @@
 def test_diff():
     a = 0
     b = 1
-    diff = {'N': 1, 'O': 0}
+    diff = {'O': 0, 'N': 1}
     opts = {}
     assert diff == nested_diff.diff(a, b, **opts)
 
 
 def test_patch():
-    a = 0
-    b = 1
-    diff = {'N': 1, 'O': 0}
-    assert b == nested_diff.patch(a, diff)
+    diff = {'O': 0, 'N': 1}
+    target = 0
+    patched = 1
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_0_vs_empty_string.py b/tests/ext/test_0_vs_empty_string.py
@@ -8,13 +8,13 @@
 def test_diff():
     a = 0
     b = ''
-    diff = {'N': '', 'O': 0}
+    diff = {'O': 0, 'N': ''}
     opts = {}
     assert diff == nested_diff.diff(a, b, **opts)
 
 
 def test_patch():
-    a = 0
-    b = ''
-    diff = {'N': '', 'O': 0}
-    assert b == nested_diff.patch(a, diff)
+    diff = {'O': 0, 'N': ''}
+    target = 0
+    patched = ''
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_0_vs_undef.py b/tests/ext/test_0_vs_undef.py
@@ -8,13 +8,13 @@
 def test_diff():
     a = 0
     b = None
-    diff = {'N': None, 'O': 0}
+    diff = {'O': 0, 'N': None}
     opts = {}
     assert diff == nested_diff.diff(a, b, **opts)
 
 
 def test_patch():
-    a = 0
-    b = None
-    diff = {'N': None, 'O': 0}
-    assert b == nested_diff.patch(a, diff)
+    diff = {'O': 0, 'N': None}
+    target = 0
+    patched = None
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_1_vs_1_as_string.py b/tests/ext/test_1_vs_1_as_string.py
@@ -8,13 +8,13 @@
 def test_diff():
     a = 1
     b = '1'
-    diff = {'N': '1', 'O': 1}
+    diff = {'O': 1, 'N': '1'}
     opts = {}
     assert diff == nested_diff.diff(a, b, **opts)
 
 
 def test_patch():
-    a = 1
-    b = '1'
-    diff = {'N': '1', 'O': 1}
-    assert b == nested_diff.patch(a, diff)
+    diff = {'O': 1, 'N': '1'}
+    target = 1
+    patched = '1'
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_1_vs_1dot0.py b/tests/ext/test_1_vs_1dot0.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = 1
-    b = 1
     diff = {'U': 1}
-    assert b == nested_diff.patch(a, diff)
+    target = 1
+    patched = 1
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_1_vs_minus1.py b/tests/ext/test_1_vs_minus1.py
@@ -8,13 +8,13 @@
 def test_diff():
     a = 1
     b = -1
-    diff = {'N': -1, 'O': 1}
+    diff = {'O': 1, 'N': -1}
     opts = {}
     assert diff == nested_diff.diff(a, b, **opts)
 
 
 def test_patch():
-    a = 1
-    b = -1
-    diff = {'N': -1, 'O': 1}
-    assert b == nested_diff.patch(a, diff)
+    diff = {'O': 1, 'N': -1}
+    target = 1
+    patched = -1
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_1dot0_vs_1dot0_as_string.py b/tests/ext/test_1dot0_vs_1dot0_as_string.py
@@ -8,13 +8,13 @@
 def test_diff():
     a = 1
     b = '1.0'
-    diff = {'N': '1.0', 'O': 1}
+    diff = {'O': 1, 'N': '1.0'}
     opts = {}
     assert diff == nested_diff.diff(a, b, **opts)
 
 
 def test_patch():
-    a = 1
-    b = '1.0'
-    diff = {'N': '1.0', 'O': 1}
-    assert b == nested_diff.patch(a, diff)
+    diff = {'O': 1, 'N': '1.0'}
+    target = 1
+    patched = '1.0'
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_a_vs_a.py b/tests/ext/test_a_vs_a.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = 'a'
-    b = 'a'
     diff = {'U': 'a'}
-    assert b == nested_diff.patch(a, diff)
+    target = 'a'
+    patched = 'a'
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_a_vs_b.py b/tests/ext/test_a_vs_b.py
@@ -8,13 +8,13 @@
 def test_diff():
     a = 'a'
     b = 'b'
-    diff = {'N': 'b', 'O': 'a'}
+    diff = {'O': 'a', 'N': 'b'}
     opts = {}
     assert diff == nested_diff.diff(a, b, **opts)
 
 
 def test_patch():
-    a = 'a'
-    b = 'b'
-    diff = {'N': 'b', 'O': 'a'}
-    assert b == nested_diff.patch(a, diff)
+    diff = {'O': 'a', 'N': 'b'}
+    target = 'a'
+    patched = 'b'
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_deeply_nested_hash_vs_empty_hash.py b/tests/ext/test_deeply_nested_hash_vs_empty_hash.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = {'one': {'two': {'three': 3}}}
-    b = {}
     diff = {'D': {'one': {'R': {'two': {'three': 3}}}}}
-    assert b == nested_diff.patch(a, diff)
+    target = {'one': {'two': {'three': 3}}}
+    patched = {}
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_deeply_nested_hash_vs_empty_hash_trimR.py b/tests/ext/test_deeply_nested_hash_vs_empty_hash_trimR.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = {'one': {'two': {'three': 3}}}
-    b = {}
     diff = {'D': {'one': {'R': None}}}
-    assert b == nested_diff.patch(a, diff)
+    target = {'one': {'two': {'three': 3}}}
+    patched = {}
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_deeply_nested_list_vs_empty_list.py b/tests/ext/test_deeply_nested_list_vs_empty_list.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = [[[0, 1]]]
-    b = []
     diff = {'D': [{'R': [[0, 1]]}]}
-    assert b == nested_diff.patch(a, diff)
+    target = [[[0, 1]]]
+    patched = []
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_deeply_nested_list_vs_empty_list_trimR.py b/tests/ext/test_deeply_nested_list_vs_empty_list_trimR.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = [[[0, 1]]]
-    b = []
     diff = {'D': [{'R': None}]}
-    assert b == nested_diff.patch(a, diff)
+    target = [[[0, 1]]]
+    patched = []
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_deeply_nested_subhash_removed_from_hash.py b/tests/ext/test_deeply_nested_subhash_removed_from_hash.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = {'four': 4, 'one': {'two': {'three': 3}}}
-    b = {'four': 4}
     diff = {'D': {'four': {'U': 4}, 'one': {'R': {'two': {'three': 3}}}}}
-    assert b == nested_diff.patch(a, diff)
+    target = {'four': 4, 'one': {'two': {'three': 3}}}
+    patched = {'four': 4}
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_deeply_nested_subhash_removed_from_hash_trimR.py b/tests/ext/test_deeply_nested_subhash_removed_from_hash_trimR.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = {'four': 4, 'one': {'two': {'three': 3}}}
-    b = {'four': 4}
     diff = {'D': {'four': {'U': 4}, 'one': {'R': None}}}
-    assert b == nested_diff.patch(a, diff)
+    target = {'four': 4, 'one': {'two': {'three': 3}}}
+    patched = {'four': 4}
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_deeply_nested_sublist_removed_from_list.py b/tests/ext/test_deeply_nested_sublist_removed_from_list.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = [0, [[0, 1]]]
-    b = [0]
     diff = {'D': [{'U': 0}, {'R': [[0, 1]]}]}
-    assert b == nested_diff.patch(a, diff)
+    target = [0, [[0, 1]]]
+    patched = [0]
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_deeply_nested_sublist_removed_from_list_trimR.py b/tests/ext/test_deeply_nested_sublist_removed_from_list_trimR.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = [0, [[0, 1]]]
-    b = [0]
     diff = {'D': [{'U': 0}, {'R': None}]}
-    assert b == nested_diff.patch(a, diff)
+    target = [0, [[0, 1]]]
+    patched = [0]
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_empty_hash_vs_empty_hash.py b/tests/ext/test_empty_hash_vs_empty_hash.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = {}
-    b = {}
     diff = {'U': {}}
-    assert b == nested_diff.patch(a, diff)
+    target = {}
+    patched = {}
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_empty_hash_vs_empty_hash_noU.py b/tests/ext/test_empty_hash_vs_empty_hash_noU.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = {}
-    b = {}
     diff = {}
-    assert b == nested_diff.patch(a, diff)
+    target = {}
+    patched = {}
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_empty_hash_vs_empty_list.py b/tests/ext/test_empty_hash_vs_empty_list.py
@@ -8,13 +8,13 @@
 def test_diff():
     a = {}
     b = []
-    diff = {'N': [], 'O': {}}
+    diff = {'O': {}, 'N': []}
     opts = {}
     assert diff == nested_diff.diff(a, b, **opts)
 
 
 def test_patch():
-    a = {}
-    b = []
-    diff = {'N': [], 'O': {}}
-    assert b == nested_diff.patch(a, diff)
+    diff = {'O': {}, 'N': []}
+    target = {}
+    patched = []
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_empty_hash_vs_hash_with_one_key.py b/tests/ext/test_empty_hash_vs_hash_with_one_key.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = {}
-    b = {'one': 1}
     diff = {'D': {'one': {'A': 1}}}
-    assert b == nested_diff.patch(a, diff)
+    target = {}
+    patched = {'one': 1}
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_empty_hash_vs_hash_with_one_key_noA.py b/tests/ext/test_empty_hash_vs_hash_with_one_key_noA.py
@@ -11,3 +11,10 @@ def test_diff():
     diff = {}
     opts = {'A': False}
     assert diff == nested_diff.diff(a, b, **opts)
+
+
+def test_patch():
+    diff = {}
+    target = {}
+    patched = {}
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_empty_list_vs_deeply_nested_list.py b/tests/ext/test_empty_list_vs_deeply_nested_list.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = []
-    b = [[[0, 1]]]
     diff = {'D': [{'A': [[0, 1]]}]}
-    assert b == nested_diff.patch(a, diff)
+    target = []
+    patched = [[[0, 1]]]
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_empty_list_vs_empty_hash.py b/tests/ext/test_empty_list_vs_empty_hash.py
@@ -8,13 +8,13 @@
 def test_diff():
     a = []
     b = {}
-    diff = {'N': {}, 'O': []}
+    diff = {'O': [], 'N': {}}
     opts = {}
     assert diff == nested_diff.diff(a, b, **opts)
 
 
 def test_patch():
-    a = []
-    b = {}
-    diff = {'N': {}, 'O': []}
-    assert b == nested_diff.patch(a, diff)
+    diff = {'O': [], 'N': {}}
+    target = []
+    patched = {}
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_empty_list_vs_empty_list.py b/tests/ext/test_empty_list_vs_empty_list.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = []
-    b = []
     diff = {'U': []}
-    assert b == nested_diff.patch(a, diff)
+    target = []
+    patched = []
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_empty_list_vs_empty_list_noU.py b/tests/ext/test_empty_list_vs_empty_list_noU.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = []
-    b = []
     diff = {}
-    assert b == nested_diff.patch(a, diff)
+    target = []
+    patched = []
+    assert patched == nested_diff.patch(target, diff)
diff --git a/tests/ext/test_empty_list_vs_list_with_one_item.py b/tests/ext/test_empty_list_vs_list_with_one_item.py
@@ -14,7 +14,7 @@ def test_diff():
 
 
 def test_patch():
-    a = []
-    b = [0]
     diff = {'D': [{'A': 0}]}
-    assert b == nested_diff.patch(a, diff)
+    target = []
+    patched = [0]
+    assert patched == nested_diff.patch(target, diff)