Fossil SCM
Add test case for side-by-side xdiff.
Commit
54adcdb2a20e3ce1707141e410a1a72a866e824431b4a81598f428e32904638c
Parent
8ba47b1cc96062b…
1 file changed
+18
+18
| --- test/diff.test | ||
| +++ test/diff.test | ||
| @@ -108,9 +108,27 @@ | ||
| 108 | 108 | test diff-file5-1 {[normalize_result] eq {Index: file5.dat |
| 109 | 109 | ================================================================== |
| 110 | 110 | --- file5.dat |
| 111 | 111 | +++ file5.dat |
| 112 | 112 | cannot compute difference between binary files}} |
| 113 | + | |
| 114 | +############################################################################### | |
| 115 | + | |
| 116 | +write_file file6a.dat "{\n \"abc\": {\n \"def\": false,\n \"ghi\": false\n }\n}\n" | |
| 117 | +write_file file6b.dat "{\n \"abc\": {\n \"def\": false,\n \"ghi\": false\n },\n \"jkl\": {\n \"mno\": {\n \"pqr\": false\n }\n }\n}\n" | |
| 118 | +fossil xdiff -y -W 16 file6a.dat file6b.dat | |
| 119 | +test diff-file-6-1 {[normalize_result] eq {========== file6a.dat ===== versus ===== file6b.dat ===== | |
| 120 | + 1 { 1 { | |
| 121 | + 2 "abc": { 2 "abc": { | |
| 122 | + 3 "def": false, 3 "def": false, | |
| 123 | + 4 "ghi": false 4 "ghi": false | |
| 124 | + > 5 }, | |
| 125 | + > 6 "jkl": { | |
| 126 | + > 7 "mno": { | |
| 127 | + > 8 "pqr": false | |
| 128 | + > 9 } | |
| 129 | + 5 } 10 } | |
| 130 | + 6 } 11 }}} | |
| 113 | 131 | |
| 114 | 132 | ############################################################################### |
| 115 | 133 | |
| 116 | 134 | test_cleanup |
| 117 | 135 |
| --- test/diff.test | |
| +++ test/diff.test | |
| @@ -108,9 +108,27 @@ | |
| 108 | test diff-file5-1 {[normalize_result] eq {Index: file5.dat |
| 109 | ================================================================== |
| 110 | --- file5.dat |
| 111 | +++ file5.dat |
| 112 | cannot compute difference between binary files}} |
| 113 | |
| 114 | ############################################################################### |
| 115 | |
| 116 | test_cleanup |
| 117 |
| --- test/diff.test | |
| +++ test/diff.test | |
| @@ -108,9 +108,27 @@ | |
| 108 | test diff-file5-1 {[normalize_result] eq {Index: file5.dat |
| 109 | ================================================================== |
| 110 | --- file5.dat |
| 111 | +++ file5.dat |
| 112 | cannot compute difference between binary files}} |
| 113 | |
| 114 | ############################################################################### |
| 115 | |
| 116 | write_file file6a.dat "{\n \"abc\": {\n \"def\": false,\n \"ghi\": false\n }\n}\n" |
| 117 | write_file file6b.dat "{\n \"abc\": {\n \"def\": false,\n \"ghi\": false\n },\n \"jkl\": {\n \"mno\": {\n \"pqr\": false\n }\n }\n}\n" |
| 118 | fossil xdiff -y -W 16 file6a.dat file6b.dat |
| 119 | test diff-file-6-1 {[normalize_result] eq {========== file6a.dat ===== versus ===== file6b.dat ===== |
| 120 | 1 { 1 { |
| 121 | 2 "abc": { 2 "abc": { |
| 122 | 3 "def": false, 3 "def": false, |
| 123 | 4 "ghi": false 4 "ghi": false |
| 124 | > 5 }, |
| 125 | > 6 "jkl": { |
| 126 | > 7 "mno": { |
| 127 | > 8 "pqr": false |
| 128 | > 9 } |
| 129 | 5 } 10 } |
| 130 | 6 } 11 }}} |
| 131 | |
| 132 | ############################################################################### |
| 133 | |
| 134 | test_cleanup |
| 135 |