Skip to content

Commit

Permalink
test: improve checks in test-path-parse-format
Browse files Browse the repository at this point in the history
- validate full error messages
- use assert.throws() instead of try...catch

PR-URL: nodejs#11223
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
  • Loading branch information
cjihrig authored and krydos committed Feb 25, 2017
1 parent fc83c7f commit 73adab4
Showing 1 changed file with 16 additions and 21 deletions.
37 changes: 16 additions & 21 deletions test/parallel/test-path-parse-format.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
const common = require('../common');
require('../common');
const assert = require('assert');
const path = require('path');

Expand Down Expand Up @@ -69,23 +69,27 @@ const unixSpecialCaseFormatTests = [

const errors = [
{method: 'parse', input: [null],
message: /Path must be a string. Received null/},
message: /^TypeError: Path must be a string. Received null$/},
{method: 'parse', input: [{}],
message: /Path must be a string. Received {}/},
message: /^TypeError: Path must be a string. Received {}$/},
{method: 'parse', input: [true],
message: /Path must be a string. Received true/},
message: /^TypeError: Path must be a string. Received true$/},
{method: 'parse', input: [1],
message: /Path must be a string. Received 1/},
message: /^TypeError: Path must be a string. Received 1$/},
{method: 'parse', input: [],
message: /Path must be a string. Received undefined/},
message: /^TypeError: Path must be a string. Received undefined$/},
{method: 'format', input: [null],
message: /Parameter "pathObject" must be an object, not/},
message:
/^TypeError: Parameter "pathObject" must be an object, not object$/},
{method: 'format', input: [''],
message: /Parameter "pathObject" must be an object, not string/},
message:
/^TypeError: Parameter "pathObject" must be an object, not string$/},
{method: 'format', input: [true],
message: /Parameter "pathObject" must be an object, not boolean/},
message:
/^TypeError: Parameter "pathObject" must be an object, not boolean$/},
{method: 'format', input: [1],
message: /Parameter "pathObject" must be an object, not number/},
message:
/^TypeError: Parameter "pathObject" must be an object, not number$/},
];

checkParseFormat(path.win32, winPaths);
Expand Down Expand Up @@ -158,18 +162,9 @@ assert.strictEqual(failures.length, 0, failures.join(''));

function checkErrors(path) {
errors.forEach(function(errorCase) {
try {
assert.throws(() => {
path[errorCase.method].apply(path, errorCase.input);
} catch (err) {
assert.ok(err instanceof TypeError);
assert.ok(
errorCase.message.test(err.message),
'expected ' + errorCase.message + ' to match ' + err.message
);
return;
}

common.fail('should have thrown');
}, errorCase.message);
});
}

Expand Down

0 comments on commit 73adab4

Please sign in to comment.