Skip to content

Commit 48a634e

Browse files
Gabriel Schulhofdanielleadams
Gabriel Schulhof
authored andcommittedFeb 16, 2021
test: rename n-api to node-api
This renames the macros used in the tests from `NAPI_*` to `NODE_API_*`. PR-URL: #37217 Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Beth Griggs <[email protected]> Reviewed-By: Rich Trott <[email protected]>
1 parent 3e2746f commit 48a634e

File tree

52 files changed

+1374
-1451
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1374
-1451
lines changed
 

‎test/js-native-api/2_function_arguments/binding.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,35 @@
44
static napi_value Add(napi_env env, napi_callback_info info) {
55
size_t argc = 2;
66
napi_value args[2];
7-
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
7+
NODE_API_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
88

9-
NAPI_ASSERT(env, argc >= 2, "Wrong number of arguments");
9+
NODE_API_ASSERT(env, argc >= 2, "Wrong number of arguments");
1010

1111
napi_valuetype valuetype0;
12-
NAPI_CALL(env, napi_typeof(env, args[0], &valuetype0));
12+
NODE_API_CALL(env, napi_typeof(env, args[0], &valuetype0));
1313

1414
napi_valuetype valuetype1;
15-
NAPI_CALL(env, napi_typeof(env, args[1], &valuetype1));
15+
NODE_API_CALL(env, napi_typeof(env, args[1], &valuetype1));
1616

17-
NAPI_ASSERT(env, valuetype0 == napi_number && valuetype1 == napi_number,
17+
NODE_API_ASSERT(env, valuetype0 == napi_number && valuetype1 == napi_number,
1818
"Wrong argument type. Numbers expected.");
1919

2020
double value0;
21-
NAPI_CALL(env, napi_get_value_double(env, args[0], &value0));
21+
NODE_API_CALL(env, napi_get_value_double(env, args[0], &value0));
2222

2323
double value1;
24-
NAPI_CALL(env, napi_get_value_double(env, args[1], &value1));
24+
NODE_API_CALL(env, napi_get_value_double(env, args[1], &value1));
2525

2626
napi_value sum;
27-
NAPI_CALL(env, napi_create_double(env, value0 + value1, &sum));
27+
NODE_API_CALL(env, napi_create_double(env, value0 + value1, &sum));
2828

2929
return sum;
3030
}
3131

3232
EXTERN_C_START
3333
napi_value Init(napi_env env, napi_value exports) {
34-
napi_property_descriptor desc = DECLARE_NAPI_PROPERTY("add", Add);
35-
NAPI_CALL(env, napi_define_properties(env, exports, 1, &desc));
34+
napi_property_descriptor desc = DECLARE_NODE_API_PROPERTY("add", Add);
35+
NODE_API_CALL(env, napi_define_properties(env, exports, 1, &desc));
3636
return exports;
3737
}
3838
EXTERN_C_END

‎test/js-native-api/3_callbacks/binding.c

+14-14
Original file line numberDiff line numberDiff line change
@@ -5,53 +5,53 @@
55
static napi_value RunCallback(napi_env env, napi_callback_info info) {
66
size_t argc = 2;
77
napi_value args[2];
8-
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
8+
NODE_API_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
99

10-
NAPI_ASSERT(env, argc == 1,
10+
NODE_API_ASSERT(env, argc == 1,
1111
"Wrong number of arguments. Expects a single argument.");
1212

1313
napi_valuetype valuetype0;
14-
NAPI_CALL(env, napi_typeof(env, args[0], &valuetype0));
15-
NAPI_ASSERT(env, valuetype0 == napi_function,
14+
NODE_API_CALL(env, napi_typeof(env, args[0], &valuetype0));
15+
NODE_API_ASSERT(env, valuetype0 == napi_function,
1616
"Wrong type of arguments. Expects a function as first argument.");
1717

1818
napi_valuetype valuetype1;
19-
NAPI_CALL(env, napi_typeof(env, args[1], &valuetype1));
20-
NAPI_ASSERT(env, valuetype1 == napi_undefined,
19+
NODE_API_CALL(env, napi_typeof(env, args[1], &valuetype1));
20+
NODE_API_ASSERT(env, valuetype1 == napi_undefined,
2121
"Additional arguments should be undefined.");
2222

2323
napi_value argv[1];
2424
const char* str = "hello world";
2525
size_t str_len = strlen(str);
26-
NAPI_CALL(env, napi_create_string_utf8(env, str, str_len, argv));
26+
NODE_API_CALL(env, napi_create_string_utf8(env, str, str_len, argv));
2727

2828
napi_value global;
29-
NAPI_CALL(env, napi_get_global(env, &global));
29+
NODE_API_CALL(env, napi_get_global(env, &global));
3030

3131
napi_value cb = args[0];
32-
NAPI_CALL(env, napi_call_function(env, global, cb, 1, argv, NULL));
32+
NODE_API_CALL(env, napi_call_function(env, global, cb, 1, argv, NULL));
3333

3434
return NULL;
3535
}
3636

3737
static napi_value RunCallbackWithRecv(napi_env env, napi_callback_info info) {
3838
size_t argc = 2;
3939
napi_value args[2];
40-
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
40+
NODE_API_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
4141

4242
napi_value cb = args[0];
4343
napi_value recv = args[1];
44-
NAPI_CALL(env, napi_call_function(env, recv, cb, 0, NULL, NULL));
44+
NODE_API_CALL(env, napi_call_function(env, recv, cb, 0, NULL, NULL));
4545
return NULL;
4646
}
4747

4848
EXTERN_C_START
4949
napi_value Init(napi_env env, napi_value exports) {
5050
napi_property_descriptor desc[2] = {
51-
DECLARE_NAPI_PROPERTY("RunCallback", RunCallback),
52-
DECLARE_NAPI_PROPERTY("RunCallbackWithRecv", RunCallbackWithRecv),
51+
DECLARE_NODE_API_PROPERTY("RunCallback", RunCallback),
52+
DECLARE_NODE_API_PROPERTY("RunCallbackWithRecv", RunCallbackWithRecv),
5353
};
54-
NAPI_CALL(env, napi_define_properties(env, exports, 2, desc));
54+
NODE_API_CALL(env, napi_define_properties(env, exports, 2, desc));
5555
return exports;
5656
}
5757
EXTERN_C_END

0 commit comments

Comments
 (0)
Please sign in to comment.