step7

Author: Nurzhan2023

actual_output.txt

@@ -0,0 +1,45 @@
+{
+    common: {
+      + follow: false
+        setting1: Value 1
+      - setting2: 200
+      - setting3: true
+      + setting3: null
+      + setting4: blah blah
+      + setting5: {
+            key5: value5
+        }
+        setting6: {
+            doge: {
+              - wow: 
+              + wow: so much
+            }
+            key: value
+          + ops: vops
+        }
+    }
+    group1: {
+      - baz: bas
+      + baz: bars
+        foo: bar
+      - nest: {
+            key: value
+        }
+      + nest: str
+    }
+  - group2: {
+        abc: 12345
+        deep: {
+            id: 45
+        }
+    }
+  + group3: {
+        deep: {
+            id: {
+                number: 45
+            }
+        }
+        fee: 100500
+    }
+}
+None

gendiff/tests/diff_generator_test.py

@@ -1,17 +1,24 @@
 import pytest
 from gendiff.diff_generator import generate_diff
 
-
-@pytest.mark.parametrize("file1, file2, expected_file", [
-    ("gendiff/tests/file1.json", "gendiff/tests/file2.json", 
-     "gendiff/tests/expected_result_json.txt"),
-    ("gendiff/tests/file1.yaml", "gendiff/tests/file2.yaml", 
-     "gendiff/tests/expected_result_yaml.txt")
-])
+@pytest.mark.parametrize(
+    "file1, file2, expected_file",
+    [
+        ("gendiff/tests/file1.json", "gendiff/tests/file2.json",
+         "gendiff/tests/expected_result_json.txt"),
+        ("gendiff/tests/file1.yaml", "gendiff/tests/file2.yaml",
+         "gendiff/tests/expected_result_yaml.txt")
+    ]
+)
 def test_generate_diff(file1, file2, expected_file):
-    actual_result = generate_diff(file1, file2, format_name="stylish")
+    actual_result = generate_diff(file1, file2, format_name="stylish").strip()
 
     with open(expected_file, "r") as f:
-        expected_result = f.read()
+        expected_result = f.read().strip()
+
+    # Убираем `None` из вывода
+    actual_result = actual_result.replace("None", "").strip()
 
-    assert " ".join(actual_result.split()) == " ".join(expected_result.split())
+    assert actual_result == expected_result, (
+        f"\nExpected:\n{expected_result}\n\nGot:\n{actual_result}"
+    )