Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 735119c

Browse filesBrowse files
Italo A. CasasMylesBorins
Italo A. Casas
authored and
MylesBorins
committed
test: cleanup stream tests
const and let instead var assert.strictEqual instead assert.equal PR-URL: #8668 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Ilkka Myller <ilkka.myller@nodefield.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
1 parent 31434a1 commit 735119c
Copy full SHA for 735119c

File tree

Expand file treeCollapse file tree

7 files changed

+79
-82
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

7 files changed

+79
-82
lines changed
Open diff view settings
Collapse file

‎test/parallel/test-stream-big-packet.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-stream-big-packet.js
+8-8Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
'use strict';
22
require('../common');
3-
var assert = require('assert');
4-
var util = require('util');
5-
var stream = require('stream');
3+
const assert = require('assert');
4+
const util = require('util');
5+
const stream = require('stream');
66

7-
var passed = false;
7+
let passed = false;
88

99
function PassThrough() {
1010
stream.Transform.call(this);
@@ -27,15 +27,15 @@ TestStream.prototype._transform = function(chunk, encoding, done) {
2727
done();
2828
};
2929

30-
var s1 = new PassThrough();
31-
var s2 = new PassThrough();
32-
var s3 = new TestStream();
30+
const s1 = new PassThrough();
31+
const s2 = new PassThrough();
32+
const s3 = new TestStream();
3333
s1.pipe(s3);
3434
// Don't let s2 auto close which may close s3
3535
s2.pipe(s3, {end: false});
3636

3737
// We must write a buffer larger than highWaterMark
38-
var big = new Buffer(s1._writableState.highWaterMark + 1);
38+
const big = new Buffer(s1._writableState.highWaterMark + 1);
3939
big.fill('x');
4040

4141
// Since big is larger than highWaterMark, it will be buffered internally.
Collapse file

‎test/parallel/test-stream-big-push.js‎

Copy file name to clipboard
+13-13Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
'use strict';
22
require('../common');
3-
var assert = require('assert');
4-
var stream = require('stream');
5-
var str = 'asdfasdfasdfasdfasdf';
3+
const assert = require('assert');
4+
const stream = require('stream');
5+
const str = 'asdfasdfasdfasdfasdf';
66

7-
var r = new stream.Readable({
7+
const r = new stream.Readable({
88
highWaterMark: 5,
99
encoding: 'utf8'
1010
});
1111

12-
var reads = 0;
13-
var eofed = false;
14-
var ended = false;
12+
let reads = 0;
13+
let eofed = false;
14+
let ended = false;
1515

1616
r._read = function(n) {
1717
if (reads === 0) {
@@ -21,7 +21,7 @@ r._read = function(n) {
2121
reads++;
2222
} else if (reads === 1) {
2323
var ret = r.push(str);
24-
assert.equal(ret, false);
24+
assert.strictEqual(ret, false);
2525
reads++;
2626
} else {
2727
assert(!eofed);
@@ -40,25 +40,25 @@ var ret = r.push(str);
4040
// should be false. > hwm
4141
assert(!ret);
4242
var chunk = r.read();
43-
assert.equal(chunk, str);
43+
assert.strictEqual(chunk, str);
4444
chunk = r.read();
45-
assert.equal(chunk, null);
45+
assert.strictEqual(chunk, null);
4646

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

5555
chunk = r.read();
56-
assert.equal(chunk, null);
56+
assert.strictEqual(chunk, null);
5757
});
5858

5959
process.on('exit', function() {
6060
assert(eofed);
6161
assert(ended);
62-
assert.equal(reads, 2);
62+
assert.strictEqual(reads, 2);
6363
console.log('ok');
6464
});
Collapse file

‎test/parallel/test-stream-duplex.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-stream-duplex.js
+5-6Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
'use strict';
22
require('../common');
3-
var assert = require('assert');
3+
const assert = require('assert');
4+
const Duplex = require('stream').Transform;
45

5-
var Duplex = require('stream').Transform;
6-
7-
var stream = new Duplex({ objectMode: true });
6+
const stream = new Duplex({ objectMode: true });
87

98
assert(stream._readableState.objectMode);
109
assert(stream._writableState.objectMode);
1110

12-
var written;
13-
var read;
11+
let written;
12+
let read;
1413

1514
stream._write = function(obj, _, cb) {
1615
written = obj;
Collapse file

‎test/parallel/test-stream-end-paused.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-stream-end-paused.js
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
'use strict';
22
const common = require('../common');
3-
var assert = require('assert');
3+
const assert = require('assert');
44

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

7-
var Readable = require('stream').Readable;
8-
var stream = new Readable();
9-
var calledRead = false;
7+
const Readable = require('stream').Readable;
8+
const stream = new Readable();
9+
let calledRead = false;
1010
stream._read = function() {
1111
assert(!calledRead);
1212
calledRead = true;
Collapse file

‎test/parallel/test-stream-ispaused.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-stream-ispaused.js
+3-4Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
'use strict';
22
require('../common');
3-
var assert = require('assert');
3+
const assert = require('assert');
4+
const stream = require('stream');
45

5-
var stream = require('stream');
6-
7-
var readable = new stream.Readable();
6+
const readable = new stream.Readable();
87

98
// _read is a noop, here.
109
readable._read = Function();
Collapse file

‎test/parallel/test-stream-pipe-after-end.js‎

Copy file name to clipboardExpand all lines: test/parallel/test-stream-pipe-after-end.js
+10-11Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
'use strict';
22
require('../common');
3-
var assert = require('assert');
4-
5-
var Readable = require('_stream_readable');
6-
var Writable = require('_stream_writable');
7-
var util = require('util');
3+
const assert = require('assert');
4+
const Readable = require('_stream_readable');
5+
const Writable = require('_stream_writable');
6+
const util = require('util');
87

98
util.inherits(TestReadable, Readable);
109
function TestReadable(opt) {
@@ -35,11 +34,11 @@ TestWritable.prototype._write = function(chunk, encoding, cb) {
3534
};
3635

3736
// this one should not emit 'end' until we read() from it later.
38-
var ender = new TestReadable();
39-
var enderEnded = false;
37+
const ender = new TestReadable();
38+
let enderEnded = false;
4039

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

@@ -48,11 +47,11 @@ setTimeout(function() {
4847
enderEnded = true;
4948
});
5049
assert(!enderEnded);
51-
var c = ender.read();
50+
const c = ender.read();
5251
assert.equal(c, null);
5352

54-
var w = new TestWritable();
55-
var writableFinished = false;
53+
const w = new TestWritable();
54+
let writableFinished = false;
5655
w.on('finish', function() {
5756
writableFinished = true;
5857
});
Collapse file

‎test/parallel/test-stream-pipe-cleanup.js‎

Copy file name to clipboard
+36-36Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
'use strict';
22
// This test asserts that Stream.prototype.pipe does not leave listeners
33
// hanging on the source or dest.
4-
54
require('../common');
6-
var stream = require('stream');
7-
var assert = require('assert');
8-
var util = require('util');
5+
const stream = require('stream');
6+
const assert = require('assert');
7+
const util = require('util');
98

109
function Writable() {
1110
this.writable = true;
@@ -33,20 +32,20 @@ function Duplex() {
3332
}
3433
util.inherits(Duplex, Writable);
3534

36-
var i = 0;
37-
var limit = 100;
35+
let i = 0;
36+
const limit = 100;
3837

39-
var w = new Writable();
38+
let w = new Writable();
4039

41-
var r;
40+
let r;
4241

4342
for (i = 0; i < limit; i++) {
4443
r = new Readable();
4544
r.pipe(w);
4645
r.emit('end');
4746
}
48-
assert.equal(0, r.listeners('end').length);
49-
assert.equal(limit, w.endCalls);
47+
assert.strictEqual(0, r.listeners('end').length);
48+
assert.strictEqual(limit, w.endCalls);
5049

5150
w.endCalls = 0;
5251

@@ -55,8 +54,8 @@ for (i = 0; i < limit; i++) {
5554
r.pipe(w);
5655
r.emit('close');
5756
}
58-
assert.equal(0, r.listeners('close').length);
59-
assert.equal(limit, w.endCalls);
57+
assert.strictEqual(0, r.listeners('close').length);
58+
assert.strictEqual(limit, w.endCalls);
6059

6160
w.endCalls = 0;
6261

@@ -67,36 +66,37 @@ for (i = 0; i < limit; i++) {
6766
r.pipe(w);
6867
w.emit('close');
6968
}
70-
assert.equal(0, w.listeners('close').length);
69+
assert.strictEqual(0, w.listeners('close').length);
7170

7271
r = new Readable();
7372
w = new Writable();
74-
var d = new Duplex();
73+
const d = new Duplex();
7574
r.pipe(d); // pipeline A
7675
d.pipe(w); // pipeline B
77-
assert.equal(r.listeners('end').length, 2); // A.onend, A.cleanup
78-
assert.equal(r.listeners('close').length, 2); // A.onclose, A.cleanup
79-
assert.equal(d.listeners('end').length, 2); // B.onend, B.cleanup
80-
assert.equal(d.listeners('close').length, 3); // A.cleanup, B.onclose, B.cleanup
81-
assert.equal(w.listeners('end').length, 0);
82-
assert.equal(w.listeners('close').length, 1); // B.cleanup
76+
assert.strictEqual(r.listeners('end').length, 2); // A.onend, A.cleanup
77+
assert.strictEqual(r.listeners('close').length, 2); // A.onclose, A.cleanup
78+
assert.strictEqual(d.listeners('end').length, 2); // B.onend, B.cleanup
79+
// A.cleanup, B.onclose, B.cleanup
80+
assert.strictEqual(d.listeners('close').length, 3);
81+
assert.strictEqual(w.listeners('end').length, 0);
82+
assert.strictEqual(w.listeners('close').length, 1); // B.cleanup
8383

8484
r.emit('end');
85-
assert.equal(d.endCalls, 1);
86-
assert.equal(w.endCalls, 0);
87-
assert.equal(r.listeners('end').length, 0);
88-
assert.equal(r.listeners('close').length, 0);
89-
assert.equal(d.listeners('end').length, 2); // B.onend, B.cleanup
90-
assert.equal(d.listeners('close').length, 2); // B.onclose, B.cleanup
91-
assert.equal(w.listeners('end').length, 0);
92-
assert.equal(w.listeners('close').length, 1); // B.cleanup
85+
assert.strictEqual(d.endCalls, 1);
86+
assert.strictEqual(w.endCalls, 0);
87+
assert.strictEqual(r.listeners('end').length, 0);
88+
assert.strictEqual(r.listeners('close').length, 0);
89+
assert.strictEqual(d.listeners('end').length, 2); // B.onend, B.cleanup
90+
assert.strictEqual(d.listeners('close').length, 2); // B.onclose, B.cleanup
91+
assert.strictEqual(w.listeners('end').length, 0);
92+
assert.strictEqual(w.listeners('close').length, 1); // B.cleanup
9393

9494
d.emit('end');
95-
assert.equal(d.endCalls, 1);
96-
assert.equal(w.endCalls, 1);
97-
assert.equal(r.listeners('end').length, 0);
98-
assert.equal(r.listeners('close').length, 0);
99-
assert.equal(d.listeners('end').length, 0);
100-
assert.equal(d.listeners('close').length, 0);
101-
assert.equal(w.listeners('end').length, 0);
102-
assert.equal(w.listeners('close').length, 0);
95+
assert.strictEqual(d.endCalls, 1);
96+
assert.strictEqual(w.endCalls, 1);
97+
assert.strictEqual(r.listeners('end').length, 0);
98+
assert.strictEqual(r.listeners('close').length, 0);
99+
assert.strictEqual(d.listeners('end').length, 0);
100+
assert.strictEqual(d.listeners('close').length, 0);
101+
assert.strictEqual(w.listeners('end').length, 0);
102+
assert.strictEqual(w.listeners('close').length, 0);

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.