assert: switch inputs
to values
The wording seems clearer when using `values` instead of `inputs`. PR-URL: https://github.com/nodejs/node/pull/23056 Refs: https://github.com/nodejs/node/issues/22763 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
This commit is contained in:
parent
be26c76114
commit
b8a8eedf32
@ -11,18 +11,18 @@ let red = '';
|
|||||||
let white = '';
|
let white = '';
|
||||||
|
|
||||||
const kReadableOperator = {
|
const kReadableOperator = {
|
||||||
deepStrictEqual: 'Expected inputs to be strictly deep-equal:',
|
deepStrictEqual: 'Expected values to be strictly deep-equal:',
|
||||||
strictEqual: 'Expected inputs to be strictly equal:',
|
strictEqual: 'Expected values to be strictly equal:',
|
||||||
strictEqualObject: 'Expected "actual" to be reference-equal to "expected":',
|
strictEqualObject: 'Expected "actual" to be reference-equal to "expected":',
|
||||||
deepEqual: 'Expected inputs to be loosely deep-equal:',
|
deepEqual: 'Expected values to be loosely deep-equal:',
|
||||||
equal: 'Expected inputs to be loosely equal:',
|
equal: 'Expected values to be loosely equal:',
|
||||||
notDeepStrictEqual: 'Expected "actual" not to be strictly deep-equal to:',
|
notDeepStrictEqual: 'Expected "actual" not to be strictly deep-equal to:',
|
||||||
notStrictEqual: 'Expected "actual" to be strictly unequal to:',
|
notStrictEqual: 'Expected "actual" to be strictly unequal to:',
|
||||||
// eslint-disable-next-line max-len
|
// eslint-disable-next-line max-len
|
||||||
notStrictEqualObject: 'Expected "actual" not to be reference-equal to "expected":',
|
notStrictEqualObject: 'Expected "actual" not to be reference-equal to "expected":',
|
||||||
notDeepEqual: 'Expected "actual" not to be loosely deep-equal to:',
|
notDeepEqual: 'Expected "actual" not to be loosely deep-equal to:',
|
||||||
notEqual: 'Expected "actual" to be loosely unequal to:',
|
notEqual: 'Expected "actual" to be loosely unequal to:',
|
||||||
notIdentical: 'Inputs identical but not reference equal:',
|
notIdentical: 'Values identical but not reference-equal:',
|
||||||
};
|
};
|
||||||
|
|
||||||
// Comparing short primitives should just show === / !== instead of using the
|
// Comparing short primitives should just show === / !== instead of using the
|
||||||
@ -74,7 +74,7 @@ function createErrDiff(actual, expected, operator) {
|
|||||||
let i = 0;
|
let i = 0;
|
||||||
let indicator = '';
|
let indicator = '';
|
||||||
|
|
||||||
// In case both inputs are objects explicitly mark them as not reference equal
|
// In case both values are objects explicitly mark them as not reference equal
|
||||||
// for the `strictEqual` operator.
|
// for the `strictEqual` operator.
|
||||||
if (operator === 'strictEqual' &&
|
if (operator === 'strictEqual' &&
|
||||||
typeof actual === 'object' &&
|
typeof actual === 'object' &&
|
||||||
|
@ -2,7 +2,7 @@ assert.js:*
|
|||||||
throw err;
|
throw err;
|
||||||
^
|
^
|
||||||
|
|
||||||
AssertionError [ERR_ASSERTION]: Expected inputs to be strictly deep-equal:
|
AssertionError [ERR_ASSERTION]: Expected values to be strictly deep-equal:
|
||||||
+ actual - expected
|
+ actual - expected
|
||||||
|
|
||||||
+ Comparison {}
|
+ Comparison {}
|
||||||
|
@ -3,7 +3,7 @@ assert.js:*
|
|||||||
throw new AssertionError(obj);
|
throw new AssertionError(obj);
|
||||||
^
|
^
|
||||||
|
|
||||||
AssertionError [ERR_ASSERTION]: Expected inputs to be strictly equal:
|
AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:
|
||||||
|
|
||||||
1 !== 2
|
1 !== 2
|
||||||
|
|
||||||
|
@ -26,14 +26,14 @@ if (process.stdout.isTTY)
|
|||||||
assert.throws(
|
assert.throws(
|
||||||
() => assert.deepStrictEqual(date, fake),
|
() => assert.deepStrictEqual(date, fake),
|
||||||
{
|
{
|
||||||
message: 'Expected inputs to be strictly deep-equal:\n' +
|
message: 'Expected values to be strictly deep-equal:\n' +
|
||||||
'+ actual - expected\n\n+ 2016-01-01T00:00:00.000Z\n- Date {}'
|
'+ actual - expected\n\n+ 2016-01-01T00:00:00.000Z\n- Date {}'
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
assert.throws(
|
assert.throws(
|
||||||
() => assert.deepStrictEqual(fake, date),
|
() => assert.deepStrictEqual(fake, date),
|
||||||
{
|
{
|
||||||
message: 'Expected inputs to be strictly deep-equal:\n' +
|
message: 'Expected values to be strictly deep-equal:\n' +
|
||||||
'+ actual - expected\n\n+ Date {}\n- 2016-01-01T00:00:00.000Z'
|
'+ actual - expected\n\n+ Date {}\n- 2016-01-01T00:00:00.000Z'
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
@ -4,7 +4,7 @@ require('../common');
|
|||||||
const assert = require('assert');
|
const assert = require('assert');
|
||||||
const util = require('util');
|
const util = require('util');
|
||||||
const { AssertionError } = assert;
|
const { AssertionError } = assert;
|
||||||
const defaultMsgStart = 'Expected inputs to be strictly deep-equal:\n';
|
const defaultMsgStart = 'Expected values to be strictly deep-equal:\n';
|
||||||
const defaultMsgStartFull = `${defaultMsgStart}+ actual - expected`;
|
const defaultMsgStartFull = `${defaultMsgStart}+ actual - expected`;
|
||||||
|
|
||||||
// Disable colored output to prevent color codes from breaking assertion
|
// Disable colored output to prevent color codes from breaking assertion
|
||||||
@ -16,7 +16,7 @@ if (process.stdout.isTTY)
|
|||||||
// Template tag function turning an error message into a RegExp
|
// Template tag function turning an error message into a RegExp
|
||||||
// for assert.throws()
|
// for assert.throws()
|
||||||
function re(literals, ...values) {
|
function re(literals, ...values) {
|
||||||
let result = 'Expected inputs to be loosely deep-equal:\n\n';
|
let result = 'Expected values to be loosely deep-equal:\n\n';
|
||||||
for (const [i, value] of values.entries()) {
|
for (const [i, value] of values.entries()) {
|
||||||
const str = util.inspect(value, {
|
const str = util.inspect(value, {
|
||||||
compact: false,
|
compact: false,
|
||||||
|
@ -34,8 +34,8 @@ const a = assert;
|
|||||||
if (process.stdout.isTTY)
|
if (process.stdout.isTTY)
|
||||||
process.env.NODE_DISABLE_COLORS = '1';
|
process.env.NODE_DISABLE_COLORS = '1';
|
||||||
|
|
||||||
const strictEqualMessageStart = 'Expected inputs to be strictly equal:\n';
|
const strictEqualMessageStart = 'Expected values to be strictly equal:\n';
|
||||||
const start = 'Expected inputs to be strictly deep-equal:';
|
const start = 'Expected values to be strictly deep-equal:';
|
||||||
const actExp = '+ actual - expected';
|
const actExp = '+ actual - expected';
|
||||||
|
|
||||||
assert.ok(a.AssertionError.prototype instanceof Error,
|
assert.ok(a.AssertionError.prototype instanceof Error,
|
||||||
@ -1013,7 +1013,7 @@ assert.throws(() => { throw null; }, 'foo');
|
|||||||
assert.throws(
|
assert.throws(
|
||||||
() => assert.strictEqual([], []),
|
() => assert.strictEqual([], []),
|
||||||
{
|
{
|
||||||
message: 'Inputs identical but not reference equal:\n\n[]\n'
|
message: 'Values identical but not reference-equal:\n\n[]\n'
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -1107,7 +1107,7 @@ assert.throws(
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
// Check for reference equal objects in `notStrictEqual()`
|
// Check for reference-equal objects in `notStrictEqual()`
|
||||||
assert.throws(
|
assert.throws(
|
||||||
() => {
|
() => {
|
||||||
const obj = {};
|
const obj = {};
|
||||||
|
@ -7,7 +7,7 @@ try {
|
|||||||
process.env.COLORTERM = '1';
|
process.env.COLORTERM = '1';
|
||||||
assert.deepStrictEqual([1, 2, 2, 2], [2, 2, 2, 2]);
|
assert.deepStrictEqual([1, 2, 2, 2], [2, 2, 2, 2]);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
const expected = 'Expected inputs to be strictly deep-equal:\n' +
|
const expected = 'Expected values to be strictly deep-equal:\n' +
|
||||||
'\u001b[32m+ actual\u001b[39m \u001b[31m- expected\u001b[39m' +
|
'\u001b[32m+ actual\u001b[39m \u001b[31m- expected\u001b[39m' +
|
||||||
' \u001b[34m...\u001b[39m Lines skipped\n\n' +
|
' \u001b[34m...\u001b[39m Lines skipped\n\n' +
|
||||||
' [\n' +
|
' [\n' +
|
||||||
|
Loading…
x
Reference in New Issue
Block a user