|
@@ 63-93 (lines=31) @@
|
| 60 |
|
# File c is unchanged and should be untouched |
| 61 |
|
self.assertEqual([], fc.readlines()) |
| 62 |
|
|
| 63 |
|
def test_apply_orig_option(self): |
| 64 |
|
uut = ApplyPatchAction() |
| 65 |
|
with make_temp() as f_a, make_temp() as f_b: |
| 66 |
|
file_dict = { |
| 67 |
|
f_a: ["1\n", "2\n", "3\n"], |
| 68 |
|
f_b: ["1\n", "2\n", "3\n"] |
| 69 |
|
} |
| 70 |
|
expected_file_dict = { |
| 71 |
|
f_a: ["1\n", "2\n", "3_changed\n"], |
| 72 |
|
f_b: ["1\n", "2\n", "3_changed\n"] |
| 73 |
|
} |
| 74 |
|
file_diff_dict = {} |
| 75 |
|
diff = Diff(file_dict[f_a]) |
| 76 |
|
diff.change_line(3, "3\n", "3_changed\n") |
| 77 |
|
uut.apply(Result("origin", "msg", diffs={f_a: diff}), |
| 78 |
|
file_dict, |
| 79 |
|
file_diff_dict, |
| 80 |
|
no_orig=True) |
| 81 |
|
diff = Diff(file_dict[f_b]) |
| 82 |
|
diff.change_line(3, "3\n", "3_changed\n") |
| 83 |
|
uut.apply(Result("origin", "msg", diffs={f_b: diff}), |
| 84 |
|
file_dict, |
| 85 |
|
file_diff_dict, |
| 86 |
|
no_orig=False) |
| 87 |
|
self.assertFalse(isfile(f_a+".orig")) |
| 88 |
|
self.assertTrue(isfile(f_b+".orig")) |
| 89 |
|
|
| 90 |
|
for filename in file_diff_dict: |
| 91 |
|
file_dict[filename] = file_diff_dict[filename].modified |
| 92 |
|
|
| 93 |
|
self.assertEqual(file_dict, expected_file_dict) |
| 94 |
|
|
| 95 |
|
def test_apply_rename(self): |
| 96 |
|
uut = ApplyPatchAction() |
|
@@ 95-123 (lines=29) @@
|
| 92 |
|
|
| 93 |
|
self.assertEqual(file_dict, expected_file_dict) |
| 94 |
|
|
| 95 |
|
def test_apply_rename(self): |
| 96 |
|
uut = ApplyPatchAction() |
| 97 |
|
with make_temp() as f_a: |
| 98 |
|
file_dict = {f_a: ["1\n", "2\n", "3\n"]} |
| 99 |
|
expected_file_dict = {f_a: ["1\n", "2_changed\n", "3_changed\n"]} |
| 100 |
|
file_diff_dict = {} |
| 101 |
|
diff = Diff(file_dict[f_a], rename=f_a+".renamed") |
| 102 |
|
diff.change_line(3, "3\n", "3_changed\n") |
| 103 |
|
uut.apply(Result("origin", "msg", diffs={f_a: diff}), |
| 104 |
|
file_dict, |
| 105 |
|
file_diff_dict) |
| 106 |
|
self.assertTrue(isfile(f_a+".orig")) |
| 107 |
|
self.assertTrue(isfile(f_a+".renamed")) |
| 108 |
|
|
| 109 |
|
diff = Diff(file_dict[f_a]) |
| 110 |
|
diff.change_line(2, "2\n", "2_changed\n") |
| 111 |
|
uut.apply(Result("origin", "msg", diffs={f_a: diff}), |
| 112 |
|
file_dict, |
| 113 |
|
file_diff_dict) |
| 114 |
|
self.assertTrue(isfile(f_a+".renamed.orig")) |
| 115 |
|
|
| 116 |
|
for filename in file_diff_dict: |
| 117 |
|
file_dict[filename] = file_diff_dict[filename].modified |
| 118 |
|
|
| 119 |
|
self.assertEqual(file_dict, expected_file_dict) |
| 120 |
|
|
| 121 |
|
def test_apply_delete(self): |
| 122 |
|
uut = ApplyPatchAction() |
| 123 |
|
with make_temp() as f_a: |
| 124 |
|
file_dict = {f_a: ["1\n", "2\n", "3\n"]} |
| 125 |
|
file_diff_dict = {} |
| 126 |
|
diff = Diff(file_dict[f_a], delete=True) |