update after @refack's reviewing

nodejs · XadillaX · Jun 3, 2017 · Jun 4, 2017 · Jun 4, 2017 · Jun 4, 2017
commit ab93f52b467415f76173728b4c7787402bb82a72
diff --git a/test/common/README.md b/test/common/README.md
@@ -116,25 +116,13 @@ Checks whether `IPv6` is supported on this platform.
 
 Checks if there are multiple localhosts available.
 
-### hijackStderr(listener)
-* `listener`
-[&lt;Function>](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Normal_objects_and_functions):
-a listener with a single parameter called `data`.
-
-Hijack `process.stderr` to listen `write` action. Once `process.stderr.write` is
-called, `listener` will also be called and the `data` of `write` function will
-be passed to `listener`. What's more, `process.stderr.writeTimes` will plus one
-then.
-
-### hijackStdout(listener)
-* `listener`
-[&lt;Function>](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Normal_objects_and_functions):
-a listener with a single parameter called `data`.
-
-Hijack `process.stdout` to listen `write` action. Once `process.stdout.write` is
-called, `listener` will also be called and the `data` of `write` function will
-be passed to `listener`. What's more, `process.stdout.writeTimes` will plus one
-then.
+### hijackStderr/Stdout(listener)
+* `listener` [&lt;Function>][MDN-Function]: a listener with a single parameter called `data`.
+
+Eavesdrop to `process.stderr.write` or `process.stdout.write` calls. Once
+`process.std*.write` is called, `listener` will also be called and the `data` of
+`write` function will be passed to `listener`. What's more,
+`process.std*.writeTimes` is a count of the number of calls.
 
 ### inFreeBSDJail
 * return [&lt;Boolean>](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Boolean_type)
@@ -318,3 +306,5 @@ Node.js
 [WHATWG URL API](https://nodejs.org/api/url.html#url_the_whatwg_url_api)
 implementation with tests from
 [W3C Web Platform Tests](https://github.com/w3c/web-platform-tests).
+
+[MDN-Function]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Normal_objects_and_functions
diff --git a/test/common/index.js b/test/common/index.js
@@ -764,12 +764,12 @@ exports.getTTYfd = function getTTYfd() {
 const stdWrite = {};
 function hijackStdWritable(name, listener) {
   const stream = process[name];
-  const _write = stdWrite[name] = stream.write.bind(stream);
+  const _write = stdWrite[name] = stream.write;
 
   stream.writeTimes = 0;
   stream.write = function(data, callback) {
     listener(data);
-    _write(data, callback);
+    _write.call(stream, data, callback);
     stream.writeTimes++;
   };
 }

diff --git a/test/fixtures/echo-close-check.js b/test/fixtures/echo-close-check.js
@@ -28,13 +28,7 @@ process.stdout.write('hello world\r\n');
 
 const stdin = process.openStdin();
 
-let current;
-common.hijackStdout(common.mustCall(function(data) {
-  assert.strictEqual(data, current);
-}));
-
 stdin.on('data', function(data) {
-  current = data.toString();
   process.stdout.write(data.toString());
 });
 

diff --git a/test/fixtures/echo.js b/test/fixtures/echo.js
@@ -26,12 +26,6 @@ process.stdout.write('hello world\r\n');
 
 var stdin = process.openStdin();
 
-let current;
 stdin.on('data', function(data) {
-  current = data;
   process.stdout.write(data.toString());
 });
-
-common.hijackStdout(function(data) {
-  assert.equal(data, current);
-});
diff --git a/test/parallel/test-common.js b/test/parallel/test-common.js
@@ -88,3 +88,23 @@ for (const p of failFixtures) {
     assert.strictEqual(firstLine, expected);
   }));
 }
+
+// hijackStderr and hijackStdout
+const HIJACK_TEST_ARRAY = [ 'foo\n', 'bar\n', 'baz\n' ];
+[ 'err', 'out' ].forEach((txt) => {
+  const stream = process[`std${txt}`];
+  const originalWrite = stream.write;
+
+  common[`hijackStd${txt}`](common.mustCall(function(data) {
+    assert.strictEqual(data, HIJACK_TEST_ARRAY[stream.writeTimes]);
+  }, HIJACK_TEST_ARRAY.length));
+  assert.notStrictEqual(originalWrite, stream.write);
+
+  HIJACK_TEST_ARRAY.forEach((val) => {
+    stream.write(val, common.mustCall(common.noop));
+  });
+
+  assert.strictEqual(HIJACK_TEST_ARRAY.length, stream.writeTimes);
+  common[`restoreStd${txt}`]();
+  assert.strictEqual(originalWrite, stream.write);
+});
diff --git a/test/parallel/test-console.js b/test/parallel/test-console.js
@@ -164,6 +164,6 @@ common.hijackStderr(common.mustCall(function(data) {
 
   // stderr.write will catch sync error, so use `process.nextTick` here
   process.nextTick(function() {
-    assert(/no such label/.test(data));
+    assert.strictEqual(data.includes('no such label'), true);
   });
 }));