test: cleanup test-fs-watch.js

Reversed "actual" and "expected" arguments for assert.strictEqual(). Replaced constructor with regular expression for assert.throws().
nodejs · Apr 25, 2017 · da6e1e8 · da6e1e8
1 parent 061c5da
commit da6e1e8
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/test/sequential/test-fs-watch.js b/test/sequential/test-fs-watch.js
@@ -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;
@@ -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;
@@ -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;
@@ -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