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

test,n-api: re-write test_error in C

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/20244
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
This commit is contained in:
Gabriel Schulhof 2018-04-23 22:31:20 -04:00
parent a3231d94bd
commit e991bf7a29
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/addons-napi/test_error/binding.gyp
View File

@ -2,7 +2,7 @@
"targets": [ "targets": [
{ {
"target_name": "test_error", "target_name": "test_error",
"sources": [ "test_error.cc" ] "sources": [ "test_error.c" ]
} }
] ]
} }

30
test/addons-napi/test_error/test_error.cc → test/addons-napi/test_error/test_error.c
View File

@ -4,7 +4,7 @@
napi_value checkError(napi_env env, napi_callback_info info) { napi_value checkError(napi_env env, napi_callback_info info) {
size_t argc = 1; size_t argc = 1;
napi_value args[1]; napi_value args[1];
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, nullptr, nullptr)); NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
bool r; bool r;
NAPI_CALL(env, napi_is_error(env, args[0], &r)); NAPI_CALL(env, napi_is_error(env, args[0], &r));
@ -20,43 +20,43 @@ napi_value throwExistingError(napi_env env, napi_callback_info info) {
napi_value error; napi_value error;
NAPI_CALL(env, napi_create_string_utf8( NAPI_CALL(env, napi_create_string_utf8(
env, "existing error", NAPI_AUTO_LENGTH, &message)); env, "existing error", NAPI_AUTO_LENGTH, &message));
NAPI_CALL(env, napi_create_error(env, nullptr, message, &error)); NAPI_CALL(env, napi_create_error(env, NULL, message, &error));
NAPI_CALL(env, napi_throw(env, error)); NAPI_CALL(env, napi_throw(env, error));
return nullptr; return NULL;
} }
napi_value throwError(napi_env env, napi_callback_info info) { napi_value throwError(napi_env env, napi_callback_info info) {
NAPI_CALL(env, napi_throw_error(env, nullptr, "error")); NAPI_CALL(env, napi_throw_error(env, NULL, "error"));
return nullptr; return NULL;
} }
napi_value throwRangeError(napi_env env, napi_callback_info info) { napi_value throwRangeError(napi_env env, napi_callback_info info) {
NAPI_CALL(env, napi_throw_range_error(env, nullptr, "range error")); NAPI_CALL(env, napi_throw_range_error(env, NULL, "range error"));
return nullptr; return NULL;
} }
napi_value throwTypeError(napi_env env, napi_callback_info info) { napi_value throwTypeError(napi_env env, napi_callback_info info) {
NAPI_CALL(env, napi_throw_type_error(env, nullptr, "type error")); NAPI_CALL(env, napi_throw_type_error(env, NULL, "type error"));
return nullptr; return NULL;
} }
napi_value throwErrorCode(napi_env env, napi_callback_info info) { napi_value throwErrorCode(napi_env env, napi_callback_info info) {
NAPI_CALL(env, napi_throw_error(env, "ERR_TEST_CODE", "Error [error]")); NAPI_CALL(env, napi_throw_error(env, "ERR_TEST_CODE", "Error [error]"));
return nullptr; return NULL;
} }
napi_value throwRangeErrorCode(napi_env env, napi_callback_info info) { napi_value throwRangeErrorCode(napi_env env, napi_callback_info info) {
NAPI_CALL(env, napi_throw_range_error(env, NAPI_CALL(env, napi_throw_range_error(env,
"ERR_TEST_CODE", "ERR_TEST_CODE",
"RangeError [range error]")); "RangeError [range error]"));
return nullptr; return NULL;
} }
napi_value throwTypeErrorCode(napi_env env, napi_callback_info info) { napi_value throwTypeErrorCode(napi_env env, napi_callback_info info) {
NAPI_CALL(env, napi_throw_type_error(env, NAPI_CALL(env, napi_throw_type_error(env,
"ERR_TEST_CODE", "ERR_TEST_CODE",
"TypeError [type error]")); "TypeError [type error]"));
return nullptr; return NULL;
} }
@ -65,7 +65,7 @@ napi_value createError(napi_env env, napi_callback_info info) {
napi_value message; napi_value message;
NAPI_CALL(env, napi_create_string_utf8( NAPI_CALL(env, napi_create_string_utf8(
env, "error", NAPI_AUTO_LENGTH, &message)); env, "error", NAPI_AUTO_LENGTH, &message));
NAPI_CALL(env, napi_create_error(env, nullptr, message, &result)); NAPI_CALL(env, napi_create_error(env, NULL, message, &result));
return result; return result;
} }
@ -74,7 +74,7 @@ napi_value createRangeError(napi_env env, napi_callback_info info) {
napi_value message; napi_value message;
NAPI_CALL(env, napi_create_string_utf8( NAPI_CALL(env, napi_create_string_utf8(
env, "range error", NAPI_AUTO_LENGTH, &message)); env, "range error", NAPI_AUTO_LENGTH, &message));
NAPI_CALL(env, napi_create_range_error(env, nullptr, message, &result)); NAPI_CALL(env, napi_create_range_error(env, NULL, message, &result));
return result; return result;
} }
@ -83,7 +83,7 @@ napi_value createTypeError(napi_env env, napi_callback_info info) {
napi_value message; napi_value message;
NAPI_CALL(env, napi_create_string_utf8( NAPI_CALL(env, napi_create_string_utf8(
env, "type error", NAPI_AUTO_LENGTH, &message)); env, "type error", NAPI_AUTO_LENGTH, &message));
NAPI_CALL(env, napi_create_type_error(env, nullptr, message, &result)); NAPI_CALL(env, napi_create_type_error(env, NULL, message, &result));
return result; return result;
} }