From b7bf43aa2b79bc5531e9e86a153026478f514b46 Mon Sep 17 00:00:00 2001 From: cjihrig Date: Thu, 19 Jan 2017 11:18:51 -0500 Subject: [PATCH] test: use common.fail() instead of assert(false) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/10899 Reviewed-By: James M Snell Reviewed-By: Michaël Zasso Reviewed-By: Italo A. Casas Reviewed-By: Luigi Pinca --- test/internet/test-dns.js | 20 +++++-------------- test/internet/test-tls-add-ca-cert.js | 2 +- .../test-async-wrap-throw-from-callback.js | 4 ++-- .../test-child-process-stdout-flush-exit.js | 3 +-- .../test-domain-uncaught-exception.js | 12 +++++------ test/parallel/test-http-conn-reset.js | 4 +--- .../test-http-double-content-length.js | 5 +---- test/parallel/test-http-parser.js | 6 ++---- ...test-http-response-multi-content-length.js | 2 +- test/parallel/test-net-error-twice.js | 4 ++-- test/parallel/test-net-reconnect-error.js | 3 +-- test/parallel/test-stream-writev.js | 4 ++-- test/parallel/test-tls-client-abort.js | 4 +--- test/parallel/test-tls-close-error.js | 4 +--- test/parallel/test-tls-connect.js | 5 +---- test/parallel/test-tls-handshake-error.js | 4 +--- test/parallel/test-vm-syntax-error-message.js | 4 ++-- .../test-whatwg-url-searchparams-foreach.js | 4 ++-- test/pummel/test-fs-watch-file.js | 7 ++----- 19 files changed, 34 insertions(+), 67 deletions(-) diff --git a/test/internet/test-dns.js b/test/internet/test-dns.js index 8a857c030af39e..3e154a5afad3fa 100644 --- a/test/internet/test-dns.js +++ b/test/internet/test-dns.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +const common = require('../common'); const assert = require('assert'); const dns = require('dns'); const net = require('net'); @@ -44,19 +44,9 @@ function checkWrap(req) { TEST(function test_reverse_bogus(done) { - let error; - - try { - dns.reverse('bogus ip', function() { - assert.ok(false); - }); - } catch (e) { - error = e; - } - - assert.ok(error instanceof Error); - assert.strictEqual(error.errno, 'EINVAL'); - + assert.throws(() => { + dns.reverse('bogus ip', common.fail); + }, /^Error: getHostByAddr EINVAL$/); done(); }); @@ -442,7 +432,7 @@ TEST(function test_lookup_all_mixed(done) { else if (isIPv6(ip.address)) assert.strictEqual(ip.family, 6); else - assert(false); + common.fail('unexpected IP address'); }); done(); diff --git a/test/internet/test-tls-add-ca-cert.js b/test/internet/test-tls-add-ca-cert.js index 05f3b4dc10e36c..135b9215feaa4f 100644 --- a/test/internet/test-tls-add-ca-cert.js +++ b/test/internet/test-tls-add-ca-cert.js @@ -38,7 +38,7 @@ tls.connect(opts, fail).on('error', common.mustCall((err) => { })); function fail() { - assert(false, 'should fail to connect'); + common.fail('should fail to connect'); } // New secure contexts have the well-known root CAs. diff --git a/test/parallel/test-async-wrap-throw-from-callback.js b/test/parallel/test-async-wrap-throw-from-callback.js index b1a51773e2348c..c4a6a9bdaddd1c 100644 --- a/test/parallel/test-async-wrap-throw-from-callback.js +++ b/test/parallel/test-async-wrap-throw-from-callback.js @@ -37,10 +37,10 @@ if (typeof process.argv[2] === 'string') { async_wrap.setupHooks({ init, pre, post, destroy }); async_wrap.enable(); - process.on('uncaughtException', () => assert.ok(0, 'UNREACHABLE')); + process.on('uncaughtException', common.fail); const d = domain.create(); - d.on('error', () => assert.ok(0, 'UNREACHABLE')); + d.on('error', common.fail); d.run(() => { // Using randomBytes because timers are not yet supported. crypto.randomBytes(0, () => { }); diff --git a/test/parallel/test-child-process-stdout-flush-exit.js b/test/parallel/test-child-process-stdout-flush-exit.js index 9db74b51ce5864..682d382b9a1034 100644 --- a/test/parallel/test-child-process-stdout-flush-exit.js +++ b/test/parallel/test-child-process-stdout-flush-exit.js @@ -21,8 +21,7 @@ if (process.argv[2] === 'child') { child.stderr.setEncoding('utf8'); child.stderr.on('data', function(data) { - console.log('parent stderr: ' + data); - assert.ok(false); + common.fail(`Unexpected parent stderr: ${data}`); }); // check if we receive both 'hello' at start and 'goodbye' at end diff --git a/test/parallel/test-domain-uncaught-exception.js b/test/parallel/test-domain-uncaught-exception.js index 58df4ac59a7818..b13bf79b1a034b 100644 --- a/test/parallel/test-domain-uncaught-exception.js +++ b/test/parallel/test-domain-uncaught-exception.js @@ -9,7 +9,6 @@ */ const common = require('../common'); -const assert = require('assert'); const domain = require('domain'); const child_process = require('child_process'); @@ -184,17 +183,16 @@ if (process.argv[2] === 'child') { test.expectedMessages.forEach(function(expectedMessage) { if (test.messagesReceived === undefined || test.messagesReceived.indexOf(expectedMessage) === -1) - assert(false, 'test ' + test.fn.name + - ' should have sent message: ' + expectedMessage + - ' but didn\'t'); + common.fail('test ' + test.fn.name + ' should have sent message: ' + + expectedMessage + ' but didn\'t'); }); if (test.messagesReceived) { test.messagesReceived.forEach(function(receivedMessage) { if (test.expectedMessages.indexOf(receivedMessage) === -1) { - assert(false, 'test ' + test.fn.name + - ' should not have sent message: ' + receivedMessage + - ' but did'); + common.fail('test ' + test.fn.name + + ' should not have sent message: ' + receivedMessage + + ' but did'); } }); } diff --git a/test/parallel/test-http-conn-reset.js b/test/parallel/test-http-conn-reset.js index ae04c41aff5181..161e0e5c2bc830 100644 --- a/test/parallel/test-http-conn-reset.js +++ b/test/parallel/test-http-conn-reset.js @@ -19,9 +19,7 @@ server.listen(0, options.host, common.mustCall(onListen)); // do a GET request, expect it to fail function onListen() { options.port = this.address().port; - const req = http.request(options, function(res) { - assert.ok(false, 'this should never run'); - }); + const req = http.request(options, common.fail); req.on('error', common.mustCall(function(err) { assert.strictEqual(err.code, 'ECONNRESET'); })); diff --git a/test/parallel/test-http-double-content-length.js b/test/parallel/test-http-double-content-length.js index fdc79fb74ec5c2..0427d8edb8ae38 100644 --- a/test/parallel/test-http-double-content-length.js +++ b/test/parallel/test-http-double-content-length.js @@ -7,10 +7,7 @@ const assert = require('assert'); // The callback should never be invoked because the server // should respond with a 400 Client Error when a double // Content-Length header is received. -const server = http.createServer((req, res) => { - assert(false, 'callback should not have been invoked'); - res.end(); -}); +const server = http.createServer(common.fail); server.on('clientError', common.mustCall((err, socket) => { assert(/^Parse Error/.test(err.message)); assert.strictEqual(err.code, 'HPE_UNEXPECTED_CONTENT_LENGTH'); diff --git a/test/parallel/test-http-parser.js b/test/parallel/test-http-parser.js index de7302e60d91ba..ba987876e63142 100644 --- a/test/parallel/test-http-parser.js +++ b/test/parallel/test-http-parser.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +const common = require('../common'); const assert = require('assert'); const binding = process.binding('http_parser'); @@ -35,9 +35,7 @@ function newParser(type) { parser[kOnHeadersComplete] = function(info) { }; - parser[kOnBody] = function(b, start, len) { - assert.ok(false, 'Function should not be called.'); - }; + parser[kOnBody] = common.fail; parser[kOnMessageComplete] = function() { }; diff --git a/test/parallel/test-http-response-multi-content-length.js b/test/parallel/test-http-response-multi-content-length.js index f3dce208756f74..5d53f7dcd5c621 100644 --- a/test/parallel/test-http-response-multi-content-length.js +++ b/test/parallel/test-http-response-multi-content-length.js @@ -35,7 +35,7 @@ server.listen(0, common.mustCall(() => { http.get( {port: server.address().port, headers: {'x-num': n}}, (res) => { - assert(false, 'client allowed multiple content-length headers.'); + common.fail('client allowed multiple content-length headers.'); } ).on('error', common.mustCall((err) => { assert(/^Parse Error/.test(err.message)); diff --git a/test/parallel/test-net-error-twice.js b/test/parallel/test-net-error-twice.js index 3c25d1c98ed346..79c85631594d4a 100644 --- a/test/parallel/test-net-error-twice.js +++ b/test/parallel/test-net-error-twice.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +const common = require('../common'); const assert = require('assert'); const net = require('net'); @@ -20,7 +20,7 @@ const srv = net.createServer(function onConnection(conn) { conn.on('error', function(err) { errs.push(err); if (errs.length > 1 && errs[0] === errs[1]) - assert(false, 'We should not be emitting the same error twice'); + common.fail('Should not emit the same error twice'); }); conn.on('close', function() { srv.unref(); diff --git a/test/parallel/test-net-reconnect-error.js b/test/parallel/test-net-reconnect-error.js index 4e1e3d14984e80..e5e2124434cc89 100644 --- a/test/parallel/test-net-reconnect-error.js +++ b/test/parallel/test-net-reconnect-error.js @@ -10,8 +10,7 @@ let disconnect_count = 0; const c = net.createConnection(common.PORT); c.on('connect', function() { - console.error('CLIENT connected'); - assert.ok(false); + common.fail('client should not have connected'); }); c.on('error', function(e) { diff --git a/test/parallel/test-stream-writev.js b/test/parallel/test-stream-writev.js index 2caaf0a7d236c1..c62488c9e7650a 100644 --- a/test/parallel/test-stream-writev.js +++ b/test/parallel/test-stream-writev.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +const common = require('../common'); const assert = require('assert'); const stream = require('stream'); @@ -39,7 +39,7 @@ function test(decode, uncork, multi, next) { const w = new stream.Writable({ decodeStrings: decode }); w._write = function(chunk, e, cb) { - assert(false, 'Should not call _write'); + common.fail('Should not call _write'); }; const expectChunks = decode ? [ diff --git a/test/parallel/test-tls-client-abort.js b/test/parallel/test-tls-client-abort.js index 21ee41e927873b..fcf1d92e3257d5 100644 --- a/test/parallel/test-tls-client-abort.js +++ b/test/parallel/test-tls-client-abort.js @@ -14,9 +14,7 @@ const path = require('path'); const cert = fs.readFileSync(path.join(common.fixturesDir, 'test_cert.pem')); const key = fs.readFileSync(path.join(common.fixturesDir, 'test_key.pem')); -const conn = tls.connect({cert: cert, key: key, port: common.PORT}, function() { - assert.ok(false); // callback should never be executed -}); +const conn = tls.connect({cert, key, port: common.PORT}, common.fail); conn.on('error', function() { }); assert.doesNotThrow(function() { diff --git a/test/parallel/test-tls-close-error.js b/test/parallel/test-tls-close-error.js index 6172be813e97ce..91017cdce0667f 100644 --- a/test/parallel/test-tls-close-error.js +++ b/test/parallel/test-tls-close-error.js @@ -16,9 +16,7 @@ const server = tls.createServer({ cert: fs.readFileSync(common.fixturesDir + '/keys/agent1-cert.pem') }, function(c) { }).listen(0, common.mustCall(function() { - const c = tls.connect(this.address().port, function() { - assert(false, 'should not be called'); - }); + const c = tls.connect(this.address().port, common.fail); c.on('error', common.mustCall(function(err) {})); diff --git a/test/parallel/test-tls-connect.js b/test/parallel/test-tls-connect.js index 082e2e48a9dcc0..abaa1ae3346da5 100644 --- a/test/parallel/test-tls-connect.js +++ b/test/parallel/test-tls-connect.js @@ -1,6 +1,5 @@ 'use strict'; const common = require('../common'); -const assert = require('assert'); if (!common.hasCrypto) { common.skip('missing crypto'); @@ -33,9 +32,7 @@ const path = require('path'); key: key, port: common.PORT, ciphers: 'rick-128-roll' - }, function() { - assert.ok(false); // callback should never be executed - }); + }, common.fail); conn.on('error', common.mustCall(function() {})); } diff --git a/test/parallel/test-tls-handshake-error.js b/test/parallel/test-tls-handshake-error.js index 4909fa45e160fb..2feb126669cc88 100644 --- a/test/parallel/test-tls-handshake-error.js +++ b/test/parallel/test-tls-handshake-error.js @@ -20,9 +20,7 @@ const server = tls.createServer({ const c = tls.connect({ port: this.address().port, ciphers: 'RC4' - }, function() { - assert(false, 'should not be called'); - }); + }, common.fail); c.on('error', common.mustCall(function(err) { assert.notStrictEqual(err.code, 'ECONNRESET'); diff --git a/test/parallel/test-vm-syntax-error-message.js b/test/parallel/test-vm-syntax-error-message.js index c0a00d06aa54f8..90f2b8c013406e 100644 --- a/test/parallel/test-vm-syntax-error-message.js +++ b/test/parallel/test-vm-syntax-error-message.js @@ -1,5 +1,5 @@ 'use strict'; -require('../common'); +const common = require('../common'); const assert = require('assert'); const child_process = require('child_process'); @@ -12,7 +12,7 @@ const p = child_process.spawn(process.execPath, [ ]); p.stderr.on('data', function(data) { - assert(false, 'Unexpected stderr data: ' + data); + common.fail(`Unexpected stderr data: ${data}`); }); let output = ''; diff --git a/test/parallel/test-whatwg-url-searchparams-foreach.js b/test/parallel/test-whatwg-url-searchparams-foreach.js index 199d01b8fdfbcc..7e6b6222a8f101 100644 --- a/test/parallel/test-whatwg-url-searchparams-foreach.js +++ b/test/parallel/test-whatwg-url-searchparams-foreach.js @@ -1,6 +1,6 @@ 'use strict'; -require('../common'); +const common = require('../common'); const assert = require('assert'); const url = require('url'); const URL = url.URL; @@ -35,5 +35,5 @@ assert.deepStrictEqual(c[2], ['z', '3']); a = new URL('http://a.b/c'); b = a.searchParams; for (i of b) { - assert(false, 'should not be reached'); + common.fail('should not be reached'); } diff --git a/test/pummel/test-fs-watch-file.js b/test/pummel/test-fs-watch-file.js index 3fda41040486df..913f97737c8a54 100644 --- a/test/pummel/test-fs-watch-file.js +++ b/test/pummel/test-fs-watch-file.js @@ -93,16 +93,13 @@ setTimeout(function() { assert.doesNotThrow( function() { - function a() { - assert.ok(0); // should not run - } function b() { fs.unwatchFile(filenameThree, b); ++watchSeenThree; } - fs.watchFile(filenameThree, a); + fs.watchFile(filenameThree, common.fail); fs.watchFile(filenameThree, b); - fs.unwatchFile(filenameThree, a); + fs.unwatchFile(filenameThree, common.fail); } );