-
Notifications
You must be signed in to change notification settings - Fork 14
Expand file tree
/
Copy pathdiff3Merge.test.js
More file actions
156 lines (124 loc) · 5.39 KB
/
Copy pathdiff3Merge.test.js
File metadata and controls
156 lines (124 loc) · 5.39 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
import { describe, it } from 'bun:test';
import { strict as assert } from 'bun:assert';
import * as Diff3 from '../src/diff3.mjs';
describe('diff3Merge', () => {
it('performs diff3 merge on arrays', () => {
const o = ['AA', 'ZZ', '00', 'M', '99'];
const a = ['AA', 'a', 'b', 'c', 'ZZ', 'new', '00', 'a', 'a', 'M', '99'];
const b = ['AA', 'a', 'd', 'c', 'ZZ', '11', 'M', 'z', 'z', '99'];
const result = Diff3.diff3Merge(a, o, b);
/*
AA
<<<<<<< a
a
b
c
||||||| o
=======
a
d
c
>>>>>>> b
ZZ
<<<<<<< a
new
00
a
a
||||||| o
00
=======
11
>>>>>>> b
M
z
z
99
*/
assert.deepEqual(result[0].ok, ['AA']);
assert.deepEqual(result[0].conflict, undefined);
assert.deepEqual(result[1].ok, undefined);
assert.deepEqual(result[1].conflict.o, []);
assert.deepEqual(result[1].conflict.a, ['a', 'b', 'c']);
assert.deepEqual(result[1].conflict.b, ['a', 'd', 'c']);
assert.deepEqual(result[2].ok, ['ZZ']);
assert.deepEqual(result[2].conflict, undefined);
assert.deepEqual(result[3].ok, undefined);
assert.deepEqual(result[3].conflict.o, ['00']);
assert.deepEqual(result[3].conflict.a, ['new', '00', 'a', 'a']);
assert.deepEqual(result[3].conflict.b, ['11']);
assert.deepEqual(result[4].ok, ['M', 'z', 'z', '99']);
assert.deepEqual(result[4].conflict, undefined);
});
it('strings split on whitespace by default to avoid surprises - issue #9', () => {
const o = 'was touring';
const a = 'was here touring';
const b = 'was into touring';
const result = Diff3.diff3Merge(a, o, b);
assert.deepEqual(result[0].ok, ['was']);
assert.deepEqual(result[0].conflict, undefined);
assert.deepEqual(result[1].ok, undefined);
assert.deepEqual(result[1].conflict.o, []);
assert.deepEqual(result[1].conflict.a, ['here']);
assert.deepEqual(result[1].conflict.b, ['into']);
assert.deepEqual(result[2].ok, ['touring']);
assert.deepEqual(result[2].conflict, undefined);
});
it('strings can optionally split on given separator', () => {
const o = 'new hampshire, new mexico, north carolina';
const a = 'new hampshire, new jersey, north carolina';
const b = 'new hampshire, new york, north carolina';
const result = Diff3.diff3Merge(a, o, b, { stringSeparator: /,\s+/ });
assert.deepEqual(result[0].ok, ['new hampshire']);
assert.deepEqual(result[0].conflict, undefined);
assert.deepEqual(result[1].ok, undefined);
assert.deepEqual(result[1].conflict.o, ['new mexico']);
assert.deepEqual(result[1].conflict.a, ['new jersey']);
assert.deepEqual(result[1].conflict.b, ['new york']);
assert.deepEqual(result[2].ok, ['north carolina']);
assert.deepEqual(result[2].conflict, undefined);
});
it('excludes false conflicts by default', () => {
const o = 'AA ZZ';
const a = 'AA a b c ZZ';
const b = 'AA a b c ZZ';
const result = Diff3.diff3Merge(a, o, b);
assert.deepEqual(result[0].ok, ['AA', 'a', 'b', 'c', 'ZZ']);
assert.deepEqual(result[0].conflict, undefined);
});
it('can include false conflicts with option', () => {
const o = 'AA ZZ';
const a = 'AA a b c ZZ';
const b = 'AA a b c ZZ';
const result = Diff3.diff3Merge(a, o, b, { excludeFalseConflicts: false });
assert.deepEqual(result[0].ok, ['AA']);
assert.deepEqual(result[0].conflict, undefined);
assert.deepEqual(result[1].ok, undefined);
assert.deepEqual(result[1].conflict.o, []);
assert.deepEqual(result[1].conflict.a, ['a', 'b', 'c']);
assert.deepEqual(result[1].conflict.b, ['a', 'b', 'c']);
assert.deepEqual(result[2].ok, ['ZZ']);
assert.deepEqual(result[2].conflict, undefined);
});
it('avoids improper hunk sorting - see openstreetmap/iD#3058', () => {
const o = ['n4100522632', 'n4100697091', 'n4100697136', 'n4102671583', 'n4102671584', 'n4102671585', 'n4102671586', 'n4102671587', 'n4102671588', 'n4102677889', 'n4102677890', 'n4094374176'];
const a = ['n4100522632', 'n4100697091', 'n4100697136', 'n-10000', 'n4102671583', 'n4102671584', 'n4102671585', 'n4102671586', 'n4102671587', 'n4102671588', 'n4102677889', 'n4102677890', 'n4094374176'];
const b = ['n4100522632', 'n4100697091', 'n4100697136', 'n4102671583', 'n4102671584', 'n4102671585', 'n4102671586', 'n4102671587', 'n4102671588', 'n4102677889', 'n4105613618', 'n4102677890', 'n4105613617', 'n4094374176'];
const expected = ['n4100522632', 'n4100697091', 'n4100697136', 'n-10000', 'n4102671583', 'n4102671584', 'n4102671585', 'n4102671586', 'n4102671587', 'n4102671588', 'n4102677889', 'n4105613618', 'n4102677890', 'n4105613617', 'n4094374176'];
const result = Diff3.diff3Merge(a, o, b);
assert.deepEqual(result[0].ok, expected);
});
it('yaml comparison - issue #46', () => {
const o = `title: "title"
description: "description"`;
const a = `title: "title"
description: "description changed"`;
const b = `title: "title changed"
description: "description"`;
const result = Diff3.diff3Merge(a, o, b, { stringSeparator: /[\r\n]+/ });
assert.deepEqual(result[0].ok, undefined);
assert.deepEqual(result[0].conflict.o, ['title: "title"', 'description: "description"']);
assert.deepEqual(result[0].conflict.a, ['title: "title"', 'description: "description changed"']);
assert.deepEqual(result[0].conflict.b, ['title: "title changed"', 'description: "description"']);
});
});