Skip to content

Commit 618c8bc

Browse files
committed
Swap tap for node:test
Node's built-in test runner works great!
1 parent f9a7850 commit 618c8bc

10 files changed

Lines changed: 288 additions & 334 deletions

‎package.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,15 @@
4343
"build:browser": "esbuild ./index.mjs --platform=browser --format=iife --global-name=Diff3 --bundle --sourcemap --outfile=./dist/index.iife.js",
4444
"build:cjs": "esbuild ./index.mjs --platform=node --format=cjs --sourcemap --outfile=./dist/index.cjs",
4545
"lint": "eslint index.mjs test/*.js",
46-
"tap": "c8 tap --reporter terse --no-cov test/*.js",
47-
"test": "run-s build lint tap"
46+
"test": "run-s build test:node",
47+
"test:node": "c8 node --test test/"
4848
},
4949
"devDependencies": {
5050
"c8": "^8.0.1",
5151
"esbuild": "^0.19.10",
5252
"eslint": "^8.56.0",
5353
"npm-run-all": "^4.1.5",
54-
"shx": "^0.3.4",
55-
"tap": "^16.3.10"
54+
"shx": "^0.3.4"
5655
},
5756
"sideEffects": false,
5857
"publishConfig": {

‎test/LCS.test.js‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,33 @@
1-
import { test } from 'tap';
1+
import { test } from 'node:test';
2+
import { strict as assert } from 'node:assert';
23
import * as Diff3 from '../index.mjs';
34

4-
test('LCS', t => {
5+
test('LCS', async t => {
56

6-
t.test('returns the LCS of two arrays', t => {
7+
await t.test('returns the LCS of two arrays', t => {
78
const a = ['AA', 'a', 'b', 'c', 'ZZ', 'new', '00', 'a', 'a', 'M', '99'];
89
const b = ['AA', 'a', 'd', 'c', 'ZZ', '11', 'M', 'z', 'z', '99'];
910
const result = Diff3.LCS(a, b);
1011
const NULLRESULT = { buffer1index: -1, buffer2index: -1, chain: null };
1112

12-
t.same(result.buffer1index, 10); // '99'
13-
t.same(result.buffer2index, 9);
13+
assert.deepEqual(result.buffer1index, 10); // '99'
14+
assert.deepEqual(result.buffer2index, 9);
1415

15-
t.same(result.chain.buffer1index, 9); // 'M'
16-
t.same(result.chain.buffer2index, 6);
16+
assert.deepEqual(result.chain.buffer1index, 9); // 'M'
17+
assert.deepEqual(result.chain.buffer2index, 6);
1718

18-
t.same(result.chain.chain.buffer1index, 4); // 'ZZ'
19-
t.same(result.chain.chain.buffer2index, 4);
19+
assert.deepEqual(result.chain.chain.buffer1index, 4); // 'ZZ'
20+
assert.deepEqual(result.chain.chain.buffer2index, 4);
2021

21-
t.same(result.chain.chain.chain.buffer1index, 3); // 'c'
22-
t.same(result.chain.chain.chain.buffer2index, 3);
22+
assert.deepEqual(result.chain.chain.chain.buffer1index, 3); // 'c'
23+
assert.deepEqual(result.chain.chain.chain.buffer2index, 3);
2324

24-
t.same(result.chain.chain.chain.chain.buffer1index, 1); // 'a'
25-
t.same(result.chain.chain.chain.chain.buffer2index, 1);
25+
assert.deepEqual(result.chain.chain.chain.chain.buffer1index, 1); // 'a'
26+
assert.deepEqual(result.chain.chain.chain.chain.buffer2index, 1);
2627

27-
t.same(result.chain.chain.chain.chain.chain.buffer1index, 0); // 'AA'
28-
t.same(result.chain.chain.chain.chain.chain.buffer2index, 0);
29-
t.same(result.chain.chain.chain.chain.chain.chain, NULLRESULT);
30-
31-
t.end();
28+
assert.deepEqual(result.chain.chain.chain.chain.chain.buffer1index, 0); // 'AA'
29+
assert.deepEqual(result.chain.chain.chain.chain.chain.buffer2index, 0);
30+
assert.deepEqual(result.chain.chain.chain.chain.chain.chain, NULLRESULT);
3231
});
3332

34-
t.end();
3533
});

‎test/diff3Merge.test.js‎

Lines changed: 55 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import { test } from 'tap';
1+
import { test } from 'node:test';
2+
import { strict as assert } from 'node:assert';
23
import * as Diff3 from '../index.mjs';
34

4-
test('diff3Merge', t => {
5+
test('diff3Merge', async t => {
56

6-
t.test('performs diff3 merge on arrays', t => {
7+
await t.test('performs diff3 merge on arrays', t => {
78
const o = ['AA', 'ZZ', '00', 'M', '99'];
89
const a = ['AA', 'a', 'b', 'c', 'ZZ', 'new', '00', 'a', 'a', 'M', '99'];
910
const b = ['AA', 'a', 'd', 'c', 'ZZ', '11', 'M', 'z', 'z', '99'];
@@ -38,115 +39,106 @@ test('diff3Merge', t => {
3839
99
3940
*/
4041

41-
t.same(result[0].ok, ['AA']);
42-
t.same(result[0].conflict, undefined);
42+
assert.deepEqual(result[0].ok, ['AA']);
43+
assert.deepEqual(result[0].conflict, undefined);
4344

44-
t.same(result[1].ok, undefined);
45-
t.same(result[1].conflict.o, []);
46-
t.same(result[1].conflict.a, ['a', 'b', 'c']);
47-
t.same(result[1].conflict.b, ['a', 'd', 'c']);
45+
assert.deepEqual(result[1].ok, undefined);
46+
assert.deepEqual(result[1].conflict.o, []);
47+
assert.deepEqual(result[1].conflict.a, ['a', 'b', 'c']);
48+
assert.deepEqual(result[1].conflict.b, ['a', 'd', 'c']);
4849

49-
t.same(result[2].ok, ['ZZ']);
50-
t.same(result[2].conflict, undefined);
50+
assert.deepEqual(result[2].ok, ['ZZ']);
51+
assert.deepEqual(result[2].conflict, undefined);
5152

52-
t.same(result[3].ok, undefined);
53-
t.same(result[3].conflict.o, ['00']);
54-
t.same(result[3].conflict.a, ['new', '00', 'a', 'a']);
55-
t.same(result[3].conflict.b, ['11']);
53+
assert.deepEqual(result[3].ok, undefined);
54+
assert.deepEqual(result[3].conflict.o, ['00']);
55+
assert.deepEqual(result[3].conflict.a, ['new', '00', 'a', 'a']);
56+
assert.deepEqual(result[3].conflict.b, ['11']);
5657

57-
t.same(result[4].ok, ['M', 'z', 'z', '99']);
58-
t.same(result[4].conflict, undefined);
59-
60-
t.end();
58+
assert.deepEqual(result[4].ok, ['M', 'z', 'z', '99']);
59+
assert.deepEqual(result[4].conflict, undefined);
6160
});
6261

6362

64-
t.test('strings split on whitespace by default to avoid surprises - issue #9', t => {
63+
await t.test('strings split on whitespace by default to avoid surprises - issue #9', t => {
6564
const o = 'was touring';
6665
const a = 'was here touring';
6766
const b = 'was into touring';
6867
const result = Diff3.diff3Merge(a, o, b);
6968

70-
t.same(result[0].ok, ['was']);
71-
t.same(result[0].conflict, undefined);
72-
73-
t.same(result[1].ok, undefined);
74-
t.same(result[1].conflict.o, []);
75-
t.same(result[1].conflict.a, ['here']);
76-
t.same(result[1].conflict.b, ['into']);
69+
assert.deepEqual(result[0].ok, ['was']);
70+
assert.deepEqual(result[0].conflict, undefined);
7771

78-
t.same(result[2].ok, ['touring']);
79-
t.same(result[2].conflict, undefined);
72+
assert.deepEqual(result[1].ok, undefined);
73+
assert.deepEqual(result[1].conflict.o, []);
74+
assert.deepEqual(result[1].conflict.a, ['here']);
75+
assert.deepEqual(result[1].conflict.b, ['into']);
8076

81-
t.end();
77+
assert.deepEqual(result[2].ok, ['touring']);
78+
assert.deepEqual(result[2].conflict, undefined);
8279
});
8380

84-
t.test('strings can optionally split on given separator', t => {
81+
await t.test('strings can optionally split on given separator', t => {
8582
const o = 'new hampshire, new mexico, north carolina';
8683
const a = 'new hampshire, new jersey, north carolina';
8784
const b = 'new hampshire, new york, north carolina';
8885
const result = Diff3.diff3Merge(a, o, b, { stringSeparator: /,\s+/ });
8986

90-
t.same(result[0].ok, ['new hampshire']);
91-
t.same(result[0].conflict, undefined);
87+
assert.deepEqual(result[0].ok, ['new hampshire']);
88+
assert.deepEqual(result[0].conflict, undefined);
9289

93-
t.same(result[1].ok, undefined);
94-
t.same(result[1].conflict.o, ['new mexico']);
95-
t.same(result[1].conflict.a, ['new jersey']);
96-
t.same(result[1].conflict.b, ['new york']);
90+
assert.deepEqual(result[1].ok, undefined);
91+
assert.deepEqual(result[1].conflict.o, ['new mexico']);
92+
assert.deepEqual(result[1].conflict.a, ['new jersey']);
93+
assert.deepEqual(result[1].conflict.b, ['new york']);
9794

98-
t.same(result[2].ok, ['north carolina']);
99-
t.same(result[2].conflict, undefined);
100-
101-
t.end();
95+
assert.deepEqual(result[2].ok, ['north carolina']);
96+
assert.deepEqual(result[2].conflict, undefined);
10297
});
10398

10499

105-
t.test('excludes false conflicts by default', t => {
100+
await t.test('excludes false conflicts by default', t => {
106101
const o = 'AA ZZ';
107102
const a = 'AA a b c ZZ';
108103
const b = 'AA a b c ZZ';
109104
const result = Diff3.diff3Merge(a, o, b);
110105

111-
t.same(result[0].ok, ['AA', 'a', 'b', 'c', 'ZZ']);
112-
t.same(result[0].conflict, undefined);
113-
t.end();
106+
assert.deepEqual(result[0].ok, ['AA', 'a', 'b', 'c', 'ZZ']);
107+
assert.deepEqual(result[0].conflict, undefined);
114108
});
115109

116110

117-
t.test('can include false conflicts with option', t => {
111+
await t.test('can include false conflicts with option', t => {
118112
const o = 'AA ZZ';
119113
const a = 'AA a b c ZZ';
120114
const b = 'AA a b c ZZ';
121115
const result = Diff3.diff3Merge(a, o, b, { excludeFalseConflicts: false });
122116

123-
t.same(result[0].ok, ['AA']);
124-
t.same(result[0].conflict, undefined);
117+
assert.deepEqual(result[0].ok, ['AA']);
118+
assert.deepEqual(result[0].conflict, undefined);
125119

126-
t.same(result[1].ok, undefined);
127-
t.same(result[1].conflict.o, []);
128-
t.same(result[1].conflict.a, ['a', 'b', 'c']);
129-
t.same(result[1].conflict.b, ['a', 'b', 'c']);
120+
assert.deepEqual(result[1].ok, undefined);
121+
assert.deepEqual(result[1].conflict.o, []);
122+
assert.deepEqual(result[1].conflict.a, ['a', 'b', 'c']);
123+
assert.deepEqual(result[1].conflict.b, ['a', 'b', 'c']);
130124

131-
t.same(result[2].ok, ['ZZ']);
132-
t.same(result[2].conflict, undefined);
133-
t.end();
125+
assert.deepEqual(result[2].ok, ['ZZ']);
126+
assert.deepEqual(result[2].conflict, undefined);
134127
});
135128

136129

137-
t.test('avoids improper hunk sorting - see openstreetmap/iD#3058', t => {
130+
await t.test('avoids improper hunk sorting - see openstreetmap/iD#3058', t => {
138131
const o = ['n4100522632', 'n4100697091', 'n4100697136', 'n4102671583', 'n4102671584', 'n4102671585', 'n4102671586', 'n4102671587', 'n4102671588', 'n4102677889', 'n4102677890', 'n4094374176'];
139132
const a = ['n4100522632', 'n4100697091', 'n4100697136', 'n-10000', 'n4102671583', 'n4102671584', 'n4102671585', 'n4102671586', 'n4102671587', 'n4102671588', 'n4102677889', 'n4102677890', 'n4094374176'];
140133
const b = ['n4100522632', 'n4100697091', 'n4100697136', 'n4102671583', 'n4102671584', 'n4102671585', 'n4102671586', 'n4102671587', 'n4102671588', 'n4102677889', 'n4105613618', 'n4102677890', 'n4105613617', 'n4094374176'];
141134
const expected = ['n4100522632', 'n4100697091', 'n4100697136', 'n-10000', 'n4102671583', 'n4102671584', 'n4102671585', 'n4102671586', 'n4102671587', 'n4102671588', 'n4102677889', 'n4105613618', 'n4102677890', 'n4105613617', 'n4094374176'];
142135
const result = Diff3.diff3Merge(a, o, b);
143136

144-
t.same(result[0].ok, expected);
145-
t.end();
137+
assert.deepEqual(result[0].ok, expected);
146138
});
147139

148140

149-
t.test('yaml comparison - issue #46', t => {
141+
await t.test('yaml comparison - issue #46', t => {
150142
const o = `title: "title"
151143
description: "description"`;
152144
const a = `title: "title"
@@ -155,12 +147,9 @@ description: "description changed"`;
155147
description: "description"`;
156148
const result = Diff3.diff3Merge(a, o, b, { stringSeparator: /[\r\n]+/ });
157149

158-
t.same(result[0].ok, undefined);
159-
t.same(result[0].conflict.o, ['title: "title"', 'description: "description"']);
160-
t.same(result[0].conflict.a, ['title: "title"', 'description: "description changed"']);
161-
t.same(result[0].conflict.b, ['title: "title changed"', 'description: "description"']);
162-
t.end();
150+
assert.deepEqual(result[0].ok, undefined);
151+
assert.deepEqual(result[0].conflict.o, ['title: "title"', 'description: "description"']);
152+
assert.deepEqual(result[0].conflict.a, ['title: "title"', 'description: "description changed"']);
153+
assert.deepEqual(result[0].conflict.b, ['title: "title changed"', 'description: "description"']);
163154
});
164-
165-
t.end();
166155
});

‎test/diff3MergeRegions.test.js‎

Lines changed: 49 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,66 @@
1-
import { test } from 'tap';
1+
import { test } from 'node:test';
2+
import { strict as assert } from 'node:assert';
23
import * as Diff3 from '../index.mjs';
34

4-
test('diff3MergeRegions', t => {
5+
test('diff3MergeRegions', async t => {
56

6-
t.test('returns results of 3-way diff from o,a,b arrays', t => {
7+
await t.test('returns results of 3-way diff from o,a,b arrays', t => {
78
const o = ['AA', 'ZZ', '00', 'M', '99'];
89
const a = ['AA', 'a', 'b', 'c', 'ZZ', 'new', '00', 'a', 'a', 'M', '99'];
910
const b = ['AA', 'a', 'd', 'c', 'ZZ', '11', 'M', 'z', 'z', '99'];
1011
const result = Diff3.diff3MergeRegions(a, o, b);
1112

12-
t.same(result[0].stable, true);
13-
t.same(result[0].buffer, 'o');
14-
t.same(result[0].bufferStart, 0);
15-
t.same(result[0].bufferLength, 1);
16-
t.same(result[0].bufferContent, ['AA']);
13+
assert.deepEqual(result[0].stable, true);
14+
assert.deepEqual(result[0].buffer, 'o');
15+
assert.deepEqual(result[0].bufferStart, 0);
16+
assert.deepEqual(result[0].bufferLength, 1);
17+
assert.deepEqual(result[0].bufferContent, ['AA']);
1718

18-
t.same(result[1].stable, false);
19-
t.same(result[1].aStart, 1);
20-
t.same(result[1].aLength, 3);
21-
t.same(result[1].aContent, ['a', 'b', 'c']);
22-
t.same(result[1].oStart, 1);
23-
t.same(result[1].oLength, 0);
24-
t.same(result[1].oContent, []);
25-
t.same(result[1].bStart, 1);
26-
t.same(result[1].bLength, 3);
27-
t.same(result[1].bContent, ['a', 'd', 'c']);
19+
assert.deepEqual(result[1].stable, false);
20+
assert.deepEqual(result[1].aStart, 1);
21+
assert.deepEqual(result[1].aLength, 3);
22+
assert.deepEqual(result[1].aContent, ['a', 'b', 'c']);
23+
assert.deepEqual(result[1].oStart, 1);
24+
assert.deepEqual(result[1].oLength, 0);
25+
assert.deepEqual(result[1].oContent, []);
26+
assert.deepEqual(result[1].bStart, 1);
27+
assert.deepEqual(result[1].bLength, 3);
28+
assert.deepEqual(result[1].bContent, ['a', 'd', 'c']);
2829

29-
t.same(result[2].stable, true);
30-
t.same(result[2].buffer, 'o');
31-
t.same(result[2].bufferStart, 1);
32-
t.same(result[2].bufferLength, 1);
33-
t.same(result[2].bufferContent, ['ZZ']);
30+
assert.deepEqual(result[2].stable, true);
31+
assert.deepEqual(result[2].buffer, 'o');
32+
assert.deepEqual(result[2].bufferStart, 1);
33+
assert.deepEqual(result[2].bufferLength, 1);
34+
assert.deepEqual(result[2].bufferContent, ['ZZ']);
3435

35-
t.same(result[3].stable, false);
36-
t.same(result[3].aStart, 5);
37-
t.same(result[3].aLength, 4);
38-
t.same(result[3].aContent, ['new', '00', 'a', 'a']);
39-
t.same(result[3].oStart, 2);
40-
t.same(result[3].oLength, 1);
41-
t.same(result[3].oContent, ['00']);
42-
t.same(result[3].bStart, 5);
43-
t.same(result[3].bLength, 1);
44-
t.same(result[3].bContent, ['11']);
36+
assert.deepEqual(result[3].stable, false);
37+
assert.deepEqual(result[3].aStart, 5);
38+
assert.deepEqual(result[3].aLength, 4);
39+
assert.deepEqual(result[3].aContent, ['new', '00', 'a', 'a']);
40+
assert.deepEqual(result[3].oStart, 2);
41+
assert.deepEqual(result[3].oLength, 1);
42+
assert.deepEqual(result[3].oContent, ['00']);
43+
assert.deepEqual(result[3].bStart, 5);
44+
assert.deepEqual(result[3].bLength, 1);
45+
assert.deepEqual(result[3].bContent, ['11']);
4546

46-
t.same(result[4].stable, true);
47-
t.same(result[4].buffer, 'o');
48-
t.same(result[4].bufferStart, 3);
49-
t.same(result[4].bufferLength, 1);
50-
t.same(result[4].bufferContent, ['M']);
47+
assert.deepEqual(result[4].stable, true);
48+
assert.deepEqual(result[4].buffer, 'o');
49+
assert.deepEqual(result[4].bufferStart, 3);
50+
assert.deepEqual(result[4].bufferLength, 1);
51+
assert.deepEqual(result[4].bufferContent, ['M']);
5152

52-
t.same(result[5].stable, true);
53-
t.same(result[5].buffer, 'b');
54-
t.same(result[5].bufferStart, 7);
55-
t.same(result[5].bufferLength, 2);
56-
t.same(result[5].bufferContent, ['z', 'z']);
53+
assert.deepEqual(result[5].stable, true);
54+
assert.deepEqual(result[5].buffer, 'b');
55+
assert.deepEqual(result[5].bufferStart, 7);
56+
assert.deepEqual(result[5].bufferLength, 2);
57+
assert.deepEqual(result[5].bufferContent, ['z', 'z']);
5758

58-
t.same(result[6].stable, true);
59-
t.same(result[6].buffer, 'o');
60-
t.same(result[6].bufferStart, 4);
61-
t.same(result[6].bufferLength, 1);
62-
t.same(result[6].bufferContent, ['99']);
63-
64-
t.end();
59+
assert.deepEqual(result[6].stable, true);
60+
assert.deepEqual(result[6].buffer, 'o');
61+
assert.deepEqual(result[6].bufferStart, 4);
62+
assert.deepEqual(result[6].bufferLength, 1);
63+
assert.deepEqual(result[6].bufferContent, ['99']);
6564
});
6665

67-
t.end();
6866
});

0 commit comments

Comments
 (0)