From ff0eb10f762b3d67229e608d1d1062d9c65c9bee Mon Sep 17 00:00:00 2001
From: Sumit Goel <sumit@goel.pw>
Date: Wed, 11 Jan 2017 21:20:09 -0800
Subject: [PATCH] test: refactor test-cli-eval.js

* assert unused vars in test-cli-eval.js
* assert in more idiomatic way test-cli-eval
* rename status to err in test-cli-eval.js

PR-URL: https://github.com/nodejs/node/pull/10759
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/parallel/test-cli-eval.js | 39 ++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/test/parallel/test-cli-eval.js b/test/parallel/test-cli-eval.js
index 9a1714cb6ea..b1f65b204cf 100644
--- a/test/parallel/test-cli-eval.js
+++ b/test/parallel/test-cli-eval.js
@@ -19,6 +19,7 @@ const filename = __filename.replace(/\\/g, '/');
 // assert that nothing is written to stdout
 child.exec(nodejs + ' --eval 42',
            function(err, stdout, stderr) {
+             assert.ifError(err);
              assert.strictEqual(stdout, '');
              assert.strictEqual(stderr, '');
            });
@@ -26,6 +27,7 @@ child.exec(nodejs + ' --eval 42',
 // assert that "42\n" is written to stderr
 child.exec(nodejs + ' --eval "console.error(42)"',
            function(err, stdout, stderr) {
+             assert.ifError(err);
              assert.strictEqual(stdout, '');
              assert.strictEqual(stderr, '42\n');
            });
@@ -36,12 +38,14 @@ child.exec(nodejs + ' --eval "console.error(42)"',
 
   child.exec(cmd + '42',
              function(err, stdout, stderr) {
+               assert.ifError(err);
                assert.strictEqual(stdout, '42\n');
                assert.strictEqual(stderr, '');
              });
 
   child.exec(cmd + "'[]'", common.mustCall(
       function(err, stdout, stderr) {
+        assert.ifError(err);
         assert.strictEqual(stdout, '[]\n');
         assert.strictEqual(stderr, '');
       }));
@@ -49,31 +53,40 @@ child.exec(nodejs + ' --eval "console.error(42)"',
 
 // assert that module loading works
 child.exec(nodejs + ' --eval "require(\'' + filename + '\')"',
-           function(status, stdout, stderr) {
-             assert.strictEqual(status.code, 42);
+           function(err, stdout, stderr) {
+             assert.strictEqual(err.code, 42);
+             assert.strictEqual(
+               stdout, 'Loaded as a module, exiting with status code 42.\n');
+             assert.strictEqual(stderr, '');
            });
 
 // Check that builtin modules are pre-defined.
 child.exec(nodejs + ' --print "os.platform()"',
-           function(status, stdout, stderr) {
+           function(err, stdout, stderr) {
+             assert.ifError(err);
              assert.strictEqual(stderr, '');
              assert.strictEqual(stdout.trim(), require('os').platform());
            });
 
 // module path resolve bug, regression test
 child.exec(nodejs + ' --eval "require(\'./test/parallel/test-cli-eval.js\')"',
-           function(status, stdout, stderr) {
-             assert.strictEqual(status.code, 42);
+           function(err, stdout, stderr) {
+             assert.strictEqual(err.code, 42);
+             assert.strictEqual(
+               stdout, 'Loaded as a module, exiting with status code 42.\n');
+             assert.strictEqual(stderr, '');
            });
 
 // Missing argument should not crash
-child.exec(nodejs + ' -e', common.mustCall(function(status, stdout, stderr) {
-  assert.notStrictEqual(status, null);
-  assert.strictEqual(status.code, 9);
+child.exec(nodejs + ' -e', common.mustCall(function(err, stdout, stderr) {
+  assert.strictEqual(err.code, 9);
+  assert.strictEqual(stdout, '');
+  assert(stderr.match(/node: -e requires an argument\n/));
 }));
 
 // empty program should do nothing
-child.exec(nodejs + ' -e ""', function(status, stdout, stderr) {
+child.exec(nodejs + ' -e ""', function(err, stdout, stderr) {
+  assert.ifError(err);
   assert.strictEqual(stdout, '');
   assert.strictEqual(stderr, '');
 });
@@ -81,21 +94,25 @@ child.exec(nodejs + ' -e ""', function(status, stdout, stderr) {
 // "\\-42" should be interpreted as an escaped expression, not a switch
 child.exec(nodejs + ' -p "\\-42"',
            function(err, stdout, stderr) {
+             assert.ifError(err);
              assert.strictEqual(stdout, '-42\n');
              assert.strictEqual(stderr, '');
            });
 
 child.exec(nodejs + ' --use-strict -p process.execArgv',
-           function(status, stdout, stderr) {
+           function(err, stdout, stderr) {
+             assert.ifError(err);
              assert.strictEqual(
                stdout, "[ '--use-strict', '-p', 'process.execArgv' ]\n"
              );
+             assert.strictEqual(stderr, '');
            });
 
 // Regression test for https://github.com/nodejs/node/issues/3574
 const emptyFile = path.join(common.fixturesDir, 'empty.js');
 child.exec(nodejs + ` -e 'require("child_process").fork("${emptyFile}")'`,
-           function(status, stdout, stderr) {
+           function(err, stdout, stderr) {
+             assert.ifError(err);
              assert.strictEqual(stdout, '');
              assert.strictEqual(stderr, '');
            });