Skip to content

Commit

Permalink
test: cleanup test-fs-watch.js
Browse files Browse the repository at this point in the history
Reversed "actual" and "expected" arguments for assert.strictEqual().

Replaced constructor with regular expression for assert.throws().

PR-URL: nodejs#12595
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Bryan English <bryan@bryanenglish.com>
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
  • Loading branch information
RobotMermaid authored and Trott committed Apr 26, 2017
1 parent c405497 commit b65d5e4
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions test/sequential/test-fs-watch.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ assert.doesNotThrow(
function() {
const watcher = fs.watch(filepathOne);
watcher.on('change', function(event, filename) {
assert.strictEqual('change', event);
assert.strictEqual(event, 'change');

if (expectFilePath) {
assert.strictEqual('watch.txt', filename);
assert.strictEqual(filename, 'watch.txt');
}
watcher.close();
++watchSeenOne;
Expand All @@ -80,10 +80,10 @@ fs.writeFileSync(filepathTwoAbs, 'howdy');
assert.doesNotThrow(
function() {
const watcher = fs.watch(filepathTwo, function(event, filename) {
assert.strictEqual('change', event);
assert.strictEqual(event, 'change');

if (expectFilePath) {
assert.strictEqual('hasOwnProperty', filename);
assert.strictEqual(filename, 'hasOwnProperty');
}
watcher.close();
++watchSeenTwo;
Expand All @@ -103,11 +103,11 @@ assert.doesNotThrow(
function() {
const watcher = fs.watch(testsubdir, function(event, filename) {
const renameEv = common.isSunOS || common.isAix ? 'change' : 'rename';
assert.strictEqual(renameEv, event);
assert.strictEqual(event, renameEv);
if (expectFilePath) {
assert.strictEqual('newfile.txt', filename);
assert.strictEqual(filename, 'newfile.txt');
} else {
assert.strictEqual(null, filename);
assert.strictEqual(filename, null);
}
watcher.close();
++watchSeenThree;
Expand All @@ -134,13 +134,13 @@ assert.throws(function() {
oldhandle = w._handle;
w._handle = { close: w._handle.close };
w.close();
}, TypeError);
}, /^TypeError: Illegal invocation$/);
oldhandle.close(); // clean up

assert.throws(function() {
const w = fs.watchFile(__filename, {persistent: false}, common.noop);
oldhandle = w._handle;
w._handle = { stop: w._handle.stop };
w.stop();
}, TypeError);
}, /^TypeError: Illegal invocation$/);
oldhandle.stop(); // clean up

0 comments on commit b65d5e4

Please sign in to comment.