From 01e7a71fd960ed80146eb174ab42f252306006c2 Mon Sep 17 00:00:00 2001
From: Luigi Pinca <luigipinca@gmail.com>
Date: Fri, 16 Feb 2018 15:46:48 +0100
Subject: [PATCH 1/2] test: refactor stream-*-constructor-set-methods

- Use `common.mustCall()` to ensure that callbacks are called.
- Remove no longer needed variables.
- Remove unnecessary `process.on('exit')` usage.
---
 ...tream-transform-constructor-set-methods.js | 28 ++++++-----
 ...stream-writable-constructor-set-methods.js | 46 ++++++++-----------
 2 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/test/parallel/test-stream-transform-constructor-set-methods.js b/test/parallel/test-stream-transform-constructor-set-methods.js
index 31b4c6c9bd0509..14c173b4ccfec5 100644
--- a/test/parallel/test-stream-transform-constructor-set-methods.js
+++ b/test/parallel/test-stream-transform-constructor-set-methods.js
@@ -1,19 +1,19 @@
 'use strict';
 const common = require('../common');
-const assert = require('assert');
 
-const Transform = require('stream').Transform;
+const { strictEqual } = require('assert');
+const { Transform } = require('stream');
 
-const _transform = common.mustCall(function _transform(d, e, n) {
-  n();
+const _transform = common.mustCall((chunk, _, next) => {
+  next();
 });
 
-const _final = common.mustCall(function _final(n) {
-  n();
+const _final = common.mustCall((next) => {
+  next();
 });
 
-const _flush = common.mustCall(function _flush(n) {
-  n();
+const _flush = common.mustCall((next) => {
+  next();
 });
 
 const t = new Transform({
@@ -22,11 +22,15 @@ const t = new Transform({
   final: _final
 });
 
-const t2 = new Transform({});
+strictEqual(t._transform, _transform);
+strictEqual(t._flush, _flush);
+strictEqual(t._final, _final);
 
 t.end(Buffer.from('blerg'));
 t.resume();
 
+const t2 = new Transform({});
+
 common.expectsError(() => {
   t2.end(Buffer.from('blerg'));
 }, {
@@ -34,9 +38,3 @@ common.expectsError(() => {
   code: 'ERR_METHOD_NOT_IMPLEMENTED',
   message: 'The _transform method is not implemented'
 });
-
-process.on('exit', () => {
-  assert.strictEqual(t._transform, _transform);
-  assert.strictEqual(t._flush, _flush);
-  assert.strictEqual(t._final, _final);
-});
diff --git a/test/parallel/test-stream-writable-constructor-set-methods.js b/test/parallel/test-stream-writable-constructor-set-methods.js
index 441e8ee75b337d..811d155305812c 100644
--- a/test/parallel/test-stream-writable-constructor-set-methods.js
+++ b/test/parallel/test-stream-writable-constructor-set-methods.js
@@ -1,30 +1,30 @@
 'use strict';
 const common = require('../common');
-const assert = require('assert');
 
-const Writable = require('stream').Writable;
+const { strictEqual } = require('assert');
+const { Writable } = require('stream');
 
-let _writeCalled = false;
-function _write(d, e, n) {
-  _writeCalled = true;
-}
+const _write = common.mustCall((chunk, _, next) => {
+  next();
+});
+
+const _writev = common.mustCall((chunks, next) => {
+  strictEqual(chunks.length, 2);
+  next();
+});
 
-const w = new Writable({ write: _write });
-w.end(Buffer.from('blerg'));
+const w = new Writable({ write: _write, writev: _writev });
 
-let _writevCalled = false;
-let dLength = 0;
-function _writev(d, n) {
-  dLength = d.length;
-  _writevCalled = true;
-}
+strictEqual(w._write, _write);
+strictEqual(w._writev, _writev);
 
-const w2 = new Writable({ writev: _writev });
-w2.cork();
+w.write(Buffer.from('blerg'));
 
-w2.write(Buffer.from('blerg'));
-w2.write(Buffer.from('blerg'));
-w2.end();
+w.cork();
+w.write(Buffer.from('blerg'));
+w.write(Buffer.from('blerg'));
+
+w.end();
 
 const w3 = new Writable();
 
@@ -35,11 +35,3 @@ w3.on('error', common.expectsError({
 }));
 
 w3.end(Buffer.from('blerg'));
-
-process.on('exit', function() {
-  assert.strictEqual(w._write, _write);
-  assert(_writeCalled);
-  assert.strictEqual(w2._writev, _writev);
-  assert.strictEqual(dLength, 2);
-  assert(_writevCalled);
-});

From 3983da7cf031a257ef92e7158caec89c60b156c2 Mon Sep 17 00:00:00 2001
From: Luigi Pinca <luigipinca@gmail.com>
Date: Fri, 16 Feb 2018 20:05:17 +0100
Subject: [PATCH 2/2] [squash] w3 -> w2

---
 .../test-stream-writable-constructor-set-methods.js         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/parallel/test-stream-writable-constructor-set-methods.js b/test/parallel/test-stream-writable-constructor-set-methods.js
index 811d155305812c..425cd88ed7a336 100644
--- a/test/parallel/test-stream-writable-constructor-set-methods.js
+++ b/test/parallel/test-stream-writable-constructor-set-methods.js
@@ -26,12 +26,12 @@ w.write(Buffer.from('blerg'));
 
 w.end();
 
-const w3 = new Writable();
+const w2 = new Writable();
 
-w3.on('error', common.expectsError({
+w2.on('error', common.expectsError({
   type: Error,
   code: 'ERR_METHOD_NOT_IMPLEMENTED',
   message: 'The _write method is not implemented'
 }));
 
-w3.end(Buffer.from('blerg'));
+w2.end(Buffer.from('blerg'));