Skip to content

Commit 14a4402

Browse files
committed
step 5
1 parent 1af402c commit 14a4402

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

gendiff/diff_generator.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from gendiff.read import read_file
22

3+
34
def generate_diff(file_path1, file_path2):
45
data1 = read_file(file_path1)
56
data2 = read_file(file_path2)

gendiff/parser.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,3 @@ def args_parser():
1818
args = parser.parse_args()
1919
diff = generate_diff(args.first_file, args.second_file)
2020
print(diff)
21-
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
from gendiff.diff_generator import generate_diff
22

3+
34
def normalize_indentation(text):
45
return "\n".join(line.strip() for line in text.strip().splitlines())
56

7+
68
def test_generate_diff():
79
file1 = "gendiff/tests/file1.json"
810
file2 = "gendiff/tests/file2.json"
9-
11+
1012
expected_result = """{
1113
- follow: False
1214
host: hexlet.io
@@ -15,10 +17,10 @@ def test_generate_diff():
1517
+ timeout: 20
1618
+ verbose: True
1719
}"""
18-
20+
1921
actual_result = generate_diff(file1, file2)
20-
22+
2123
normalized_expected = normalize_indentation(expected_result)
2224
normalized_actual = normalize_indentation(actual_result)
23-
25+
2426
assert normalized_actual == normalized_expected

0 commit comments

Comments
 (0)