Skip to content

Commit

Permalink
test: fix actual and expected order
Browse files Browse the repository at this point in the history
In addition use the newer common.expectsError version.

PR-URL: #14881
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
  • Loading branch information
BridgeAR authored and jasnell committed Sep 20, 2017
1 parent 5394458 commit 757c342
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions test/parallel/test-console.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ const assert = require('assert');
assert.ok(process.stdout.writable);
assert.ok(process.stderr.writable);
// Support legacy API
assert.strictEqual('number', typeof process.stdout.fd);
assert.strictEqual('number', typeof process.stderr.fd);
assert.strictEqual(typeof process.stdout.fd, 'number');
assert.strictEqual(typeof process.stderr.fd, 'number');

assert.doesNotThrow(function() {
process.once('warning', common.mustCall((warning) => {
Expand Down Expand Up @@ -123,35 +123,35 @@ const expectedStrings = [
];

for (const expected of expectedStrings) {
assert.strictEqual(`${expected}\n`, strings.shift());
assert.strictEqual(`${expected}\n`, errStrings.shift());
assert.strictEqual(strings.shift(), `${expected}\n`);
assert.strictEqual(errStrings.shift(), `${expected}\n`);
}

for (const expected of expectedStrings) {
assert.strictEqual(`${expected}\n`, strings.shift());
assert.strictEqual(`${expected}\n`, errStrings.shift());
assert.strictEqual(strings.shift(), `${expected}\n`);
assert.strictEqual(errStrings.shift(), `${expected}\n`);
}

assert.strictEqual("{ foo: 'bar', inspect: [Function: inspect] }\n",
strings.shift());
assert.strictEqual("{ foo: 'bar', inspect: [Function: inspect] }\n",
strings.shift());
assert.strictEqual(strings.shift(),
"{ foo: 'bar', inspect: [Function: inspect] }\n");
assert.strictEqual(strings.shift(),
"{ foo: 'bar', inspect: [Function: inspect] }\n");
assert.ok(strings.shift().includes('foo: [Object]'));
assert.strictEqual(strings.shift().includes('baz'), false);
assert.ok(/^label: \d+\.\d{3}ms$/.test(strings.shift().trim()));
assert.ok(/^__proto__: \d+\.\d{3}ms$/.test(strings.shift().trim()));
assert.ok(/^constructor: \d+\.\d{3}ms$/.test(strings.shift().trim()));
assert.ok(/^hasOwnProperty: \d+\.\d{3}ms$/.test(strings.shift().trim()));

assert.strictEqual('Trace: This is a {"formatted":"trace"} 10 foo',
errStrings.shift().split('\n').shift());
assert.strictEqual(errStrings.shift().split('\n').shift(),
'Trace: This is a {"formatted":"trace"} 10 foo');

assert.throws(() => {
common.expectsError(() => {
console.assert(false, 'should throw');
}, common.expectsError({
}, {
code: 'ERR_ASSERTION',
message: /^should throw$/
}));
});

assert.doesNotThrow(() => {
console.assert(true, 'this should not throw');
Expand Down

0 comments on commit 757c342

Please sign in to comment.