Skip to content

Commit 27a64d5

Browse files
kevinoidkevinoid
committed
Test Error equality using assertErrorEqual
Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
1 parent 902bf95 commit 27a64d5

1 file changed

Lines changed: 29 additions & 30 deletions

File tree

‎test/inflate-auto.js‎

Lines changed: 29 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ const stream = require('stream');
1010
const streamCompare = require('stream-compare');
1111
const { inspect, promisify } = require('util');
1212
const zlib = require('zlib');
13+
14+
const assertErrorEqual = require('../test-lib/assert-error-equal.js');
1315
const assignOwnPropertyDescriptors =
1416
require('../test-lib/assign-own-property-descriptors.js');
1517
const InflateAuto = require('..');
@@ -318,7 +320,7 @@ function defineFormatTests(format) {
318320
decompress(compressedTA, (errDecompress, dataDecompress) => {
319321
assert.ifError(errDecompress);
320322
InflateAuto.inflateAuto(compressedTA, (errAuto, dataAuto) => {
321-
assert.deepStrictEqual(errAuto, errDecompress);
323+
assertErrorEqual(errAuto, errDecompress);
322324
assert.deepStrictEqual(dataAuto, dataDecompress);
323325
done();
324326
});
@@ -332,7 +334,7 @@ function defineFormatTests(format) {
332334
);
333335
decompress(compressedBuf, (errDecompress, dataDecompress) => {
334336
InflateAuto.inflateAuto(compressedBuf, (errAuto, dataAuto) => {
335-
assert.deepStrictEqual(errAuto, errDecompress);
337+
assertErrorEqual(errAuto, errDecompress);
336338
assert.deepStrictEqual(dataAuto, dataDecompress);
337339
done();
338340
});
@@ -354,7 +356,7 @@ function defineFormatTests(format) {
354356
let errAuto;
355357
try { InflateAuto.inflateAuto(null); } catch (err) { errAuto = err; }
356358

357-
assert.deepStrictEqual(errAuto, errInflate);
359+
assertErrorEqual(errAuto, errInflate);
358360
});
359361

360362
it('throws when called without callback', function() {
@@ -376,7 +378,7 @@ function defineFormatTests(format) {
376378
errAuto = err;
377379
}
378380

379-
assert.deepStrictEqual(errAuto, errInflate);
381+
assertErrorEqual(errAuto, errInflate);
380382
});
381383

382384
it('can accept options argument', (done) => {
@@ -438,7 +440,7 @@ function defineFormatTests(format) {
438440
compressedStr,
439441
opts,
440442
(errAuto, dataAuto) => {
441-
assert.deepStrictEqual(errAuto, errDecompress);
443+
assertErrorEqual(errAuto, errDecompress);
442444
assert.deepStrictEqual(dataAuto, dataDecompress);
443445
done();
444446
},
@@ -454,7 +456,7 @@ function defineFormatTests(format) {
454456
decompress(zeros, (errDecompress, dataDecompress) => {
455457
assert(errDecompress, 'expected Error to test');
456458
InflateAuto.inflateAuto(zeros, (errAuto, dataAuto) => {
457-
assert.deepStrictEqual(errAuto, errDecompress);
459+
assertErrorEqual(errAuto, errDecompress);
458460
assert.deepStrictEqual(dataAuto, dataDecompress);
459461
done();
460462
});
@@ -465,7 +467,7 @@ function defineFormatTests(format) {
465467
const trunc = compressed.slice(0, 1);
466468
decompress(trunc, (errDecompress, dataDecompress) => {
467469
InflateAuto.inflateAuto(trunc, (errAuto, dataAuto) => {
468-
assert.deepStrictEqual(errAuto, errDecompress);
470+
assertErrorEqual(errAuto, errDecompress);
469471
assert.deepStrictEqual(dataAuto, dataDecompress);
470472
done();
471473
});
@@ -478,7 +480,7 @@ function defineFormatTests(format) {
478480
const compressedStr = compressed.toString('binary');
479481
decompress(compressedStr, (errDecompress, dataDecompress) => {
480482
InflateAuto.inflateAuto(compressedStr, (errAuto, dataAuto) => {
481-
assert.deepStrictEqual(errAuto, errDecompress);
483+
assertErrorEqual(errAuto, errDecompress);
482484
assert.deepStrictEqual(dataAuto, dataDecompress);
483485
done();
484486
});
@@ -763,7 +765,7 @@ function defineFormatTests(format) {
763765
errAuto = err;
764766
}
765767

766-
assert.deepStrictEqual(errAuto, errInflate);
768+
assertErrorEqual(errAuto, errInflate);
767769

768770
zlibStream.end(compressed);
769771
inflateAuto.end(compressed);
@@ -793,7 +795,7 @@ function defineFormatTests(format) {
793795
errAuto.message = errInflate.message;
794796
}
795797

796-
assert.deepStrictEqual(errAuto, errInflate);
798+
assertErrorEqual(errAuto, errInflate);
797799
});
798800

799801
it('supports non-Buffer TypedArray', () => {
@@ -853,7 +855,7 @@ function defineFormatTests(format) {
853855
errAuto = err;
854856
}
855857

856-
assert.deepStrictEqual(errAuto, errInflate);
858+
assertErrorEqual(errAuto, errInflate);
857859
assert.deepStrictEqual(dataAuto, dataInflate);
858860
});
859861
});
@@ -885,7 +887,7 @@ function defineFormatTests(format) {
885887
errAuto = err;
886888
}
887889

888-
assert.deepStrictEqual(errAuto, errInflate);
890+
assertErrorEqual(errAuto, errInflate);
889891
assert.deepStrictEqual(dataAuto, dataInflate);
890892
});
891893

@@ -909,7 +911,7 @@ function defineFormatTests(format) {
909911
errAuto = err;
910912
}
911913

912-
assert.deepStrictEqual(errAuto, errInflate);
914+
assertErrorEqual(errAuto, errInflate);
913915
assert.deepStrictEqual(dataAuto, dataInflate);
914916
});
915917
}
@@ -925,7 +927,7 @@ function defineFormatTests(format) {
925927
// eslint-disable-next-line no-new
926928
try { new InflateAuto(options); } catch (err) { errAuto = err; }
927929

928-
assert.deepStrictEqual(errAuto, errInflate);
930+
assertErrorEqual(errAuto, errInflate);
929931
});
930932
}
931933

@@ -943,7 +945,7 @@ function defineFormatTests(format) {
943945
errAuto = err;
944946
}
945947

946-
assert.deepStrictEqual(errAuto, errInflate);
948+
assertErrorEqual(errAuto, errInflate);
947949
});
948950

949951
it(`on write with ${inspect(options)}`, () => {
@@ -955,7 +957,7 @@ function defineFormatTests(format) {
955957
return assertWriteError(
956958
new InflateAuto(options),
957959
compressed,
958-
(errAuto) => assert.deepStrictEqual(errAuto, errInflate),
960+
(errAuto) => assertErrorEqual(errAuto, errInflate),
959961
);
960962
});
961963

@@ -1050,24 +1052,21 @@ function defineFormatTests(format) {
10501052
// Before nodejs/node#32220 (v14) an error is not passed.
10511053
// Not worth the effort to match this behavior. Always error.
10521054
if (zlibArgs[0] === undefined) {
1053-
assert.deepStrictEqual(
1054-
inflateArgs.slice(1),
1055-
zlibArgs.slice(1),
1056-
'same non-err close arguments',
1057-
);
10581055
assertInstanceOf(inflateArgs[0], Error);
10591056
assert.deepStrictEqual(
10601057
inflateArgs[0].code,
10611058
'ERR_STREAM_PREMATURE_CLOSE',
10621059
);
10631060
} else {
1064-
assert.deepStrictEqual(
1065-
inflateArgs,
1066-
zlibArgs,
1067-
'same close arguments',
1068-
);
1061+
assertErrorEqual(inflateArgs[0], zlibArgs[0]);
10691062
}
10701063

1064+
assert.deepStrictEqual(
1065+
inflateArgs.slice(1),
1066+
zlibArgs.slice(1),
1067+
'same non-err close arguments',
1068+
);
1069+
10711070
resolve(result);
10721071
} catch (errAssert) {
10731072
reject(errAssert);
@@ -1186,7 +1185,7 @@ function defineFormatTests(format) {
11861185
// to ERR_INVALID_ARG_TYPE (due to calling finished instead of nextTick).
11871186
// It's not currently worth complicating the code to mimic this.
11881187
if (errInflate && errInflate.code === 'ERR_INVALID_CALLBACK') {
1189-
assert.deepStrictEqual(errAuto, errInflate);
1188+
assertErrorEqual(errAuto, errInflate);
11901189
} else {
11911190
assert.deepStrictEqual(
11921191
errAuto instanceof Error,
@@ -1210,7 +1209,7 @@ function defineFormatTests(format) {
12101209
let errAuto;
12111210
try { inflateAuto.close(false); } catch (err) { errAuto = err; }
12121211

1213-
assert.deepStrictEqual(errAuto, errInflate);
1212+
assertErrorEqual(errAuto, errInflate);
12141213

12151214
// Streams may not emit any events.
12161215
// End comparison after event queue clears.
@@ -1784,7 +1783,7 @@ function defineFormatTests(format) {
17841783
errAuto = err;
17851784
}
17861785

1787-
assert.deepStrictEqual(errAuto, errInflate);
1786+
assertErrorEqual(errAuto, errInflate);
17881787
});
17891788

17901789
it('throws with error listener', () => {
@@ -1809,7 +1808,7 @@ function defineFormatTests(format) {
18091808
errAuto = err;
18101809
}
18111810

1812-
assert.deepStrictEqual(errAuto, errInflate);
1811+
assertErrorEqual(errAuto, errInflate);
18131812
result.checkpoint();
18141813
});
18151814

0 commit comments

Comments
 (0)