test: refactor/cleanup a number of cluster tests

* Move shared code into common
* Favor use of strictEqual
* Add some missing common.mustCalls
* Other general cleanup

PR-URL: https://github.com/nodejs/node/pull/8261
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>

1 files changed, 45 insertions, 46 deletions

diff --git a/test/parallel/test-cluster-basic.js b/test/parallel/test-cluster-basic.js
index 3776eecdc5..0ffdcf180b 100644
--- a/test/parallel/test-cluster-basic.js
+++ b/test/parallel/test-cluster-basic.js
@@ -1,26 +1,26 @@
 'use strict';
-var common = require('../common');
-var assert = require('assert');
-var cluster = require('cluster');
+const common = require('../common');
+const assert = require('assert');
+const cluster = require('cluster');
 
-assert.equal('NODE_UNIQUE_ID' in process.env, false,
-             'NODE_UNIQUE_ID should be removed on startup');
+assert.strictEqual('NODE_UNIQUE_ID' in process.env, false,
+                   'NODE_UNIQUE_ID should be removed on startup');
 
 function forEach(obj, fn) {
-  Object.keys(obj).forEach(function(name, index) {
+  Object.keys(obj).forEach((name, index) => {
     fn(obj[name], name, index);
   });
 }
 
 
 if (cluster.isWorker) {
-  var http = require('http');
+  const http = require('http');
   http.Server(function() {
 
   }).listen(common.PORT, '127.0.0.1');
 } else if (cluster.isMaster) {
 
-  var checks = {
+  const checks = {
     cluster: {
       events: {
         fork: false,
@@ -57,13 +57,13 @@ if (cluster.isWorker) {
   };
 
   var worker;
-  var stateNames = Object.keys(checks.worker.states);
+  const stateNames = Object.keys(checks.worker.states);
 
   //Check events, states, and emit arguments
-  forEach(checks.cluster.events, function(bool, name, index) {
+  forEach(checks.cluster.events, (bool, name, index) => {
 
     //Listen on event
-    cluster.on(name, function(/* worker */) {
+    cluster.on(name, common.mustCall(function(/* worker */) {
 
       //Set event
       checks.cluster.events[name] = true;
@@ -74,28 +74,26 @@ if (cluster.isWorker) {
       //Check state
       var state = stateNames[index];
       checks.worker.states[state] = (state === worker.state);
-    });
+    }));
   });
 
   //Kill worker when listening
-  cluster.on('listening', function() {
+  cluster.on('listening', common.mustCall(() => {
     worker.kill();
-  });
+  }));
 
   //Kill process when worker is killed
-  cluster.on('exit', function() {
-    process.exit(0);
-  });
+  cluster.on('exit', common.mustCall(() => {}));
 
   //Create worker
   worker = cluster.fork();
-  assert.equal(worker.id, 1);
-  assert.ok(worker instanceof cluster.Worker,
-            'the worker is not a instance of the Worker constructor');
+  assert.strictEqual(worker.id, 1);
+  assert(worker instanceof cluster.Worker,
+         'the worker is not a instance of the Worker constructor');
 
   //Check event
   forEach(checks.worker.events, function(bool, name, index) {
-    worker.on(name, function() {
+    worker.on(name, common.mustCall(function() {
       //Set event
       checks.worker.events[name] = true;
 
@@ -104,56 +102,57 @@ if (cluster.isWorker) {
 
       switch (name) {
         case 'exit':
-          assert.equal(arguments[0], worker.process.exitCode);
-          assert.equal(arguments[1], worker.process.signalCode);
-          assert.equal(arguments.length, 2);
+          assert.strictEqual(arguments[0], worker.process.exitCode);
+          assert.strictEqual(arguments[1], worker.process.signalCode);
+          assert.strictEqual(arguments.length, 2);
           break;
 
         case 'listening':
-          assert.equal(arguments.length, 1);
-          var expect = { address: '127.0.0.1',
-                         port: common.PORT,
-                         addressType: 4,
-                         fd: undefined };
+          assert.strictEqual(arguments.length, 1);
+          const expect = { address: '127.0.0.1',
+                           port: common.PORT,
+                           addressType: 4,
+                           fd: undefined };
           assert.deepStrictEqual(arguments[0], expect);
           break;
 
         default:
-          assert.equal(arguments.length, 0);
+          assert.strictEqual(arguments.length, 0);
           break;
       }
-    });
+    }));
   });
 
   //Check all values
-  process.once('exit', function() {
+  process.once('exit', () => {
     //Check cluster events
-    forEach(checks.cluster.events, function(check, name) {
-      assert.ok(check, 'The cluster event "' + name + '" on the cluster ' +
-                'object did not fire');
+    forEach(checks.cluster.events, (check, name) => {
+      assert(check,
+             `The cluster event "${name}" on the cluster object did not fire`);
     });
 
     //Check cluster event arguments
-    forEach(checks.cluster.equal, function(check, name) {
-      assert.ok(check, 'The cluster event "' + name + '" did not emit ' +
-                'with correct argument');
+    forEach(checks.cluster.equal, (check, name) => {
+      assert(check,
+             `The cluster event "${name}" did not emit with correct argument`);
     });
 
     //Check worker states
-    forEach(checks.worker.states, function(check, name) {
-      assert.ok(check, 'The worker state "' + name + '" was not set to true');
+    forEach(checks.worker.states, (check, name) => {
+      assert(check,
+             `The worker state "${name}" was not set to true`);
     });
 
     //Check worker events
-    forEach(checks.worker.events, function(check, name) {
-      assert.ok(check, 'The worker event "' + name + '" on the worker object ' +
-                'did not fire');
+    forEach(checks.worker.events, (check, name) => {
+      assert(check,
+             `The worker event "${name}" on the worker object did not fire`);
     });
 
     //Check worker event arguments
-    forEach(checks.worker.equal, function(check, name) {
-      assert.ok(check, 'The worker event "' + name + '" did not emit with ' +
-                'corrent argument');
+    forEach(checks.worker.equal, (check, name) => {
+      assert(check,
+             `The worker event "${name}" did not emit with correct argument`);
     });
   });