test: ensure assertions are reached on more tests · nodejs/node@bc41acf

11

'use strict';

22

// Tests zlib streams with truncated compressed input

334-

require('../common');

4+

const common = require('../common');

55

const assert = require('assert');

66

const zlib = require('zlib');

77

@@ -23,8 +23,7 @@ const errMessage = /unexpected end of file/;

2323

{ comp: 'deflate', decomp: 'inflate', decompSync: 'inflateSync' },

2424

{ comp: 'deflateRaw', decomp: 'inflateRaw', decompSync: 'inflateRawSync' },

2525

].forEach(function(methods) {

26-

zlib[methods.comp](inputString, function(err, compressed) {

27-

assert.ifError(err);

26+

zlib[methods.comp](inputString, common.mustSucceed((compressed) => {

2827

const truncated = compressed.slice(0, compressed.length / 2);

2928

const toUTF8 = (buffer) => buffer.toString('utf-8');

3029

@@ -33,20 +32,19 @@ const errMessage = /unexpected end of file/;

3332

assert.strictEqual(toUTF8(decompressed), inputString);

34333534

// async sanity

36-

zlib[methods.decomp](compressed, function(err, result) {

37-

assert.ifError(err);

35+

zlib[methods.decomp](compressed, common.mustSucceed((result) => {

3836

assert.strictEqual(toUTF8(result), inputString);

39-

});

37+

}));

40384139

// Sync truncated input test

4240

assert.throws(function() {

4341

zlib[methods.decompSync](truncated);

4442

}, errMessage);

45434644

// Async truncated input test

47-

zlib[methods.decomp](truncated, function(err, result) {

45+

zlib[methods.decomp](truncated, common.mustCall((err) => {

4846

assert.match(err.message, errMessage);

49-

});

47+

}));

50485149

const syncFlushOpt = { finishFlush: zlib.constants.Z_SYNC_FLUSH };

5250

@@ -55,10 +53,9 @@ const errMessage = /unexpected end of file/;

5553

assert.strictEqual(result, inputString.slice(0, result.length));

56545755

// Async truncated input test, finishFlush = Z_SYNC_FLUSH

58-

zlib[methods.decomp](truncated, syncFlushOpt, function(err, decompressed) {

59-

assert.ifError(err);

56+

zlib[methods.decomp](truncated, syncFlushOpt, common.mustSucceed((decompressed) => {

6057

const result = toUTF8(decompressed);

6158

assert.strictEqual(result, inputString.slice(0, result.length));

62-

});

63-

});

59+

}));

60+

}));

6461

});