From c85977c84b819db013cd63b8ab9a3844db8684b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de>
Date: Fri, 10 Nov 2017 19:18:12 +0100
Subject: [PATCH 1/3] test: use ES6 classes instead of util.inherits
---
.../test-crypto-lazy-transform-writable.js | 11 +-
test/parallel/test-crypto-stream.js | 26 ++---
test/parallel/test-event-emitter-listeners.js | 4 +-
.../test-http-client-read-in-error.js | 46 ++++----
test/parallel/test-http-client-readable.js | 50 ++++-----
...tgoing-message-data-emitted-after-ended.js | 6 +-
test/parallel/test-readline-interface.js | 13 +--
test/parallel/test-readline-keys.js | 7 +-
test/parallel/test-stream-big-packet.js | 31 +++---
test/parallel/test-stream-events-prepend.js | 29 +++--
test/parallel/test-stream-pipe-after-end.js | 45 ++++----
test/parallel/test-stream-push-strings.js | 46 ++++----
...stream-writable-change-default-encoding.js | 21 ++--
.../test-stream-writable-decoded-encoding.js | 21 ++--
test/parallel/test-stream-writable-null.js | 19 ++--
test/parallel/test-stream2-basic.js | 101 +++++++++---------
test/parallel/test-stream2-compatibility.js | 48 ++++-----
.../test-stream2-pipe-error-once-listener.js | 29 ++---
test/parallel/test-stream2-set-encoding.js | 60 +++++------
test/parallel/test-stream2-unpipe-drain.js | 33 +++---
test/parallel/test-stream2-unpipe-leak.js | 30 +++---
test/parallel/test-stream2-writable.js | 31 +++---
test/parallel/test-util-format.js | 17 +--
test/pummel/test-tls-server-large-request.js | 26 ++---
test/sequential/test-stream2-fs.js | 33 +++---
25 files changed, 363 insertions(+), 420 deletions(-)
diff --git a/test/parallel/test-crypto-lazy-transform-writable.js b/test/parallel/test-crypto-lazy-transform-writable.js
index f12243b9f4d17c..94240321bd755e 100644
--- a/test/parallel/test-crypto-lazy-transform-writable.js
+++ b/test/parallel/test-crypto-lazy-transform-writable.js
@@ -7,7 +7,6 @@ if (!common.hasCrypto)
const assert = require('assert');
const crypto = require('crypto');
const Stream = require('stream');
-const util = require('util');
const hasher1 = crypto.createHash('sha256');
const hasher2 = crypto.createHash('sha256');
@@ -18,12 +17,12 @@ hasher1.end();
const expected = hasher1.read().toString('hex');
-function OldStream() {
- Stream.call(this);
-
- this.readable = true;
+class OldStream extends Stream {
+ constructor() {
+ super();
+ this.readable = true;
+ }
}
-util.inherits(OldStream, Stream);
const stream = new OldStream();
diff --git a/test/parallel/test-crypto-stream.js b/test/parallel/test-crypto-stream.js
index 1c3b8bbcbb1c41..7eb6d394876686 100644
--- a/test/parallel/test-crypto-stream.js
+++ b/test/parallel/test-crypto-stream.js
@@ -26,24 +26,24 @@ if (!common.hasCrypto)
const assert = require('assert');
const stream = require('stream');
-const util = require('util');
const crypto = require('crypto');
// Small stream to buffer converter
-function Stream2buffer(callback) {
- stream.Writable.call(this);
+class Stream2buffer extends stream.Writable {
+ constructor(callback) {
+ super();
- this._buffers = [];
- this.once('finish', function() {
- callback(null, Buffer.concat(this._buffers));
- });
-}
-util.inherits(Stream2buffer, stream.Writable);
+ this._buffers = [];
+ this.once('finish', function() {
+ callback(null, Buffer.concat(this._buffers));
+ });
+ }
-Stream2buffer.prototype._write = function(data, encodeing, done) {
- this._buffers.push(data);
- return done(null);
-};
+ _write(data, encodeing, done) {
+ this._buffers.push(data);
+ return done(null);
+ }
+}
if (!common.hasFipsCrypto) {
// Create an md5 hash of "Hallo world"
diff --git a/test/parallel/test-event-emitter-listeners.js b/test/parallel/test-event-emitter-listeners.js
index 9fe4626cd8d81d..4fdb20ec13f546 100644
--- a/test/parallel/test-event-emitter-listeners.js
+++ b/test/parallel/test-event-emitter-listeners.js
@@ -24,12 +24,10 @@
require('../common');
const assert = require('assert');
const events = require('events');
-const util = require('util');
function listener() {}
function listener2() {}
-class TestStream { constructor() { } }
-util.inherits(TestStream, events.EventEmitter);
+class TestStream extends events.EventEmitter {}
{
const ee = new events.EventEmitter();
diff --git a/test/parallel/test-http-client-read-in-error.js b/test/parallel/test-http-client-read-in-error.js
index 69b24f73771d41..5cee7797ed64d4 100644
--- a/test/parallel/test-http-client-read-in-error.js
+++ b/test/parallel/test-http-client-read-in-error.js
@@ -2,38 +2,34 @@
require('../common');
const net = require('net');
const http = require('http');
-const util = require('util');
-function Agent() {
- http.Agent.call(this);
-}
-util.inherits(Agent, http.Agent);
-
-Agent.prototype.createConnection = function() {
- const self = this;
- const socket = new net.Socket();
+class Agent extends http.Agent {
+ createConnection() {
+ const self = this;
+ const socket = new net.Socket();
- socket.on('error', function() {
- socket.push('HTTP/1.1 200\r\n\r\n');
- });
+ socket.on('error', function() {
+ socket.push('HTTP/1.1 200\r\n\r\n');
+ });
- socket.on('newListener', function onNewListener(name) {
- if (name !== 'error')
- return;
- socket.removeListener('newListener', onNewListener);
+ socket.on('newListener', function onNewListener(name) {
+ if (name !== 'error')
+ return;
+ socket.removeListener('newListener', onNewListener);
- // Let other listeners to be set up too
- process.nextTick(function() {
- self.breakSocket(socket);
+ // Let other listeners to be set up too
+ process.nextTick(function() {
+ self.breakSocket(socket);
+ });
});
- });
- return socket;
-};
+ return socket;
+ }
-Agent.prototype.breakSocket = function breakSocket(socket) {
- socket.emit('error', new Error('Intentional error'));
-};
+ breakSocket(socket) {
+ socket.emit('error', new Error('Intentional error'));
+ }
+}
const agent = new Agent();
diff --git a/test/parallel/test-http-client-readable.js b/test/parallel/test-http-client-readable.js
index b381455e3699a5..c35ab259f25f2b 100644
--- a/test/parallel/test-http-client-readable.js
+++ b/test/parallel/test-http-client-readable.js
@@ -23,41 +23,37 @@
const common = require('../common');
const assert = require('assert');
const http = require('http');
-const util = require('util');
const Duplex = require('stream').Duplex;
-function FakeAgent() {
- http.Agent.call(this);
-}
-util.inherits(FakeAgent, http.Agent);
-
-FakeAgent.prototype.createConnection = function() {
- const s = new Duplex();
- let once = false;
+class FakeAgent extends http.Agent {
+ createConnection() {
+ const s = new Duplex();
+ let once = false;
- s._read = function() {
- if (once)
- return this.push(null);
- once = true;
+ s._read = function() {
+ if (once)
+ return this.push(null);
+ once = true;
- this.push('HTTP/1.1 200 Ok\r\nTransfer-Encoding: chunked\r\n\r\n');
- this.push('b\r\nhello world\r\n');
- this.readable = false;
- this.push('0\r\n\r\n');
- };
+ this.push('HTTP/1.1 200 Ok\r\nTransfer-Encoding: chunked\r\n\r\n');
+ this.push('b\r\nhello world\r\n');
+ this.readable = false;
+ this.push('0\r\n\r\n');
+ };
- // Blackhole
- s._write = function(data, enc, cb) {
- cb();
- };
+ // Blackhole
+ s._write = function(data, enc, cb) {
+ cb();
+ };
- s.destroy = s.destroySoon = function() {
- this.writable = false;
- };
+ s.destroy = s.destroySoon = function() {
+ this.writable = false;
+ };
- return s;
-};
+ return s;
+ }
+}
let received = '';
diff --git a/test/parallel/test-pipe-outgoing-message-data-emitted-after-ended.js b/test/parallel/test-pipe-outgoing-message-data-emitted-after-ended.js
index 1614955be829c8..0bd823908a6107 100644
--- a/test/parallel/test-pipe-outgoing-message-data-emitted-after-ended.js
+++ b/test/parallel/test-pipe-outgoing-message-data-emitted-after-ended.js
@@ -2,17 +2,13 @@
const common = require('../common');
const http = require('http');
const assert = require('assert');
-const util = require('util');
const stream = require('stream');
// Verify that when piping a stream to an `OutgoingMessage` (or a type that
// inherits from `OutgoingMessage`), if data is emitted after the
// `OutgoingMessage` was closed - a `write after end` error is raised
-function MyStream() {
- stream.call(this);
-}
-util.inherits(MyStream, stream);
+class MyStream extends stream {}
const server = http.createServer(common.mustCall(function(req, res) {
const myStream = new MyStream();
diff --git a/test/parallel/test-readline-interface.js b/test/parallel/test-readline-interface.js
index c494bb95e8cdd8..fd622f8cabc564 100644
--- a/test/parallel/test-readline-interface.js
+++ b/test/parallel/test-readline-interface.js
@@ -27,17 +27,14 @@ const assert = require('assert');
const readline = require('readline');
const internalReadline = require('internal/readline');
const EventEmitter = require('events').EventEmitter;
-const inherits = require('util').inherits;
const { Writable, Readable } = require('stream');
-function FakeInput() {
- EventEmitter.call(this);
+class FakeInput extends EventEmitter {
+ resume() {}
+ pause() {}
+ write() {}
+ end() {}
}
-inherits(FakeInput, EventEmitter);
-FakeInput.prototype.resume = () => {};
-FakeInput.prototype.pause = () => {};
-FakeInput.prototype.write = () => {};
-FakeInput.prototype.end = () => {};
function isWarned(emitter) {
for (const name in emitter) {
diff --git a/test/parallel/test-readline-keys.js b/test/parallel/test-readline-keys.js
index 1b05b06f58f04f..62d5ab24b85cef 100644
--- a/test/parallel/test-readline-keys.js
+++ b/test/parallel/test-readline-keys.js
@@ -2,14 +2,9 @@
const common = require('../common');
const PassThrough = require('stream').PassThrough;
const assert = require('assert');
-const inherits = require('util').inherits;
const Interface = require('readline').Interface;
-
-function FakeInput() {
- PassThrough.call(this);
-}
-inherits(FakeInput, PassThrough);
+class FakeInput extends PassThrough {}
function extend(k) {
return Object.assign({ ctrl: false, meta: false, shift: false }, k);
diff --git a/test/parallel/test-stream-big-packet.js b/test/parallel/test-stream-big-packet.js
index 8575c3e43a46ee..18b9b7ee4fc348 100644
--- a/test/parallel/test-stream-big-packet.js
+++ b/test/parallel/test-stream-big-packet.js
@@ -22,31 +22,26 @@
'use strict';
require('../common');
const assert = require('assert');
-const util = require('util');
const stream = require('stream');
let passed = false;
-function PassThrough() {
- stream.Transform.call(this);
+class PassThrough extends stream.Transform {
+ _transform(chunk, encoding, done) {
+ this.push(chunk);
+ done();
+ }
}
-util.inherits(PassThrough, stream.Transform);
-PassThrough.prototype._transform = function(chunk, encoding, done) {
- this.push(chunk);
- done();
-};
-function TestStream() {
- stream.Transform.call(this);
-}
-util.inherits(TestStream, stream.Transform);
-TestStream.prototype._transform = function(chunk, encoding, done) {
- if (!passed) {
- // Char 'a' only exists in the last write
- passed = chunk.toString().includes('a');
+class TestStream extends stream.Transform {
+ _transform(chunk, encoding, done) {
+ if (!passed) {
+ // Char 'a' only exists in the last write
+ passed = chunk.toString().includes('a');
+ }
+ done();
}
- done();
-};
+}
const s1 = new PassThrough();
const s2 = new PassThrough();
diff --git a/test/parallel/test-stream-events-prepend.js b/test/parallel/test-stream-events-prepend.js
index 254d9a3690aee5..80fedf8faee570 100644
--- a/test/parallel/test-stream-events-prepend.js
+++ b/test/parallel/test-stream-events-prepend.js
@@ -1,26 +1,23 @@
'use strict';
const common = require('../common');
const stream = require('stream');
-const util = require('util');
-function Writable() {
- this.writable = true;
- stream.Writable.call(this);
- this.prependListener = undefined;
+class Writable extends stream.Writable {
+ constructor() {
+ super();
+ this.prependListener = undefined;
+ }
+
+ _write(chunk, end, cb) {
+ cb();
+ }
}
-util.inherits(Writable, stream.Writable);
-Writable.prototype._write = function(chunk, end, cb) {
- cb();
-};
-function Readable() {
- this.readable = true;
- stream.Readable.call(this);
+class Readable extends stream.Readable {
+ _read() {
+ this.push(null);
+ }
}
-util.inherits(Readable, stream.Readable);
-Readable.prototype._read = function() {
- this.push(null);
-};
const w = new Writable();
w.on('pipe', common.mustCall());
diff --git a/test/parallel/test-stream-pipe-after-end.js b/test/parallel/test-stream-pipe-after-end.js
index 02792b44554348..d0d0a19bd6074a 100644
--- a/test/parallel/test-stream-pipe-after-end.js
+++ b/test/parallel/test-stream-pipe-after-end.js
@@ -24,36 +24,33 @@ const common = require('../common');
const assert = require('assert');
const Readable = require('_stream_readable');
const Writable = require('_stream_writable');
-const util = require('util');
-util.inherits(TestReadable, Readable);
-function TestReadable(opt) {
- if (!(this instanceof TestReadable))
- return new TestReadable(opt);
- Readable.call(this, opt);
- this._ended = false;
+class TestReadable extends Readable {
+ constructor(opt) {
+ super(opt);
+ this._ended = false;
+ }
+
+ _read() {
+ if (this._ended)
+ this.emit('error', new Error('_read called twice'));
+ this._ended = true;
+ this.push(null);
+ }
}
-TestReadable.prototype._read = function() {
- if (this._ended)
- this.emit('error', new Error('_read called twice'));
- this._ended = true;
- this.push(null);
-};
+class TestWritable extends Writable {
+ constructor(opt) {
+ super(opt);
+ this._written = [];
+ }
-util.inherits(TestWritable, Writable);
-function TestWritable(opt) {
- if (!(this instanceof TestWritable))
- return new TestWritable(opt);
- Writable.call(this, opt);
- this._written = [];
+ _write(chunk, encoding, cb) {
+ this._written.push(chunk);
+ cb();
+ }
}
-TestWritable.prototype._write = function(chunk, encoding, cb) {
- this._written.push(chunk);
- cb();
-};
-
// this one should not emit 'end' until we read() from it later.
const ender = new TestReadable();
diff --git a/test/parallel/test-stream-push-strings.js b/test/parallel/test-stream-push-strings.js
index 2c2d2ec4676913..c2383f3de1de4f 100644
--- a/test/parallel/test-stream-push-strings.js
+++ b/test/parallel/test-stream-push-strings.js
@@ -24,32 +24,32 @@ require('../common');
const assert = require('assert');
const Readable = require('stream').Readable;
-const util = require('util');
-util.inherits(MyStream, Readable);
-function MyStream(options) {
- Readable.call(this, options);
- this._chunks = 3;
-}
+class MyStream extends Readable {
+ constructor(options) {
+ super(options);
+ this._chunks = 3;
+ }
-MyStream.prototype._read = function(n) {
- switch (this._chunks--) {
- case 0:
- return this.push(null);
- case 1:
- return setTimeout(function() {
- this.push('last chunk');
- }.bind(this), 100);
- case 2:
- return this.push('second to last chunk');
- case 3:
- return process.nextTick(function() {
- this.push('first chunk');
- }.bind(this));
- default:
- throw new Error('?');
+ _read(n) {
+ switch (this._chunks--) {
+ case 0:
+ return this.push(null);
+ case 1:
+ return setTimeout(function() {
+ this.push('last chunk');
+ }.bind(this), 100);
+ case 2:
+ return this.push('second to last chunk');
+ case 3:
+ return process.nextTick(function() {
+ this.push('first chunk');
+ }.bind(this));
+ default:
+ throw new Error('?');
+ }
}
-};
+}
const ms = new MyStream();
const results = [];
diff --git a/test/parallel/test-stream-writable-change-default-encoding.js b/test/parallel/test-stream-writable-change-default-encoding.js
index 94e8265cc60fab..4fc1970a9d05db 100644
--- a/test/parallel/test-stream-writable-change-default-encoding.js
+++ b/test/parallel/test-stream-writable-change-default-encoding.js
@@ -24,19 +24,18 @@ const common = require('../common');
const assert = require('assert');
const stream = require('stream');
-const util = require('util');
-function MyWritable(fn, options) {
- stream.Writable.call(this, options);
- this.fn = fn;
-}
-
-util.inherits(MyWritable, stream.Writable);
+class MyWritable extends stream.Writable {
+ constructor(fn, options) {
+ super(options);
+ this.fn = fn;
+ }
-MyWritable.prototype._write = function(chunk, encoding, callback) {
- this.fn(Buffer.isBuffer(chunk), typeof chunk, encoding);
- callback();
-};
+ _write(chunk, encoding, callback) {
+ this.fn(Buffer.isBuffer(chunk), typeof chunk, encoding);
+ callback();
+ }
+}
(function defaultCondingIsUtf8() {
const m = new MyWritable(function(isBuffer, type, enc) {
diff --git a/test/parallel/test-stream-writable-decoded-encoding.js b/test/parallel/test-stream-writable-decoded-encoding.js
index 5e433c9db1b5c6..578208a84bdec0 100644
--- a/test/parallel/test-stream-writable-decoded-encoding.js
+++ b/test/parallel/test-stream-writable-decoded-encoding.js
@@ -24,19 +24,18 @@ require('../common');
const assert = require('assert');
const stream = require('stream');
-const util = require('util');
-function MyWritable(fn, options) {
- stream.Writable.call(this, options);
- this.fn = fn;
-}
-
-util.inherits(MyWritable, stream.Writable);
+class MyWritable extends stream.Writable {
+ constructor(fn, options) {
+ super(options);
+ this.fn = fn;
+ }
-MyWritable.prototype._write = function(chunk, encoding, callback) {
- this.fn(Buffer.isBuffer(chunk), typeof chunk, encoding);
- callback();
-};
+ _write(chunk, encoding, callback) {
+ this.fn(Buffer.isBuffer(chunk), typeof chunk, encoding);
+ callback();
+ }
+}
{
const m = new MyWritable(function(isBuffer, type, enc) {
diff --git a/test/parallel/test-stream-writable-null.js b/test/parallel/test-stream-writable-null.js
index d8e90e5c4e0821..f1b91dee211005 100644
--- a/test/parallel/test-stream-writable-null.js
+++ b/test/parallel/test-stream-writable-null.js
@@ -3,18 +3,17 @@ const common = require('../common');
const assert = require('assert');
const stream = require('stream');
-const util = require('util');
-function MyWritable(options) {
- stream.Writable.call(this, options);
-}
-
-util.inherits(MyWritable, stream.Writable);
+class MyWritable extends stream.Writable {
+ constructor(opt) {
+ super(opt);
+ }
-MyWritable.prototype._write = function(chunk, encoding, callback) {
- assert.notStrictEqual(chunk, null);
- callback();
-};
+ _write(chunk, encoding, callback) {
+ assert.notStrictEqual(chunk, null);
+ callback();
+ }
+}
common.expectsError(
() => {
diff --git a/test/parallel/test-stream2-basic.js b/test/parallel/test-stream2-basic.js
index f544321f9b7778..21bd1f69313f66 100644
--- a/test/parallel/test-stream2-basic.js
+++ b/test/parallel/test-stream2-basic.js
@@ -25,67 +25,66 @@ const common = require('../common');
const R = require('_stream_readable');
const assert = require('assert');
-const util = require('util');
const EE = require('events').EventEmitter;
-function TestReader(n) {
- R.apply(this);
- this._buffer = Buffer.alloc(n || 100, 'x');
- this._pos = 0;
- this._bufs = 10;
-}
+class TestReader extends R {
+ constructor(n) {
+ super();
+ this._buffer = Buffer.alloc(n || 100, 'x');
+ this._pos = 0;
+ this._bufs = 10;
+ }
-util.inherits(TestReader, R);
+ _read(n) {
+ const max = this._buffer.length - this._pos;
+ n = Math.max(n, 0);
+ const toRead = Math.min(n, max);
+ if (toRead === 0) {
+ // simulate the read buffer filling up with some more bytes some time
+ // in the future.
+ setTimeout(() => {
+ this._pos = 0;
+ this._bufs -= 1;
+ if (this._bufs <= 0) {
+ // read them all!
+ if (!this.ended)
+ this.push(null);
+ } else {
+ // now we have more.
+ // kinda cheating by calling _read, but whatever,
+ // it's just fake anyway.
+ this._read(n);
+ }
+ }, 10);
+ return;
+ }
-TestReader.prototype._read = function(n) {
- const max = this._buffer.length - this._pos;
- n = Math.max(n, 0);
- const toRead = Math.min(n, max);
- if (toRead === 0) {
- // simulate the read buffer filling up with some more bytes some time
- // in the future.
- setTimeout(function() {
- this._pos = 0;
- this._bufs -= 1;
- if (this._bufs <= 0) {
- // read them all!
- if (!this.ended)
- this.push(null);
- } else {
- // now we have more.
- // kinda cheating by calling _read, but whatever,
- // it's just fake anyway.
- this._read(n);
- }
- }.bind(this), 10);
- return;
+ const ret = this._buffer.slice(this._pos, this._pos + toRead);
+ this._pos += toRead;
+ this.push(ret);
}
-
- const ret = this._buffer.slice(this._pos, this._pos + toRead);
- this._pos += toRead;
- this.push(ret);
-};
+}
/////
-function TestWriter() {
- EE.apply(this);
- this.received = [];
- this.flush = false;
-}
-
-util.inherits(TestWriter, EE);
+class TestWriter extends EE {
+ constructor() {
+ super();
+ this.received = [];
+ this.flush = false;
+ }
-TestWriter.prototype.write = function(c) {
- this.received.push(c.toString());
- this.emit('write', c);
- return true;
-};
+ write(c) {
+ this.received.push(c.toString());
+ this.emit('write', c);
+ return true;
+ }
-TestWriter.prototype.end = function(c) {
- if (c) this.write(c);
- this.emit('end', this.received);
-};
+ end(c) {
+ if (c) this.write(c);
+ this.emit('end', this.received);
+ }
+}
{
// Test basic functionality
diff --git a/test/parallel/test-stream2-compatibility.js b/test/parallel/test-stream2-compatibility.js
index 45834ee99e5961..bd0314ec1a9918 100644
--- a/test/parallel/test-stream2-compatibility.js
+++ b/test/parallel/test-stream2-compatibility.js
@@ -25,25 +25,23 @@ const R = require('_stream_readable');
const W = require('_stream_writable');
const assert = require('assert');
-const util = require('util');
-
let ondataCalled = 0;
-function TestReader() {
- R.apply(this);
- this._buffer = Buffer.alloc(100, 'x');
-
- this.on('data', function() {
- ondataCalled++;
- });
-}
+class TestReader extends R {
+ constructor() {
+ super();
+ this._buffer = Buffer.alloc(100, 'x');
-util.inherits(TestReader, R);
+ this.on('data', () => {
+ ondataCalled++;
+ });
+ }
-TestReader.prototype._read = function(n) {
- this.push(this._buffer);
- this._buffer = Buffer.alloc(0);
-};
+ _read(n) {
+ this.push(this._buffer);
+ this._buffer = Buffer.alloc(0);
+ }
+}
const reader = new TestReader();
setImmediate(function() {
@@ -52,17 +50,17 @@ setImmediate(function() {
reader.push(null);
});
-function TestWriter() {
- W.apply(this);
- this.write('foo');
- this.end();
-}
-
-util.inherits(TestWriter, W);
+class TestWriter extends W {
+ constructor() {
+ super();
+ this.write('foo');
+ this.end();
+ }
-TestWriter.prototype._write = function(chunk, enc, cb) {
- cb();
-};
+ _write(chunk, enc, cb) {
+ cb();
+ }
+}
const writer = new TestWriter();
diff --git a/test/parallel/test-stream2-pipe-error-once-listener.js b/test/parallel/test-stream2-pipe-error-once-listener.js
index 71ce19b36062e5..003e78e64f68cf 100644
--- a/test/parallel/test-stream2-pipe-error-once-listener.js
+++ b/test/parallel/test-stream2-pipe-error-once-listener.js
@@ -22,30 +22,21 @@
'use strict';
require('../common');
-const util = require('util');
const stream = require('stream');
-
-function Read() {
- stream.Readable.call(this);
+class Read extends stream.Readable {
+ _read(size) {
+ this.push('x');
+ this.push(null);
+ }
}
-util.inherits(Read, stream.Readable);
-
-Read.prototype._read = function(size) {
- this.push('x');
- this.push(null);
-};
-
-function Write() {
- stream.Writable.call(this);
+class Write extends stream.Writable {
+ _write(buffer, encoding, cb) {
+ this.emit('error', new Error('boom'));
+ this.emit('alldone');
+ }
}
-util.inherits(Write, stream.Writable);
-
-Write.prototype._write = function(buffer, encoding, cb) {
- this.emit('error', new Error('boom'));
- this.emit('alldone');
-};
const read = new Read();
const write = new Write();
diff --git a/test/parallel/test-stream2-set-encoding.js b/test/parallel/test-stream2-set-encoding.js
index 5b2e35fd01f642..8e14334b03b8d0 100644
--- a/test/parallel/test-stream2-set-encoding.js
+++ b/test/parallel/test-stream2-set-encoding.js
@@ -23,40 +23,38 @@
const common = require('../common');
const assert = require('assert');
const R = require('_stream_readable');
-const util = require('util');
-util.inherits(TestReader, R);
-
-function TestReader(n, opts) {
- R.call(this, opts);
-
- this.pos = 0;
- this.len = n || 100;
+class TestReader extends R {
+ constructor(n, opts) {
+ super(opts);
+ this.pos = 0;
+ this.len = n || 100;
+ }
+
+ _read(n) {
+ setTimeout(() => {
+
+ if (this.pos >= this.len) {
+ // double push(null) to test eos handling
+ this.push(null);
+ return this.push(null);
+ }
+
+ n = Math.min(n, this.len - this.pos);
+ if (n <= 0) {
+ // double push(null) to test eos handling
+ this.push(null);
+ return this.push(null);
+ }
+
+ this.pos += n;
+ const ret = Buffer.alloc(n, 'a');
+
+ return this.push(ret);
+ }, 1);
+ }
}
-TestReader.prototype._read = function(n) {
- setTimeout(function() {
-
- if (this.pos >= this.len) {
- // double push(null) to test eos handling
- this.push(null);
- return this.push(null);
- }
-
- n = Math.min(n, this.len - this.pos);
- if (n <= 0) {
- // double push(null) to test eos handling
- this.push(null);
- return this.push(null);
- }
-
- this.pos += n;
- const ret = Buffer.alloc(n, 'a');
-
- return this.push(ret);
- }.bind(this), 1);
-};
-
{
// Verify utf8 encoding
const tr = new TestReader(100);
diff --git a/test/parallel/test-stream2-unpipe-drain.js b/test/parallel/test-stream2-unpipe-drain.js
index 6bb55531ae2dab..582ab61b06fb96 100644
--- a/test/parallel/test-stream2-unpipe-drain.js
+++ b/test/parallel/test-stream2-unpipe-drain.js
@@ -24,30 +24,27 @@ require('../common');
const assert = require('assert');
const stream = require('stream');
-const util = require('util');
-function TestWriter() {
- stream.Writable.call(this);
+class TestWriter extends stream.Writable {
+ _write(buffer, encoding, callback) {
+ console.log('write called');
+ // super slow write stream (callback never called)
+ }
}
-util.inherits(TestWriter, stream.Writable);
-
-TestWriter.prototype._write = function(buffer, encoding, callback) {
- console.log('write called');
- // super slow write stream (callback never called)
-};
const dest = new TestWriter();
-function TestReader(id) {
- stream.Readable.call(this);
- this.reads = 0;
-}
-util.inherits(TestReader, stream.Readable);
+class TestReader extends stream.Readable {
+ constructor() {
+ super();
+ this.reads = 0;
+ }
-TestReader.prototype._read = function(size) {
- this.reads += 1;
- this.push(Buffer.alloc(size));
-};
+ _read(size) {
+ this.reads += 1;
+ this.push(Buffer.alloc(size));
+ }
+}
const src1 = new TestReader();
const src2 = new TestReader();
diff --git a/test/parallel/test-stream2-unpipe-leak.js b/test/parallel/test-stream2-unpipe-leak.js
index 391ee385320ff6..27cad3d5f575c6 100644
--- a/test/parallel/test-stream2-unpipe-leak.js
+++ b/test/parallel/test-stream2-unpipe-leak.js
@@ -26,29 +26,27 @@ const stream = require('stream');
const chunk = Buffer.from('hallo');
-const util = require('util');
-
-function TestWriter() {
- stream.Writable.call(this);
+class TestWriter extends stream.Writable {
+ _write(buffer, encoding, callback) {
+ callback(null);
+ }
}
-util.inherits(TestWriter, stream.Writable);
-
-TestWriter.prototype._write = function(buffer, encoding, callback) {
- callback(null);
-};
const dest = new TestWriter();
// Set this high so that we'd trigger a nextTick warning
// and/or RangeError if we do maybeReadMore wrong.
-function TestReader() {
- stream.Readable.call(this, { highWaterMark: 0x10000 });
-}
-util.inherits(TestReader, stream.Readable);
+class TestReader extends stream.Readable {
+ constructor() {
+ super({
+ highWaterMark: 0x10000
+ });
+ }
-TestReader.prototype._read = function(size) {
- this.push(chunk);
-};
+ _read(size) {
+ this.push(chunk);
+ }
+}
const src = new TestReader();
diff --git a/test/parallel/test-stream2-writable.js b/test/parallel/test-stream2-writable.js
index 2af3f683a23478..712440368c48c6 100644
--- a/test/parallel/test-stream2-writable.js
+++ b/test/parallel/test-stream2-writable.js
@@ -26,24 +26,23 @@ const W = require('_stream_writable');
const D = require('_stream_duplex');
const assert = require('assert');
-const util = require('util');
-util.inherits(TestWriter, W);
-
-function TestWriter() {
- W.apply(this, arguments);
- this.buffer = [];
- this.written = 0;
+class TestWriter extends W {
+ constructor(opts) {
+ super(opts);
+ this.buffer = [];
+ this.written = 0;
+ }
+
+ _write(chunk, encoding, cb) {
+ // simulate a small unpredictable latency
+ setTimeout(() => {
+ this.buffer.push(chunk.toString());
+ this.written += chunk.length;
+ cb();
+ }, Math.floor(Math.random() * 10));
+ }
}
-TestWriter.prototype._write = function(chunk, encoding, cb) {
- // simulate a small unpredictable latency
- setTimeout(function() {
- this.buffer.push(chunk.toString());
- this.written += chunk.length;
- cb();
- }.bind(this), Math.floor(Math.random() * 10));
-};
-
const chunks = new Array(50);
for (let i = 0; i < chunks.length; i++) {
chunks[i] = 'x'.repeat(i);
diff --git a/test/parallel/test-util-format.js b/test/parallel/test-util-format.js
index c601a64d48dc38..fd686cb6d355ad 100644
--- a/test/parallel/test-util-format.js
+++ b/test/parallel/test-util-format.js
@@ -249,15 +249,16 @@ assert.strictEqual(util.format('abc%', 1), 'abc% 1');
// Errors
const err = new Error('foo');
assert.strictEqual(util.format(err), err.stack);
-function CustomError(msg) {
- Error.call(this);
- Object.defineProperty(this, 'message',
- { value: msg, enumerable: false });
- Object.defineProperty(this, 'name',
- { value: 'CustomError', enumerable: false });
- Error.captureStackTrace(this, CustomError);
+class CustomError extends Error {
+ constructor(msg) {
+ super();
+ Object.defineProperty(this, 'message',
+ { value: msg, enumerable: false });
+ Object.defineProperty(this, 'name',
+ { value: 'CustomError', enumerable: false });
+ Error.captureStackTrace(this, CustomError);
+ }
}
-util.inherits(CustomError, Error);
const customError = new CustomError('bar');
assert.strictEqual(util.format(customError), customError.stack);
// Doesn't capture stack trace
diff --git a/test/pummel/test-tls-server-large-request.js b/test/pummel/test-tls-server-large-request.js
index a99c142d53c818..5d3a0615bad6e2 100644
--- a/test/pummel/test-tls-server-large-request.js
+++ b/test/pummel/test-tls-server-large-request.js
@@ -28,7 +28,6 @@ const assert = require('assert');
const tls = require('tls');
const fixtures = require('../common/fixtures');
const stream = require('stream');
-const util = require('util');
const request = Buffer.from('ABCD'.repeat(1024 * 256 - 1)); // 1mb
@@ -37,21 +36,22 @@ const options = {
cert: fixtures.readKey('agent1-cert.pem')
};
-function Mediator() {
- stream.Writable.call(this);
- this.buf = '';
-}
-util.inherits(Mediator, stream.Writable);
+class Mediator extends stream.Writable {
+ constructor() {
+ super();
+ this.buf = '';
+ }
-Mediator.prototype._write = function _write(data, enc, cb) {
- this.buf += data;
- setTimeout(cb, 0);
+ _write(data, enc, cb) {
+ this.buf += data;
+ setTimeout(cb, 0);
- if (this.buf.length >= request.length) {
- assert.strictEqual(this.buf, request.toString());
- server.close();
+ if (this.buf.length >= request.length) {
+ assert.strictEqual(this.buf, request.toString());
+ server.close();
+ }
}
-};
+}
const mediator = new Mediator();
diff --git a/test/sequential/test-stream2-fs.js b/test/sequential/test-stream2-fs.js
index e2da2dca645dce..3d06abc9214089 100644
--- a/test/sequential/test-stream2-fs.js
+++ b/test/sequential/test-stream2-fs.js
@@ -34,27 +34,26 @@ const size = fs.statSync(file).size;
const expectLengths = [1024];
-const util = require('util');
const Stream = require('stream');
-util.inherits(TestWriter, Stream);
+class TestWriter extends Stream {
+ constructor() {
+ super();
+ this.buffer = [];
+ this.length = 0;
+ }
-function TestWriter() {
- Stream.apply(this);
- this.buffer = [];
- this.length = 0;
-}
-
-TestWriter.prototype.write = function(c) {
- this.buffer.push(c.toString());
- this.length += c.length;
- return true;
-};
+ write(c) {
+ this.buffer.push(c.toString());
+ this.length += c.length;
+ return true;
+ }
-TestWriter.prototype.end = function(c) {
- if (c) this.buffer.push(c.toString());
- this.emit('results', this.buffer);
-};
+ end(c) {
+ if (c) this.buffer.push(c.toString());
+ this.emit('results', this.buffer);
+ }
+}
const r = new FSReadable(file);
const w = new TestWriter();
From 8c35ace404417893790919c33261ca1762340848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de>
Date: Sat, 11 Nov 2017 00:39:49 +0100
Subject: [PATCH 2/3] [fixup] remove empty line
---
test/parallel/test-stream2-set-encoding.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/test/parallel/test-stream2-set-encoding.js b/test/parallel/test-stream2-set-encoding.js
index 8e14334b03b8d0..f60e8df9e15a85 100644
--- a/test/parallel/test-stream2-set-encoding.js
+++ b/test/parallel/test-stream2-set-encoding.js
@@ -33,7 +33,6 @@ class TestReader extends R {
_read(n) {
setTimeout(() => {
-
if (this.pos >= this.len) {
// double push(null) to test eos handling
this.push(null);
From 0fea6783e1e2a1dccd808fb8b702d5dbc27a49fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de>
Date: Sat, 11 Nov 2017 11:53:52 +0100
Subject: [PATCH 3/3] [fixup] address comments
---
test/parallel/test-crypto-stream.js | 28 +++++++++----------
test/parallel/test-event-emitter-listeners.js | 2 +-
.../test-http-client-read-in-error.js | 8 +++---
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/test/parallel/test-crypto-stream.js b/test/parallel/test-crypto-stream.js
index 7eb6d394876686..0464829f74caed 100644
--- a/test/parallel/test-crypto-stream.js
+++ b/test/parallel/test-crypto-stream.js
@@ -28,24 +28,24 @@ const assert = require('assert');
const stream = require('stream');
const crypto = require('crypto');
-// Small stream to buffer converter
-class Stream2buffer extends stream.Writable {
- constructor(callback) {
- super();
+if (!common.hasFipsCrypto) {
+ // Small stream to buffer converter
+ class Stream2buffer extends stream.Writable {
+ constructor(callback) {
+ super();
- this._buffers = [];
- this.once('finish', function() {
- callback(null, Buffer.concat(this._buffers));
- });
- }
+ this._buffers = [];
+ this.once('finish', function() {
+ callback(null, Buffer.concat(this._buffers));
+ });
+ }
- _write(data, encodeing, done) {
- this._buffers.push(data);
- return done(null);
+ _write(data, encodeing, done) {
+ this._buffers.push(data);
+ return done(null);
+ }
}
-}
-if (!common.hasFipsCrypto) {
// Create an md5 hash of "Hallo world"
const hasher1 = crypto.createHash('md5');
hasher1.pipe(new Stream2buffer(common.mustCall(function end(err, hash) {
diff --git a/test/parallel/test-event-emitter-listeners.js b/test/parallel/test-event-emitter-listeners.js
index 4fdb20ec13f546..0736e3103e9e9e 100644
--- a/test/parallel/test-event-emitter-listeners.js
+++ b/test/parallel/test-event-emitter-listeners.js
@@ -27,7 +27,6 @@ const events = require('events');
function listener() {}
function listener2() {}
-class TestStream extends events.EventEmitter {}
{
const ee = new events.EventEmitter();
@@ -79,6 +78,7 @@ class TestStream extends events.EventEmitter {}
}
{
+ class TestStream extends events.EventEmitter {}
const s = new TestStream();
assert.deepStrictEqual(s.listeners('foo'), []);
}
diff --git a/test/parallel/test-http-client-read-in-error.js b/test/parallel/test-http-client-read-in-error.js
index 5cee7797ed64d4..dbf103013175d3 100644
--- a/test/parallel/test-http-client-read-in-error.js
+++ b/test/parallel/test-http-client-read-in-error.js
@@ -5,21 +5,21 @@ const http = require('http');
class Agent extends http.Agent {
createConnection() {
- const self = this;
const socket = new net.Socket();
socket.on('error', function() {
socket.push('HTTP/1.1 200\r\n\r\n');
});
- socket.on('newListener', function onNewListener(name) {
+ let onNewListener;
+ socket.on('newListener', onNewListener = (name) => {
if (name !== 'error')
return;
socket.removeListener('newListener', onNewListener);
// Let other listeners to be set up too
- process.nextTick(function() {
- self.breakSocket(socket);
+ process.nextTick(() => {
+ this.breakSocket(socket);
});
});