Skip to content

Commit d4b19cf

Browse files
Gabriel SchulhofMylesBorins
Gabriel Schulhof
authored andcommitted
test,n-api: re-write test_error in C
PR-URL: #20244 Reviewed-By: Daniel Bevenius <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Tiancheng "Timothy" Gu <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]>
1 parent 3bf736e commit d4b19cf

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

test/addons-napi/test_error/binding.gyp

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"targets": [
33
{
44
"target_name": "test_error",
5-
"sources": [ "test_error.cc" ]
5+
"sources": [ "test_error.c" ]
66
}
77
]
88
}

test/addons-napi/test_error/test_error.cc test/addons-napi/test_error/test_error.c

+15-15
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
napi_value checkError(napi_env env, napi_callback_info info) {
55
size_t argc = 1;
66
napi_value args[1];
7-
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, nullptr, nullptr));
7+
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
88

99
bool r;
1010
NAPI_CALL(env, napi_is_error(env, args[0], &r));
@@ -20,43 +20,43 @@ napi_value throwExistingError(napi_env env, napi_callback_info info) {
2020
napi_value error;
2121
NAPI_CALL(env, napi_create_string_utf8(
2222
env, "existing error", NAPI_AUTO_LENGTH, &message));
23-
NAPI_CALL(env, napi_create_error(env, nullptr, message, &error));
23+
NAPI_CALL(env, napi_create_error(env, NULL, message, &error));
2424
NAPI_CALL(env, napi_throw(env, error));
25-
return nullptr;
25+
return NULL;
2626
}
2727

2828
napi_value throwError(napi_env env, napi_callback_info info) {
29-
NAPI_CALL(env, napi_throw_error(env, nullptr, "error"));
30-
return nullptr;
29+
NAPI_CALL(env, napi_throw_error(env, NULL, "error"));
30+
return NULL;
3131
}
3232

3333
napi_value throwRangeError(napi_env env, napi_callback_info info) {
34-
NAPI_CALL(env, napi_throw_range_error(env, nullptr, "range error"));
35-
return nullptr;
34+
NAPI_CALL(env, napi_throw_range_error(env, NULL, "range error"));
35+
return NULL;
3636
}
3737

3838
napi_value throwTypeError(napi_env env, napi_callback_info info) {
39-
NAPI_CALL(env, napi_throw_type_error(env, nullptr, "type error"));
40-
return nullptr;
39+
NAPI_CALL(env, napi_throw_type_error(env, NULL, "type error"));
40+
return NULL;
4141
}
4242

4343
napi_value throwErrorCode(napi_env env, napi_callback_info info) {
4444
NAPI_CALL(env, napi_throw_error(env, "ERR_TEST_CODE", "Error [error]"));
45-
return nullptr;
45+
return NULL;
4646
}
4747

4848
napi_value throwRangeErrorCode(napi_env env, napi_callback_info info) {
4949
NAPI_CALL(env, napi_throw_range_error(env,
5050
"ERR_TEST_CODE",
5151
"RangeError [range error]"));
52-
return nullptr;
52+
return NULL;
5353
}
5454

5555
napi_value throwTypeErrorCode(napi_env env, napi_callback_info info) {
5656
NAPI_CALL(env, napi_throw_type_error(env,
5757
"ERR_TEST_CODE",
5858
"TypeError [type error]"));
59-
return nullptr;
59+
return NULL;
6060
}
6161

6262

@@ -65,7 +65,7 @@ napi_value createError(napi_env env, napi_callback_info info) {
6565
napi_value message;
6666
NAPI_CALL(env, napi_create_string_utf8(
6767
env, "error", NAPI_AUTO_LENGTH, &message));
68-
NAPI_CALL(env, napi_create_error(env, nullptr, message, &result));
68+
NAPI_CALL(env, napi_create_error(env, NULL, message, &result));
6969
return result;
7070
}
7171

@@ -74,7 +74,7 @@ napi_value createRangeError(napi_env env, napi_callback_info info) {
7474
napi_value message;
7575
NAPI_CALL(env, napi_create_string_utf8(
7676
env, "range error", NAPI_AUTO_LENGTH, &message));
77-
NAPI_CALL(env, napi_create_range_error(env, nullptr, message, &result));
77+
NAPI_CALL(env, napi_create_range_error(env, NULL, message, &result));
7878
return result;
7979
}
8080

@@ -83,7 +83,7 @@ napi_value createTypeError(napi_env env, napi_callback_info info) {
8383
napi_value message;
8484
NAPI_CALL(env, napi_create_string_utf8(
8585
env, "type error", NAPI_AUTO_LENGTH, &message));
86-
NAPI_CALL(env, napi_create_type_error(env, nullptr, message, &result));
86+
NAPI_CALL(env, napi_create_type_error(env, NULL, message, &result));
8787
return result;
8888
}
8989

0 commit comments

Comments
 (0)