Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: improve n-api array func coverage #12890

Closed
wants to merge 3 commits into from
Closed
Changes from 2 commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -19,19 +19,30 @@ const array = [
]
];

assert.strictEqual(test_array.Test(array, array.length + 1),
'Index out of bound!');
assert.throws(
() => {

This comment has been minimized.

Copy link
@cjihrig

cjihrig May 9, 2017

Contributor

Does this arrow function fit on a single line?

This comment has been minimized.

Copy link
@mhdawson

mhdawson May 9, 2017

Author Member

I was keeping it consistent with what I saw most often in tests. For example: test/parallel/test-punycode.js.

test_array.TestGetElement(array, array.length + 1);
},
/Index out of bounds!/

This comment has been minimized.

Copy link
@cjihrig

cjihrig May 9, 2017

Contributor

Are you able to make this more strict? We've been moving toward adding ^, $, and the error type to the regular expression.

This comment has been minimized.

Copy link
@mhdawson

mhdawson May 9, 2017

Author Member

Oops missed that one, will add.

This comment has been minimized.

Copy link
@mhdawson

mhdawson May 9, 2017

Author Member

Also fixed up the other instance which was there from the existing version of the test.

);

assert.throws(
() => {
test_array.Test(array, -2);
test_array.TestGetElement(array, -2);
},
/Invalid index\. Expects a positive integer\./
);

array.forEach(function(element, index) {
assert.strictEqual(test_array.Test(array, index), element);
assert.strictEqual(test_array.TestGetElement(array, index), element);
});


assert.deepStrictEqual(test_array.New(array), array);

assert(test_array.TestHasElement(array, 0));
assert.strictEqual(false, test_array.TestHasElement(array, array.length + 1));

This comment has been minimized.

Copy link
@cjihrig

cjihrig May 9, 2017

Contributor

Can you switch the argument order to strictEqual().

This comment has been minimized.

Copy link
@mhdawson

mhdawson May 9, 2017

Author Member

will do.


assert(test_array.NewWithLength(0) instanceof Array);
assert(test_array.NewWithLength(1) instanceof Array);
assert(test_array.NewWithLength(2 ^ 32 - 1) instanceof Array);

This comment has been minimized.

Copy link
@cjihrig

cjihrig May 9, 2017

Contributor

Are you attempting to do exponentiation here?

This comment has been minimized.

Copy link
@jasnell

jasnell May 9, 2017

Member

This would need to be (2 ** 32 - 1)

This comment has been minimized.

Copy link
@mhdawson

mhdawson May 9, 2017

Author Member

hmm, maybe coding at 2am in your hotel room is not always the best idea. Will fix.

@@ -2,7 +2,7 @@
#include <string.h>
#include "../common.h"

napi_value Test(napi_env env, napi_callback_info info) {
napi_value TestGetElement(napi_env env, napi_callback_info info) {
size_t argc = 2;
napi_value args[2];
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));
@@ -37,17 +37,49 @@ napi_value Test(napi_env env, napi_callback_info info) {
uint32_t length;
NAPI_CALL(env, napi_get_array_length(env, array, &length));

if ((uint32_t)index >= length) {
napi_value str;
const char* str_val = "Index out of bound!";
size_t str_len = strlen(str_val);
NAPI_CALL(env, napi_create_string_utf8(env, str_val, str_len, &str));
NAPI_ASSERT(env, ((uint32_t)index < length), "Index out of bounds!");

return str;
napi_value ret;
NAPI_CALL(env, napi_get_element(env, array, index, &ret));

return ret;
}

napi_value TestHasElement(napi_env env, napi_callback_info info) {
size_t argc = 2;
napi_value args[2];
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));

NAPI_ASSERT(env, argc >= 2, "Wrong number of arguments");

napi_valuetype valuetype0;
NAPI_CALL(env, napi_typeof(env, args[0], &valuetype0));

NAPI_ASSERT(env, valuetype0 == napi_object,
"Wrong type of arguments. Expects an array as first argument.");

napi_valuetype valuetype1;
NAPI_CALL(env, napi_typeof(env, args[1], &valuetype1));

NAPI_ASSERT(env, valuetype1 == napi_number,
"Wrong type of arguments. Expects an integer as second argument.");

napi_value array = args[0];
int32_t index;
NAPI_CALL(env, napi_get_value_int32(env, args[1], &index));

bool isarray;
NAPI_CALL(env, napi_is_array(env, array, &isarray));

if (!isarray) {
return NULL;
}

bool has_element;
NAPI_CALL(env, napi_has_element(env, array, index, &has_element));

napi_value ret;
NAPI_CALL(env, napi_get_element(env, array, index, &ret));
NAPI_CALL(env, napi_get_boolean(env, has_element, &ret));

return ret;
}
@@ -80,10 +112,34 @@ napi_value New(napi_env env, napi_callback_info info) {
return ret;
}

napi_value NewWithLength(napi_env env, napi_callback_info info) {
size_t argc = 1;
napi_value args[1];
NAPI_CALL(env, napi_get_cb_info(env, info, &argc, args, NULL, NULL));

NAPI_ASSERT(env, argc >= 1, "Wrong number of arguments");

napi_valuetype valuetype0;
NAPI_CALL(env, napi_typeof(env, args[0], &valuetype0));

NAPI_ASSERT(env, valuetype0 == napi_number,
"Wrong type of arguments. Expects an integer the first argument.");

int32_t array_length;
NAPI_CALL(env, napi_get_value_int32(env, args[0], &array_length));

napi_value ret;
NAPI_CALL(env, napi_create_array_with_length(env, array_length, &ret));

return ret;
}

void Init(napi_env env, napi_value exports, napi_value module, void* priv) {
napi_property_descriptor descriptors[] = {
DECLARE_NAPI_PROPERTY("Test", Test),
DECLARE_NAPI_PROPERTY("TestGetElement", TestGetElement),
DECLARE_NAPI_PROPERTY("TestHasElement", TestHasElement),
DECLARE_NAPI_PROPERTY("New", New),
DECLARE_NAPI_PROPERTY("NewWithLength", NewWithLength),
};

NAPI_CALL_RETURN_VOID(env, napi_define_properties(
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.