8000 test: consolidate n-api test addons · nodejs/node@06cf948 · GitHub
[go: up one dir, main page]
Skip to content

Commit 06cf948

Browse files
mhdawsonMylesBorins
mhdawson
authored and
MylesBorins
committed
test: consolidate n-api test addons
It takes time to build each of the addons used to test n-api. Consolidate a few of the smaller ones to save build time. Backport-PR-URL: #19447 PR-URL: #13317 Reviewed-By: Jason Ginchereau <jasongin@microsoft.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
1 parent 919556f commit 06cf948

File tree

7 files changed

+31
-72
lines changed

7 files changed

+31
-72
lines changed

test/addons-napi/test_globals/test.js renamed to test/addons-napi/test_general/testGlobals.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
const common = require('../../common');
33
const assert = require('assert');
44

5-
const test_globals = require(`./build/${common.buildType}/test_globals`);
5+
const test_globals = require(`./build/${common.buildType}/test_general`);
66

77
assert.strictEqual(test_globals.getUndefined(), undefined);
88
assert.strictEqual(test_globals.getNull(), null);

test/addons-napi/test_instanceof/test.js renamed to test/addons-napi/test_general/testInstanceOf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const assert = require('assert');
66

77
// addon is referenced through the eval expression in testFile
88
// eslint-disable-next-line no-unused-vars
9-
const addon = require(`./build/${common.buildType}/test_instanceof`);
9+
const addon = require(`./build/${common.buildType}/test_general`);
1010
const path = require('path');
1111

1212
// The following assert functions are referenced by v8's unit tests

‎test/addons-napi/test_general/test_general.c‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,40 @@ napi_value testGetVersion(napi_env env, napi_callback_info info) {
3333
return result;
3434
}
3535

36+
napi_value doInstanceOf(napi_env env, napi_callback_info info) {
37+
size_t argc = 2;
38+
napi_value args[2];
39+
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
40+
41+
bool instanceof;
42+
NAPI_CALL(env, napi_instanceof(env, args[0], args[1], &instanceof));
43+
44+
napi_value result;
45+
NAPI_CALL(env, napi_get_boolean(env, instanceof, &result));
46+
47+
return result;
48+
}
49+
50+
napi_value getNull(napi_env env, napi_callback_info info) {
51+
napi_value result;
52+
NAPI_CALL(env, napi_get_null(env, &result));
53+
return result;
54+
}
55+
56+
napi_value getUndefined(napi_env env, napi_callback_info info) {
57+
napi_value result;
58+
NAPI_CALL(env, napi_get_undefined(env, &result));
59+
return result;
60+
}
61+
3662
void Init(napi_env env, napi_value exports, napi_value module, void* priv) {
3763
napi_property_descriptor descriptors[] = {
3864
DECLARE_NAPI_PROPERTY("testStrictEquals", testStrictEquals),
3965
DECLARE_NAPI_PROPERTY("testGetPrototype", testGetPrototype),
4066
DECLARE_NAPI_PROPERTY("testGetVersion", testGetVersion),
67+
DECLARE_NAPI_PROPERTY("doInstanceOf", doInstanceOf),
68+
DECLARE_NAPI_PROPERTY("getUndefined", getUndefined),
69+
DECLARE_NAPI_PROPERTY("getNull", getNull),
4170
};
4271

4372
NAPI_CALL_RETURN_VOID(env, napi_define_properties(

‎test/addons-napi/test_globals/binding.gyp‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎test/addons-napi/test_globals/test_globals.c‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎test/addons-napi/test_instanceof/binding.gyp‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎test/addons-napi/test_instanceof/test_instanceof.c‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)
0