more testing

Author: jeffkala

tests/test_diff_helpers.py

@@ -1,9 +1,8 @@
 """DIff helpers unit tests."""
 
-from collections import defaultdict
-
 import pytest
 
+from jdiff.check_types import CheckType
 from jdiff.utils.diff_helpers import (
     _parse_index_element_string,
     dict_merger,
@@ -33,12 +32,16 @@ def test_group_value():
     """Tests that nested dict is recursively created."""
     tree_list = ["10.1.0.0", "is_enabled"]
     value = {"new_value": False, "old_value": True}
-    assert group_value(tree_list, value) == {"10.1.0.0": {"is_enabled": {"new_value": False, "old_value": True}}}
+    assert group_value(tree_list, value) == {
+        "10.1.0.0": {"is_enabled": {"new_value": False, "old_value": True}}
+    }
 
 
 def test_fix_deepdiff_key_names():
     """Tests that deepdiff return is parsed properly."""
-    deepdiff_object = {"root[0]['10.1.0.0']['is_enabled']": {"new_value": False, "old_value": True}}
+    deepdiff_object = {
+        "root[0]['10.1.0.0']['is_enabled']": {"new_value": False, "old_value": True}
+    }
     assert fix_deepdiff_key_names(deepdiff_object) == {
         "10.1.0.0": {"is_enabled": {"new_value": False, "old_value": True}}
     }
@@ -47,7 +50,9 @@ def test_fix_deepdiff_key_names():
 def test_get_diff_iterables_items():
     """Tests that deepdiff return is parsed properly."""
     diff_result = {
-        "values_changed": {"root['Ethernet1'][0]['port']": {"new_value": "518", "old_value": "519"}},
+        "values_changed": {
+            "root['Ethernet1'][0]['port']": {"new_value": "518", "old_value": "519"}
+        },
         "iterable_item_added": {
             "root['Ethernet3'][1]": {
                 "hostname": "ios-xrv-unittest",
@@ -58,7 +63,9 @@ def test_get_diff_iterables_items():
     result = get_diff_iterables_items(diff_result)
 
     assert list(dict(result).keys())[0] == "['Ethernet3']"
-    assert list(list(dict(result).values())[0].values())[0] == [{"hostname": "ios-xrv-unittest", "port": "Gi0/0/0/0"}]
+    assert list(list(dict(result).values())[0].values())[0] == [
+        {"hostname": "ios-xrv-unittest", "port": "Gi0/0/0/0"}
+    ]
 
 
 index_element_case_1 = (
@@ -82,11 +89,15 @@ def test__parse_index_element_string(index_element, result):
     assert parsed_result == result
 
 
+parse_diff_simple_1 = (
+    {"foo": {"bar-1": "baz1"}},  # actual
+    {"foo": {"bar-2": "baz2"}},  # intended
+    "foo",  # match_config
+    {"bar-1": "baz1"},  # extra
+    {"bar-2": "baz2"},  # missing
+)
+
 parse_diff_case_1 = (
-    {
-        "hostname": {"new_value": "veos", "old_value": "veos-0"},
-        "domain-name": "missing",
-    },
     {"openconfig-system:config": {"domain-name": "ntc.com", "hostname": "veos-0"}},
     {"openconfig-system:config": {"hostname": "veos"}},
     "openconfig-system:config",
@@ -95,11 +106,6 @@ def test__parse_index_element_string(index_element, result):
 )
 
 parse_diff_case_2 = (
-    {
-        "hostname": {"new_value": "veos", "old_value": "veos-0"},
-        "domain-name": "missing",
-        "index_element['openconfig-system:config']['ip name']": "new",
-    },
     {"openconfig-system:config": {"domain-name": "ntc.com", "hostname": "veos-0"}},
     {"openconfig-system:config": {"hostname": "veos", "ip name": "ntc.com"}},
     "openconfig-system:config",
@@ -108,11 +114,6 @@ def test__parse_index_element_string(index_element, result):
 )
 
 parse_diff_case_3 = (
-    {
-        "domain-name": "missing",
-        "hostname": "missing",
-        "index_element['openconfig-system:config']['ip name']": "new",
-    },
     {"openconfig-system:config": {"domain-name": "ntc.com", "hostname": "veos-0"}},
     {"openconfig-system:config": {"ip name": "ntc.com"}},
     "openconfig-system:config",
@@ -121,7 +122,6 @@ def test__parse_index_element_string(index_element, result):
 )
 
 parse_diff_case_4 = (
-    {"domain-name": "missing"},
     {"openconfig-system:config": {"domain-name": "ntc.com", "hostname": "veos"}},
     {"openconfig-system:config": {"hostname": "veos"}},
     "openconfig-system:config",
@@ -130,11 +130,6 @@ def test__parse_index_element_string(index_element, result):
 )
 
 parse_diff_case_5 = (
-    {
-        "hostname": {"new_value": "veos", "old_value": "veos-0"},
-        "domain-name": "missing",
-        "index_element['openconfig-system:config']['ip name']": "new",
-    },
     {"openconfig-system:config": {"domain-name": "ntc.com", "hostname": "veos-0"}},
     {"openconfig-system:config": {"hostname": "veos", "ip name": "ntc.com"}},
     "openconfig-system:config",
@@ -143,22 +138,6 @@ def test__parse_index_element_string(index_element, result):
 )
 
 parse_diff_case_6 = (
-    {
-        "servers": {
-            "server": defaultdict(
-                list,
-                {
-                    "new": [
-                        {
-                            "address": "1.us.pool.ntp.org",
-                            "config": {"address": "1.us.pool.ntp.org"},
-                            "state": {"address": "1.us.pool.ntp.org"},
-                        }
-                    ]
-                },
-            )
-        }
-    },
     {"openconfig-system:ntp": {"servers": {"server": []}}},
     {
         "openconfig-system:ntp": {
@@ -193,6 +172,7 @@ def test__parse_index_element_string(index_element, result):
 )
 
 parse_diff_tests = [
+    parse_diff_simple_1,
     parse_diff_case_1,
     parse_diff_case_2,
     parse_diff_case_3,
@@ -203,18 +183,21 @@ def test__parse_index_element_string(index_element, result):
 
 
 @pytest.mark.parametrize(
-    "jdiff_evaluate_response, actual, intended, match_config, extra, missing",
+    "actual, intended, match_config, extra, missing",
     parse_diff_tests,
 )
-def test_parse_diff(
-    jdiff_evaluate_response, actual, intended, match_config, extra, missing
-):  # pylint: disable=too-many-arguments
+def test_parse_diff(actual, intended, match_config, extra, missing):  # pylint: disable=too-many-arguments
     """Test that index_element can be unpacked."""
+    jdiff_param_match = CheckType.create("exact_match")
+    jdiff_evaluate_response, _ = jdiff_param_match.evaluate(actual, intended)
+    print(jdiff_evaluate_response)
+
     parsed_extra, parsed_missing = parse_diff(
         jdiff_evaluate_response,
         actual,
         intended,
         match_config,
     )
+    print(parsed_extra, parsed_missing)
     assert parsed_extra == extra
     assert parsed_missing == missing