From 2f64d5a294a8cb6c348065c6563b1020dc402adc Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sun, 11 Dec 2016 20:34:52 -0800 Subject: [PATCH] test: refactor test-crypto-random MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * specify constructor for assert.throws() * load additional modules only if crypto check passes * normalize some potentially confusing indentation * provided actual first and expected second in assertions PR-URL: https://github.com/nodejs/node/pull/10232 Reviewed-By: Prince John Wesley Reviewed-By: Luigi Pinca Reviewed-By: Michaƫl Zasso --- test/parallel/test-crypto-random.js | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/test/parallel/test-crypto-random.js b/test/parallel/test-crypto-random.js index 6866c8c081..a3e9ab2668 100644 --- a/test/parallel/test-crypto-random.js +++ b/test/parallel/test-crypto-random.js @@ -1,11 +1,11 @@ 'use strict'; const common = require('../common'); -const assert = require('assert'); if (!common.hasCrypto) { common.skip('missing crypto'); return; } +const assert = require('assert'); const crypto = require('crypto'); crypto.DEFAULT_ENCODING = 'buffer'; @@ -13,25 +13,16 @@ crypto.DEFAULT_ENCODING = 'buffer'; // bump, we register a lot of exit listeners process.setMaxListeners(256); -[crypto.randomBytes, - crypto.pseudoRandomBytes -].forEach(function(f) { - [-1, - undefined, - null, - false, - true, - {}, - [] - ].forEach(function(value) { - assert.throws(function() { f(value); }); - assert.throws(function() { f(value, function() {}); }); +[crypto.randomBytes, crypto.pseudoRandomBytes].forEach(function(f) { + [-1, undefined, null, false, true, {}, []].forEach(function(value) { + assert.throws(function() { f(value); }, TypeError); + assert.throws(function() { f(value, function() {}); }, TypeError); }); [0, 1, 2, 4, 16, 256, 1024].forEach(function(len) { f(len, common.mustCall(function(ex, buf) { - assert.strictEqual(null, ex); - assert.strictEqual(len, buf.length); + assert.strictEqual(ex, null); + assert.strictEqual(buf.length, len); assert.ok(Buffer.isBuffer(buf)); })); });