From 5b63d48e9ea93e5fe1265e9e0d43574b6b0d807a Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Fri, 8 Jul 2016 17:17:47 -0700 Subject: lib,benchmark,test: implement consistent braces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change is in preparation for lint-enforced brace style. PR-URL: https://github.com/nodejs/node/pull/7630 Reviewed-By: Brian White Reviewed-By: Michaël Zasso Reviewed-By: Ben Noordhuis Reviewed-By: Roman Reiss Reviewed-By: Trevor Norris Reviewed-By: Rod Vagg --- test/parallel/test-child-process-fork-exec-path.js | 6 ++---- test/parallel/test-child-process-recv-handle.js | 6 ++---- test/parallel/test-cluster-basic.js | 4 +--- test/parallel/test-cluster-bind-privileged-port.js | 3 +-- test/parallel/test-cluster-bind-twice.js | 9 +++------ test/parallel/test-cluster-eaddrinuse.js | 6 ++---- test/parallel/test-cluster-listening-port.js | 3 +-- test/parallel/test-cluster-message.js | 4 +--- test/parallel/test-cluster-net-listen.js | 3 +-- .../test-cluster-shared-handle-bind-error.js | 3 +-- ...est-cluster-shared-handle-bind-privileged-port.js | 3 +-- test/parallel/test-cluster-uncaught-exception.js | 6 ++---- test/parallel/test-cluster-worker-death.js | 3 +-- test/parallel/test-crypto-authenticated.js | 16 +++++++--------- test/parallel/test-debugger-util-regression.js | 6 ++---- test/parallel/test-fs-open.js | 3 +-- test/parallel/test-fs-realpath.js | 3 +-- test/parallel/test-http-server-stale-close.js | 3 +-- test/parallel/test-next-tick-errors.js | 3 +-- test/parallel/test-process-argv-0.js | 3 +-- test/parallel/test-process-cpuUsage.js | 20 ++++++++++++-------- test/parallel/test-repl-domain.js | 3 +-- test/parallel/test-vm-context.js | 3 +-- 23 files changed, 47 insertions(+), 75 deletions(-) (limited to 'test/parallel') diff --git a/test/parallel/test-child-process-fork-exec-path.js b/test/parallel/test-child-process-fork-exec-path.js index 5bd1933ce4..459e9992d0 100644 --- a/test/parallel/test-child-process-fork-exec-path.js +++ b/test/parallel/test-child-process-fork-exec-path.js @@ -12,13 +12,11 @@ if (process.env.FORK) { assert.equal(process.argv[0], copyPath); process.send(msg); process.exit(); -} -else { +} else { common.refreshTmpDir(); try { fs.unlinkSync(copyPath); - } - catch (e) { + } catch (e) { if (e.code !== 'ENOENT') throw e; } fs.writeFileSync(copyPath, fs.readFileSync(nodePath)); diff --git a/test/parallel/test-child-process-recv-handle.js b/test/parallel/test-child-process-recv-handle.js index 441740e2d4..6491dd032e 100644 --- a/test/parallel/test-child-process-recv-handle.js +++ b/test/parallel/test-child-process-recv-handle.js @@ -49,14 +49,12 @@ function worker() { if (n === 1) { assert.equal(msg, 'one'); assert.equal(handle, undefined); - } - else if (n === 2) { + } else if (n === 2) { assert.equal(msg, 'two'); assert.equal(typeof handle, 'object'); // Also matches null, therefore... assert.ok(handle); // also check that it's truthy. handle.close(); - } - else if (n === 3) { + } else if (n === 3) { assert.equal(msg, 'three'); assert.equal(handle, undefined); process.exit(); diff --git a/test/parallel/test-cluster-basic.js b/test/parallel/test-cluster-basic.js index 076756ab3d..3776eecdc5 100644 --- a/test/parallel/test-cluster-basic.js +++ b/test/parallel/test-cluster-basic.js @@ -18,9 +18,7 @@ if (cluster.isWorker) { http.Server(function() { }).listen(common.PORT, '127.0.0.1'); -} - -else if (cluster.isMaster) { +} else if (cluster.isMaster) { var checks = { cluster: { diff --git a/test/parallel/test-cluster-bind-privileged-port.js b/test/parallel/test-cluster-bind-privileged-port.js index 9f4ef8ee5e..4aed915fa3 100644 --- a/test/parallel/test-cluster-bind-privileged-port.js +++ b/test/parallel/test-cluster-bind-privileged-port.js @@ -18,8 +18,7 @@ if (cluster.isMaster) { cluster.fork().on('exit', common.mustCall(function(exitCode) { assert.equal(exitCode, 0); })); -} -else { +} else { var s = net.createServer(common.fail); s.listen(42, common.fail.bind(null, 'listen should have failed')); s.on('error', common.mustCall(function(err) { diff --git a/test/parallel/test-cluster-bind-twice.js b/test/parallel/test-cluster-bind-twice.js index 6328f588b3..8bd57a3fba 100644 --- a/test/parallel/test-cluster-bind-twice.js +++ b/test/parallel/test-cluster-bind-twice.js @@ -64,8 +64,7 @@ if (!id) { process.on('exit', function() { assert(ok); }); -} -else if (id === 'one') { +} else if (id === 'one') { if (cluster.isMaster) return startWorker(); http.createServer(common.fail).listen(common.PORT, function() { @@ -75,8 +74,7 @@ else if (id === 'one') { process.on('message', function(m) { if (m === 'QUIT') process.exit(); }); -} -else if (id === 'two') { +} else if (id === 'two') { if (cluster.isMaster) return startWorker(); let ok = false; @@ -96,8 +94,7 @@ else if (id === 'two') { ok = true; }); }); -} -else { +} else { assert(0); // bad command line argument } diff --git a/test/parallel/test-cluster-eaddrinuse.js b/test/parallel/test-cluster-eaddrinuse.js index 7947fb9bab..88b6de2dde 100644 --- a/test/parallel/test-cluster-eaddrinuse.js +++ b/test/parallel/test-cluster-eaddrinuse.js @@ -21,8 +21,7 @@ if (id === 'undefined') { }); }); }); -} -else if (id === 'worker') { +} else if (id === 'worker') { let server = net.createServer(common.fail); server.listen(common.PORT, common.fail); server.on('error', common.mustCall(function(e) { @@ -36,7 +35,6 @@ else if (id === 'worker') { })); }); })); -} -else { +} else { assert(0); // Bad argument. } diff --git a/test/parallel/test-cluster-listening-port.js b/test/parallel/test-cluster-listening-port.js index dc048c891c..810364a926 100644 --- a/test/parallel/test-cluster-listening-port.js +++ b/test/parallel/test-cluster-listening-port.js @@ -19,7 +19,6 @@ if (cluster.isMaster) { // ensure that the 'listening' handler has been called assert(port); }); -} -else { +} else { net.createServer(common.fail).listen(0); } diff --git a/test/parallel/test-cluster-message.js b/test/parallel/test-cluster-message.js index 7b074b9034..0587eecb4d 100644 --- a/test/parallel/test-cluster-message.js +++ b/test/parallel/test-cluster-message.js @@ -40,9 +40,7 @@ if (cluster.isWorker) { }); server.listen(common.PORT, '127.0.0.1'); -} - -else if (cluster.isMaster) { +} else if (cluster.isMaster) { var checks = { global: { diff --git a/test/parallel/test-cluster-net-listen.js b/test/parallel/test-cluster-net-listen.js index c79d4cf1a2..81bd1641d3 100644 --- a/test/parallel/test-cluster-net-listen.js +++ b/test/parallel/test-cluster-net-listen.js @@ -14,8 +14,7 @@ if (cluster.isMaster) { process.on('exit', function() { assert.equal(worker, null); }); -} -else { +} else { // listen() without port should not trigger a libuv assert net.createServer(common.fail).listen(process.exit); } diff --git a/test/parallel/test-cluster-shared-handle-bind-error.js b/test/parallel/test-cluster-shared-handle-bind-error.js index 288b4b443a..f5a08a1ed8 100644 --- a/test/parallel/test-cluster-shared-handle-bind-error.js +++ b/test/parallel/test-cluster-shared-handle-bind-error.js @@ -16,8 +16,7 @@ if (cluster.isMaster) { server.close(); })); }); -} -else { +} else { var s = net.createServer(common.fail); s.listen(common.PORT, common.fail.bind(null, 'listen should have failed')); s.on('error', common.mustCall(function(err) { diff --git a/test/parallel/test-cluster-shared-handle-bind-privileged-port.js b/test/parallel/test-cluster-shared-handle-bind-privileged-port.js index 90bab2febe..9dc0e4ea77 100644 --- a/test/parallel/test-cluster-shared-handle-bind-privileged-port.js +++ b/test/parallel/test-cluster-shared-handle-bind-privileged-port.js @@ -20,8 +20,7 @@ if (cluster.isMaster) { cluster.fork().on('exit', common.mustCall(function(exitCode) { assert.equal(exitCode, 0); })); -} -else { +} else { var s = net.createServer(common.fail); s.listen(42, common.fail.bind(null, 'listen should have failed')); s.on('error', common.mustCall(function(err) { diff --git a/test/parallel/test-cluster-uncaught-exception.js b/test/parallel/test-cluster-uncaught-exception.js index 04eac2e8ce..1f04b71f01 100644 --- a/test/parallel/test-cluster-uncaught-exception.js +++ b/test/parallel/test-cluster-uncaught-exception.js @@ -23,8 +23,7 @@ if (isTestRunner) { master.on('exit', function(code) { exitCode = code; }); -} -else if (cluster.isMaster) { +} else if (cluster.isMaster) { process.on('uncaughtException', function() { process.nextTick(function() { process.exit(MAGIC_EXIT_CODE); @@ -33,7 +32,6 @@ else if (cluster.isMaster) { cluster.fork(); throw new Error('kill master'); -} -else { // worker +} else { // worker process.exit(); } diff --git a/test/parallel/test-cluster-worker-death.js b/test/parallel/test-cluster-worker-death.js index 65da9865b0..aec745b8b7 100644 --- a/test/parallel/test-cluster-worker-death.js +++ b/test/parallel/test-cluster-worker-death.js @@ -5,8 +5,7 @@ var cluster = require('cluster'); if (!cluster.isMaster) { process.exit(42); -} -else { +} else { var seenExit = 0; var seenDeath = 0; var worker = cluster.fork(); diff --git a/test/parallel/test-crypto-authenticated.js b/test/parallel/test-crypto-authenticated.js index 506862d1bd..f1b92f8a19 100644 --- a/test/parallel/test-crypto-authenticated.js +++ b/test/parallel/test-crypto-authenticated.js @@ -362,8 +362,7 @@ for (var i in TEST_CASES) { (function() { if (!test.password) return; if (common.hasFipsCrypto) { - assert.throws(function() - { crypto.createCipher(test.algo, test.password); }, + assert.throws(() => { crypto.createCipher(test.algo, test.password); }, /not supported in FIPS mode/); } else { var encrypt = crypto.createCipher(test.algo, test.password); @@ -383,8 +382,7 @@ for (var i in TEST_CASES) { (function() { if (!test.password) return; if (common.hasFipsCrypto) { - assert.throws(function() - { crypto.createDecipher(test.algo, test.password); }, + assert.throws(() => { crypto.createDecipher(test.algo, test.password); }, /not supported in FIPS mode/); } else { var decrypt = crypto.createDecipher(test.algo, test.password); @@ -415,9 +413,9 @@ for (var i in TEST_CASES) { 'ipxp9a6i1Mb4USb4', '6fKjEjR3Vl30EUYC'); encrypt.update('blah', 'ascii'); encrypt.final(); - assert.throws(function() { encrypt.getAuthTag(); }, / state/); - assert.throws(function() { - encrypt.setAAD(Buffer.from('123', 'ascii')); }, / state/); + assert.throws(() => { encrypt.getAuthTag(); }, / state/); + assert.throws(() => { encrypt.setAAD(Buffer.from('123', 'ascii')); }, + / state/); })(); (function() { @@ -432,8 +430,8 @@ for (var i in TEST_CASES) { // trying to set tag on encryption object: var encrypt = crypto.createCipheriv(test.algo, Buffer.from(test.key, 'hex'), Buffer.from(test.iv, 'hex')); - assert.throws(function() { - encrypt.setAuthTag(Buffer.from(test.tag, 'hex')); }, / state/); + assert.throws(() => { encrypt.setAuthTag(Buffer.from(test.tag, 'hex')); }, + / state/); })(); (function() { diff --git a/test/parallel/test-debugger-util-regression.js b/test/parallel/test-debugger-util-regression.js index a2461a480c..92630b6a4b 100644 --- a/test/parallel/test-debugger-util-regression.js +++ b/test/parallel/test-debugger-util-regression.js @@ -39,12 +39,10 @@ proc.stdout.on('data', (data) => { stdout.includes('> 4') && nextCount < 4) { nextCount++; proc.stdin.write('n\n'); - } - else if (stdout.includes('{ a: \'b\' }')) { + } else if (stdout.includes('{ a: \'b\' }')) { clearTimeout(timer); proc.stdin.write('.exit\n'); - } - else if (stdout.includes('program terminated')) { + } else if (stdout.includes('program terminated')) { // Catch edge case present in v4.x // process will terminate after call to util.inspect common.fail('the program should not terminate'); diff --git a/test/parallel/test-fs-open.js b/test/parallel/test-fs-open.js index 0818f2b7f6..e2c9d327cc 100644 --- a/test/parallel/test-fs-open.js +++ b/test/parallel/test-fs-open.js @@ -8,8 +8,7 @@ try { // should throw ENOENT, not EBADF // see https://github.com/joyent/node/pull/1228 fs.openSync('/path/to/file/that/does/not/exist', 'r'); -} -catch (e) { +} catch (e) { assert.equal(e.code, 'ENOENT'); caughtException = true; } diff --git a/test/parallel/test-fs-realpath.js b/test/parallel/test-fs-realpath.js index 09f0c4ba7b..29be3127aa 100644 --- a/test/parallel/test-fs-realpath.js +++ b/test/parallel/test-fs-realpath.js @@ -57,8 +57,7 @@ function asynctest(testBlock, args, callback, assertBlock) { if (assertBlock) { try { ignoreError = assertBlock.apply(assertBlock, arguments); - } - catch (e) { + } catch (e) { err = e; } } diff --git a/test/parallel/test-http-server-stale-close.js b/test/parallel/test-http-server-stale-close.js index 7430566dfd..819f503de5 100644 --- a/test/parallel/test-http-server-stale-close.js +++ b/test/parallel/test-http-server-stale-close.js @@ -13,8 +13,7 @@ if (process.env.NODE_TEST_FORK_PORT) { }, process.exit); req.write('BAM'); req.end(); -} -else { +} else { var server = http.createServer(function(req, res) { res.writeHead(200, {'Content-Length': '42'}); req.pipe(res); diff --git a/test/parallel/test-next-tick-errors.js b/test/parallel/test-next-tick-errors.js index 8ff018f5f8..3439aa8699 100644 --- a/test/parallel/test-next-tick-errors.js +++ b/test/parallel/test-next-tick-errors.js @@ -40,8 +40,7 @@ process.on('uncaughtException', function() { if (!exceptionHandled) { exceptionHandled = true; order.push('B'); - } - else { + } else { // If we get here then the first process.nextTick got called twice order.push('OOPS!'); } diff --git a/test/parallel/test-process-argv-0.js b/test/parallel/test-process-argv-0.js index 3299ec74ea..c3aacb60fa 100644 --- a/test/parallel/test-process-argv-0.js +++ b/test/parallel/test-process-argv-0.js @@ -16,7 +16,6 @@ if (process.argv[2] !== 'child') { process.on('exit', function() { assert.equal(childArgv0, process.execPath); }); -} -else { +} else { process.stdout.write(process.argv[0]); } diff --git a/test/parallel/test-process-cpuUsage.js b/test/parallel/test-process-cpuUsage.js index d0ac2a18fc..92dc719185 100644 --- a/test/parallel/test-process-cpuUsage.js +++ b/test/parallel/test-process-cpuUsage.js @@ -42,14 +42,18 @@ assert.throws(function() { process.cpuUsage({ user: null, system: 'c' }); }); assert.throws(function() { process.cpuUsage({ user: 'd', system: null }); }); assert.throws(function() { process.cpuUsage({ user: -1, system: 2 }); }); assert.throws(function() { process.cpuUsage({ user: 3, system: -2 }); }); -assert.throws(function() { process.cpuUsage({ - user: Number.POSITIVE_INFINITY, - system: 4 -});}); -assert.throws(function() { process.cpuUsage({ - user: 5, - system: Number.NEGATIVE_INFINITY -});}); +assert.throws(function() { + process.cpuUsage({ + user: Number.POSITIVE_INFINITY, + system: 4 + }); +}); +assert.throws(function() { + process.cpuUsage({ + user: 5, + system: Number.NEGATIVE_INFINITY + }); +}); // Ensure that the return value is the expected shape. function validateResult(result) { diff --git a/test/parallel/test-repl-domain.js b/test/parallel/test-repl-domain.js index e2682420cb..9f66f30639 100644 --- a/test/parallel/test-repl-domain.js +++ b/test/parallel/test-repl-domain.js @@ -11,8 +11,7 @@ putIn.write = function(data) { // give a false negative. Don't throw, just print and exit. if (data === 'OK\n') { console.log('ok'); - } - else { + } else { console.error(data); process.exit(1); } diff --git a/test/parallel/test-vm-context.js b/test/parallel/test-vm-context.js index ce648b7fb7..659a092eb3 100644 --- a/test/parallel/test-vm-context.js +++ b/test/parallel/test-vm-context.js @@ -32,8 +32,7 @@ console.error('test runInContext signature'); var gh1140Exception; try { vm.runInContext('throw new Error()', context, 'expected-filename.js'); -} -catch (e) { +} catch (e) { gh1140Exception = e; assert.ok(/expected-filename/.test(e.stack), 'expected appearance of filename in Error stack'); -- cgit v1.2.1