From fc5fda5b74e998c424e69bbfa11374ad2818c7da Mon Sep 17 00:00:00 2001 From: Paul Lucas Date: Thu, 1 Dec 2016 10:47:51 -0600 Subject: [PATCH] test: Added more validations to setEncoding * Added more strict validations to properly test setEncoding * Changed all var usage to const or let * Changed assert.equal to assert.strictEqual PR-URL: https://github.com/nodejs/node/pull/9997 Reviewed-By: Colin Ihrig Reviewed-By: Gibson Fahnestock Reviewed-By: James M Snell --- test/parallel/test-tls-set-encoding.js | 37 ++++++++++++++++---------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/test/parallel/test-tls-set-encoding.js b/test/parallel/test-tls-set-encoding.js index 013a5799fa1a3e..5eb58132bc2b64 100644 --- a/test/parallel/test-tls-set-encoding.js +++ b/test/parallel/test-tls-set-encoding.js @@ -1,38 +1,41 @@ 'use strict'; -var common = require('../common'); -var assert = require('assert'); +const common = require('../common'); +const assert = require('assert'); if (!common.hasCrypto) { common.skip('missing crypto'); return; } -var tls = require('tls'); +const tls = require('tls'); -var fs = require('fs'); +const fs = require('fs'); -var options = { +const options = { key: fs.readFileSync(common.fixturesDir + '/keys/agent2-key.pem'), cert: fs.readFileSync(common.fixturesDir + '/keys/agent2-cert.pem') }; -var message = 'hello world\n'; +// Contains a UTF8 only character +const messageUtf8 = 'x√ab c'; +// The same string above represented with ASCII +const messageAscii = 'xb\b\u001aab c'; -var server = tls.Server(options, common.mustCall(function(socket) { - socket.end(message); +const server = tls.Server(options, common.mustCall(function(socket) { + socket.end(messageUtf8); })); server.listen(0, function() { - var client = tls.connect({ + const client = tls.connect({ port: this.address().port, rejectUnauthorized: false }); - var buffer = ''; + let buffer = ''; - client.setEncoding('utf8'); + client.setEncoding('ascii'); client.on('data', function(d) { assert.ok(typeof d === 'string'); @@ -44,10 +47,16 @@ server.listen(0, function() { // readyState is deprecated but we want to make // sure this isn't triggering an assert in lib/net.js // See issue #1069. - assert.equal('closed', client.readyState); + assert.strictEqual('closed', client.readyState); + + // Confirming the buffer string is encoded in ASCII + // and thus does NOT match the UTF8 string + assert.notStrictEqual(buffer, messageUtf8); + + // Confirming the buffer string is encoded in ASCII + // and thus does equal the ASCII string representation + assert.strictEqual(buffer, messageAscii); - assert.equal(buffer, message); - console.log(message); server.close(); }); });