test: cleanup stream tests by italoacasas · Pull Request #8668 · nodejs/node · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions test/parallel/test-stream-big-packet.js
26 changes: 13 additions & 13 deletions test/parallel/test-stream-big-push.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
'use strict';
require('../common');
var assert = require('assert');
var stream = require('stream');
var str = 'asdfasdfasdfasdfasdf';
const assert = require('assert');
const stream = require('stream');
const str = 'asdfasdfasdfasdfasdf';

var r = new stream.Readable({
const r = new stream.Readable({
highWaterMark: 5,
encoding: 'utf8'
});

var reads = 0;
var eofed = false;
var ended = false;
let reads = 0;
let eofed = false;
let ended = false;

r._read = function(n) {
if (reads === 0) {
Expand All @@ -21,7 +21,7 @@ r._read = function(n) {
reads++;
} else if (reads === 1) {
var ret = r.push(str);
assert.equal(ret, false);
assert.strictEqual(ret, false);
reads++;
} else {
assert(!eofed);
Expand All @@ -40,25 +40,25 @@ var ret = r.push(str);
// should be false. > hwm
assert(!ret);
var chunk = r.read();
assert.equal(chunk, str);
assert.strictEqual(chunk, str);
chunk = r.read();
assert.equal(chunk, null);
assert.strictEqual(chunk, null);

r.once('readable', function() {
// this time, we'll get *all* the remaining data, because
// it's been added synchronously, as the read WOULD take
// us below the hwm, and so it triggered a _read() again,
// which synchronously added more, which we then return.
chunk = r.read();
assert.equal(chunk, str + str);
assert.strictEqual(chunk, str + str);

chunk = r.read();
assert.equal(chunk, null);
assert.strictEqual(chunk, null);
});

process.on('exit', function() {
assert(eofed);
assert(ended);
assert.equal(reads, 2);
assert.strictEqual(reads, 2);
console.log('ok');
});
11 changes: 5 additions & 6 deletions test/parallel/test-stream-duplex.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
'use strict';
require('../common');
var assert = require('assert');
const assert = require('assert');
const Duplex = require('stream').Transform;

var Duplex = require('stream').Transform;

var stream = new Duplex({ objectMode: true });
const stream = new Duplex({ objectMode: true });

assert(stream._readableState.objectMode);
assert(stream._writableState.objectMode);

var written;
var read;
let written;
let read;

stream._write = function(obj, _, cb) {
written = obj;
Expand Down
8 changes: 4 additions & 4 deletions test/parallel/test-stream-end-paused.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
'use strict';
const common = require('../common');
var assert = require('assert');
const assert = require('assert');

// Make sure we don't miss the end event for paused 0-length streams

var Readable = require('stream').Readable;
var stream = new Readable();
var calledRead = false;
const Readable = require('stream').Readable;
const stream = new Readable();
let calledRead = false;
stream._read = function() {
assert(!calledRead);
calledRead = true;
Expand Down
7 changes: 3 additions & 4 deletions test/parallel/test-stream-ispaused.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
'use strict';
require('../common');
var assert = require('assert');
const assert = require('assert');
const stream = require('stream');

var stream = require('stream');

var readable = new stream.Readable();
const readable = new stream.Readable();

// _read is a noop, here.
readable._read = Function();
Expand Down
21 changes: 10 additions & 11 deletions test/parallel/test-stream-pipe-after-end.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
'use strict';
require('../common');
var assert = require('assert');

var Readable = require('_stream_readable');
var Writable = require('_stream_writable');
var util = require('util');
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) {
Expand Down Expand Up @@ -35,11 +34,11 @@ TestWritable.prototype._write = function(chunk, encoding, cb) {
};

// this one should not emit 'end' until we read() from it later.
var ender = new TestReadable();
var enderEnded = false;
const ender = new TestReadable();
let enderEnded = false;

// what happens when you pipe() a Readable that's already ended?
var piper = new TestReadable();
const piper = new TestReadable();
// pushes EOF null, and length=0, so this will trigger 'end'
piper.read();

Expand All @@ -48,11 +47,11 @@ setTimeout(function() {
enderEnded = true;
});
assert(!enderEnded);
var c = ender.read();
const c = ender.read();
assert.equal(c, null);

var w = new TestWritable();
var writableFinished = false;
const w = new TestWritable();
let writableFinished = false;
w.on('finish', function() {
writableFinished = true;
});
Expand Down
72 changes: 36 additions & 36 deletions test/parallel/test-stream-pipe-cleanup.js