Skip to content

Commit

Permalink
test: extended test to makeCallback cb type check
Browse files Browse the repository at this point in the history
makeCallback and makeStatsCallback are both tested intedependently.

PR-URL: #12140
Fixes: #12136
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
  • Loading branch information
lucamaraschi authored and mhdawson committed Apr 3, 2017
1 parent 7eb1b46 commit 53828e8
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 25 deletions.
42 changes: 17 additions & 25 deletions test/parallel/test-fs-make-callback.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,29 @@ const common = require('../common');
const assert = require('assert');
const fs = require('fs');
const cbTypeError = /^TypeError: "callback" argument must be a function$/;
const callbackThrowValues = [null, true, false, 0, 1, 'foo', /foo/, [], {}];

function test(cb) {
const { sep } = require('path');
const warn = 'Calling an asynchronous function without callback is deprecated.';

common.refreshTmpDir();

function testMakeCallback(cb) {
return function() {
// fs.stat() calls makeCallback() on its second argument
fs.stat(__filename, cb);
// fs.mkdtemp() calls makeCallback() on its third argument
fs.mkdtemp(`${common.tmpDir}${sep}`, {}, cb);
};
}

// Verify the case where a callback function is provided
assert.doesNotThrow(test(common.noop));

process.once('warning', common.mustCall((warning) => {
assert.strictEqual(
warning.message,
'Calling an asynchronous function without callback is deprecated.'
);

invalidArgumentsTests();
}));
common.expectWarning('DeprecationWarning', warn);

// Passing undefined/nothing calls rethrow() internally, which emits a warning
assert.doesNotThrow(test());
assert.doesNotThrow(testMakeCallback());

function invalidArgumentsTests() {
assert.throws(test(null), cbTypeError);
assert.throws(test(true), cbTypeError);
assert.throws(test(false), cbTypeError);
assert.throws(test(1), cbTypeError);
assert.throws(test(0), cbTypeError);
assert.throws(test('foo'), cbTypeError);
assert.throws(test(/foo/), cbTypeError);
assert.throws(test([]), cbTypeError);
assert.throws(test({}), cbTypeError);
function invalidCallbackThrowsTests() {
callbackThrowValues.forEach((value) => {
assert.throws(testMakeCallback(value), cbTypeError);
});
}

invalidCallbackThrowsTests();
30 changes: 30 additions & 0 deletions test/parallel/test-fs-makeStatsCallback.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const fs = require('fs');
const cbTypeError = /^TypeError: "callback" argument must be a function$/;
const callbackThrowValues = [null, true, false, 0, 1, 'foo', /foo/, [], {}];
const warn = 'Calling an asynchronous function without callback is deprecated.';

function testMakeStatsCallback(cb) {
return function() {
// fs.stat() calls makeStatsCallback() on its second argument
fs.stat(__filename, cb);
};
}

common.expectWarning('DeprecationWarning', warn);

// Verify the case where a callback function is provided
assert.doesNotThrow(testMakeStatsCallback(common.noop));

// Passing undefined/nothing calls rethrow() internally, which emits a warning
assert.doesNotThrow(testMakeStatsCallback());

function invalidCallbackThrowsTests() {
callbackThrowValues.forEach((value) => {
assert.throws(testMakeStatsCallback(value), cbTypeError);
});
}

invalidCallbackThrowsTests();

0 comments on commit 53828e8

Please sign in to comment.