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