1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: cleanup test-fs-watch.js

Browse Source 
Reversed "actual" and "expected" arguments for assert.strictEqual().

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

PR-URL: https://github.com/nodejs/node/pull/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>
This commit is contained in:
RobotMermaid 2017-04-22 11:58:11 -07:00 committed by Rich Trott
parent c405497086
commit b65d5e447b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/sequential/test-fs-watch.js
View File

@ -57,10 +57,10 @@ assert.doesNotThrow(
function() { function() {
const watcher = fs.watch(filepathOne); const watcher = fs.watch(filepathOne);
watcher.on('change', function(event, filename) { watcher.on('change', function(event, filename) {
assert.strictEqual('change', event); assert.strictEqual(event, 'change');
if (expectFilePath) { if (expectFilePath) {
assert.strictEqual('watch.txt', filename); assert.strictEqual(filename, 'watch.txt');
} }
watcher.close(); watcher.close();
++watchSeenOne; ++watchSeenOne;
@ -80,10 +80,10 @@ fs.writeFileSync(filepathTwoAbs, 'howdy');
assert.doesNotThrow( assert.doesNotThrow(
function() { function() {
const watcher = fs.watch(filepathTwo, function(event, filename) { const watcher = fs.watch(filepathTwo, function(event, filename) {
assert.strictEqual('change', event); assert.strictEqual(event, 'change');
if (expectFilePath) { if (expectFilePath) {
assert.strictEqual('hasOwnProperty', filename); assert.strictEqual(filename, 'hasOwnProperty');
} }
watcher.close(); watcher.close();
++watchSeenTwo; ++watchSeenTwo;
@ -103,11 +103,11 @@ assert.doesNotThrow(
function() { function() {
const watcher = fs.watch(testsubdir, function(event, filename) { const watcher = fs.watch(testsubdir, function(event, filename) {
const renameEv = common.isSunOS || common.isAix ? 'change' : 'rename'; const renameEv = common.isSunOS || common.isAix ? 'change' : 'rename';
assert.strictEqual(renameEv, event); assert.strictEqual(event, renameEv);
if (expectFilePath) { if (expectFilePath) {
assert.strictEqual('newfile.txt', filename); assert.strictEqual(filename, 'newfile.txt');
} else { } else {
assert.strictEqual(null, filename); assert.strictEqual(filename, null);
} }
watcher.close(); watcher.close();
++watchSeenThree; ++watchSeenThree;
@ -134,7 +134,7 @@ assert.throws(function() {
oldhandle = w._handle; oldhandle = w._handle;
w._handle = { close: w._handle.close }; w._handle = { close: w._handle.close };
w.close(); w.close();
}, TypeError); }, /^TypeError: Illegal invocation$/);
oldhandle.close(); // clean up oldhandle.close(); // clean up
assert.throws(function() { assert.throws(function() {
@ -142,5 +142,5 @@ assert.throws(function() {
oldhandle = w._handle; oldhandle = w._handle;
w._handle = { stop: w._handle.stop }; w._handle = { stop: w._handle.stop };
w.stop(); w.stop();
}, TypeError); }, /^TypeError: Illegal invocation$/);
oldhandle.stop(); // clean up oldhandle.stop(); // clean up