1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: refactor addons-napi/test_exception/test.js

Browse Source 
* provide block scoping to prevent unintended side effects
* remove confusing and unnecessary assertion message
* use consisitent `actual, expected` argument order for assertions

PR-URL: https://github.com/nodejs/node/pull/18340
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
Reviewed-By: James M Snell <jasnell@gmail.com>
This commit is contained in:
Rich Trott 2018-01-23 22:18:38 -08:00
parent 1ecd2be2e6
commit 6c1906ab3e
1 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/addons-napi/test_exception/test.js
View File

@ -4,10 +4,9 @@ const common = require('../../common');
const test_exception = require(`./build/${common.buildType}/test_exception`); const test_exception = require(`./build/${common.buildType}/test_exception`);
const assert = require('assert'); const assert = require('assert');
const theError = new Error('Some error'); const theError = new Error('Some error');
function throwTheError() {
throw theError; {
} const throwTheError = () => { throw theError; };
let caughtError;
// Test that the native side successfully captures the exception // Test that the native side successfully captures the exception
let returnedError = test_exception.returnException(throwTheError); let returnedError = test_exception.returnException(throwTheError);
@ -15,13 +14,8 @@ assert.strictEqual(theError, returnedError);
// Test that the native side passes the exception through // Test that the native side passes the exception through
assert.throws( assert.throws(
() => { () => { test_exception.allowException(throwTheError); },
test_exception.allowException(throwTheError); (err) => err === theError
},
function(err) {
return err === theError;
},
'Thrown exception was allowed to pass through unhindered'
); );
// Test that the exception thrown above was marked as pending // Test that the exception thrown above was marked as pending
@ -32,17 +26,20 @@ assert.strictEqual(test_exception.wasPending(), true,
// Test that the native side does not capture a non-existing exception // Test that the native side does not capture a non-existing exception
returnedError = test_exception.returnException(common.mustCall()); returnedError = test_exception.returnException(common.mustCall());
assert.strictEqual(undefined, returnedError, assert.strictEqual(returnedError, undefined,
'Returned error should be undefined when no exception is' + 'Returned error should be undefined when no exception is' +
` thrown, but ${returnedError} was passed`); ` thrown, but ${returnedError} was passed`);
}
{
// Test that no exception appears that was not thrown by us // Test that no exception appears that was not thrown by us
let caughtError;
try { try {
test_exception.allowException(common.mustCall()); test_exception.allowException(common.mustCall());
} catch (anError) { } catch (anError) {
caughtError = anError; caughtError = anError;
} }
assert.strictEqual(undefined, caughtError, assert.strictEqual(caughtError, undefined,
'No exception originated on the native side, but' + 'No exception originated on the native side, but' +
` ${caughtError} was passed`); ` ${caughtError} was passed`);
@ -50,3 +47,4 @@ assert.strictEqual(undefined, caughtError,
assert.strictEqual(test_exception.wasPending(), false, assert.strictEqual(test_exception.wasPending(), false,
'VM was not marked as having an exception pending' + 'VM was not marked as having an exception pending' +
' when none was allowed through'); ' when none was allowed through');
}