Commit 5a1de80
test: improve the code in test-pipe.js
* use const and let instead of var
* use common.mustCall to control functions executions
* use assert.strictEqual instead of assert.equal
* use assert.ifError to handle errors
* use arrow functions
* remove console.log and process.stdout.write
PR-URL: #10452
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Brian White <mscdex@mscdex.net>1 parent f333062 commit 5a1de80
1 file changed
Lines changed: 40 additions & 54 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,110 +1,96 @@ | |||
| 1 | 1 | 'use strict'; | |
| 2 | - var common = require('../common'); | ||
| 3 | - var assert = require('assert'); | ||
| 4 | - var http = require('http'); | ||
| 5 | - var net = require('net'); | ||
| 2 | + const common = require('../common'); | ||
| 3 | + const assert = require('assert'); | ||
| 4 | + const http = require('http'); | ||
| 5 | + const net = require('net'); | ||
| 6 | 6 | ||
| 7 | - var webPort = common.PORT; | ||
| 8 | - var tcpPort = webPort + 1; | ||
| 7 | + const webPort = common.PORT; | ||
| 8 | + const tcpPort = webPort + 1; | ||
| 9 | + const bufferSize = 5 * 1024 * 1024; | ||
| 9 | 10 | ||
| 10 | - var listenCount = 0; | ||
| 11 | - var gotThanks = false; | ||
| 12 | - var tcpLengthSeen = 0; | ||
| 13 | - var bufferSize = 5 * 1024 * 1024; | ||
| 11 | + let listenCount = 0; | ||
| 12 | + let gotThanks = false; | ||
| 13 | + let tcpLengthSeen = 0; | ||
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | 16 | /* | |
| 17 | 17 | * 5MB of random buffer. | |
| 18 | 18 | */ | |
| 19 | - var buffer = Buffer.allocUnsafe(bufferSize); | ||
| 20 | - for (var i = 0; i < buffer.length; i++) { | ||
| 19 | + const buffer = Buffer.allocUnsafe(bufferSize); | ||
| 20 | + for (let i = 0; i < buffer.length; i++) { | ||
| 21 | 21 | buffer[i] = parseInt(Math.random() * 10000) % 256; | |
| 22 | 22 | } | |
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | - var web = http.Server(function(req, res) { | ||
| 25 | + const web = http.Server(common.mustCall((req, res) => { | ||
| 26 | 26 | web.close(); | |
| 27 | 27 | ||
| 28 | - console.log(req.headers); | ||
| 29 | - | ||
| 30 | - var socket = net.Stream(); | ||
| 28 | + const socket = net.Stream(); | ||
| 31 | 29 | socket.connect(tcpPort); | |
| 32 | 30 | ||
| 33 | - socket.on('connect', function() { | ||
| 34 | - console.log('socket connected'); | ||
| 35 | - }); | ||
| 31 | + socket.on('connect', common.mustCall(() => {})); | ||
| 36 | 32 | ||
| 37 | 33 | req.pipe(socket); | |
| 38 | 34 | ||
| 39 | - req.on('end', function() { | ||
| 35 | + req.on('end', common.mustCall(() => { | ||
| 40 | 36 | res.writeHead(200); | |
| 41 | 37 | res.write('thanks'); | |
| 42 | 38 | res.end(); | |
| 43 | - console.log('response with \'thanks\''); | ||
| 44 | - }); | ||
| 39 | + })); | ||
| 45 | 40 | ||
| 46 | - req.connection.on('error', function(e) { | ||
| 47 | - console.log('http server-side error: ' + e.message); | ||
| 48 | - process.exit(1); | ||
| 41 | + req.connection.on('error', (e) => { | ||
| 42 | + assert.ifError(e); | ||
| 49 | 43 | }); | |
| 50 | - }); | ||
| 44 | + })); | ||
| 45 | + | ||
| 51 | 46 | web.listen(webPort, startClient); | |
| 52 | 47 | ||
| 53 | 48 | ||
| 54 | - var tcp = net.Server(function(s) { | ||
| 49 | + const tcp = net.Server(common.mustCall((s) => { | ||
| 55 | 50 | tcp.close(); | |
| 56 | 51 | ||
| 57 | - console.log('tcp server connection'); | ||
| 58 | - | ||
| 59 | - var i = 0; | ||
| 52 | + let i = 0; | ||
| 60 | 53 | ||
| 61 | - s.on('data', function(d) { | ||
| 62 | - process.stdout.write('.'); | ||
| 54 | + s.on('data', (d) => { | ||
| 63 | 55 | tcpLengthSeen += d.length; | |
| 64 | - for (var j = 0; j < d.length; j++) { | ||
| 65 | - assert.equal(buffer[i], d[j]); | ||
| 56 | + for (let j = 0; j < d.length; j++) { | ||
| 57 | + assert.strictEqual(buffer[i], d[j]); | ||
| 66 | 58 | i++; | |
| 67 | 59 | } | |
| 68 | 60 | }); | |
| 69 | 61 | ||
| 70 | - s.on('end', function() { | ||
| 71 | - console.log('tcp socket disconnect'); | ||
| 62 | + s.on('end', common.mustCall(() => { | ||
| 72 | 63 | s.end(); | |
| 73 | - }); | ||
| 64 | + })); | ||
| 74 | 65 | ||
| 75 | - s.on('error', function(e) { | ||
| 76 | - console.log('tcp server-side error: ' + e.message); | ||
| 77 | - process.exit(1); | ||
| 66 | + s.on('error', (e) => { | ||
| 67 | + assert.ifError(e); | ||
| 78 | 68 | }); | |
| 79 | - }); | ||
| 80 | - tcp.listen(tcpPort, startClient); | ||
| 69 | + })); | ||
| 81 | 70 | ||
| 71 | + tcp.listen(tcpPort, startClient); | ||
| 82 | 72 | ||
| 83 | 73 | function startClient() { | |
| 84 | 74 | listenCount++; | |
| 85 | 75 | if (listenCount < 2) return; | |
| 86 | 76 | ||
| 87 | - console.log('Making request'); | ||
| 88 | - | ||
| 89 | - var req = http.request({ | ||
| 77 | + const req = http.request({ | ||
| 90 | 78 | port: common.PORT, | |
| 91 | 79 | method: 'GET', | |
| 92 | 80 | path: '/', | |
| 93 | 81 | headers: { 'content-length': buffer.length } | |
| 94 | - }, function(res) { | ||
| 95 | - console.log('Got response'); | ||
| 82 | + }, common.mustCall((res) => { | ||
| 96 | 83 | res.setEncoding('utf8'); | |
| 97 | - res.on('data', function(string) { | ||
| 98 | - assert.equal('thanks', string); | ||
| 84 | + res.on('data', common.mustCall((string) => { | ||
| 85 | + assert.strictEqual('thanks', string); | ||
| 99 | 86 | gotThanks = true; | |
| 100 | - }); | ||
| 101 | - }); | ||
| 87 | + })); | ||
| 88 | + })); | ||
| 102 | 89 | req.write(buffer); | |
| 103 | 90 | req.end(); | |
| 104 | - console.error('ended request', req); | ||
| 105 | 91 | } | |
| 106 | 92 | ||
| 107 | - process.on('exit', function() { | ||
| 93 | + process.on('exit', () => { | ||
| 108 | 94 | assert.ok(gotThanks); | |
| 109 | - assert.equal(bufferSize, tcpLengthSeen); | ||
| 95 | + assert.strictEqual(bufferSize, tcpLengthSeen); | ||
| 110 | 96 | }); | |
0 commit comments