summaryrefslogtreecommitdiff
path: root/test/js-native-api/test_object/test_object.c
diff options
context:
space:
mode:
Diffstat (limited to 'test/js-native-api/test_object/test_object.c')
-rw-r--r--test/js-native-api/test_object/test_object.c213
1 files changed, 66 insertions, 147 deletions
diff --git a/test/js-native-api/test_object/test_object.c b/test/js-native-api/test_object/test_object.c
index e3d2115600..db2d30c64a 100644
--- a/test/js-native-api/test_object/test_object.c
+++ b/test/js-native-api/test_object/test_object.c
@@ -341,8 +341,8 @@ static napi_value Unwrap(napi_env env, napi_callback_info info) {
static napi_value TestSetProperty(napi_env env,
napi_callback_info info) {
- napi_status ret[4];
- napi_value object, key, value, prop_value;
+ napi_status status;
+ napi_value object, key, value;
NAPI_CALL(env, napi_create_object(env, &object));
@@ -350,122 +350,68 @@ static napi_value TestSetProperty(napi_env env,
NAPI_CALL(env, napi_create_object(env, &value));
- ret[0] = napi_set_property(NULL, object, key, value);
-
- ret[1] = napi_set_property(env, NULL, key, value);
-
- ret[2] = napi_set_property(env, object, NULL, value);
-
- ret[3] = napi_set_property(env, object, key, NULL);
-
- NAPI_CALL(env, napi_create_string_utf8(env,
- (ret[0] == napi_invalid_arg ?
- "pass" : "fail"),
- NAPI_AUTO_LENGTH,
- &prop_value));
- NAPI_CALL(env, napi_set_named_property(env,
- object,
- "envIsNull",
- prop_value));
-
- NAPI_CALL(env, napi_create_string_utf8(env,
- (ret[1] == napi_invalid_arg ?
- "pass" : "fail"),
- NAPI_AUTO_LENGTH,
- &prop_value));
- NAPI_CALL(env, napi_set_named_property(env,
- object,
- "objectIsNull",
- prop_value));
-
- NAPI_CALL(env, napi_create_string_utf8(env,
- (ret[2] == napi_invalid_arg ?
- "pass" : "fail"),
- NAPI_AUTO_LENGTH,
- &prop_value));
- NAPI_CALL(env, napi_set_named_property(env,
- object,
- "keyIsNull",
- prop_value));
-
- NAPI_CALL(env, napi_create_string_utf8(env,
- (ret[3] == napi_invalid_arg ?
- "pass" : "fail"),
- NAPI_AUTO_LENGTH,
- &prop_value));
- NAPI_CALL(env, napi_set_named_property(env,
- object,
- "valueIsNull",
- prop_value));
+ status = napi_set_property(NULL, object, key, value);
+
+ add_returned_status(env,
+ "envIsNull",
+ object,
+ "Invalid argument",
+ napi_invalid_arg,
+ status);
+
+ napi_set_property(env, NULL, key, value);
+
+ add_last_status(env, "objectIsNull", object);
+
+ napi_set_property(env, object, NULL, value);
+
+ add_last_status(env, "keyIsNull", object);
+
+ napi_set_property(env, object, key, NULL);
+
+ add_last_status(env, "valueIsNull", object);
return object;
}
static napi_value TestHasProperty(napi_env env,
napi_callback_info info) {
- napi_status ret[4];
- napi_value object, key, prop_result;
+ napi_status status;
+ napi_value object, key;
bool result;
NAPI_CALL(env, napi_create_object(env, &object));
NAPI_CALL(env, napi_create_string_utf8(env, "", NAPI_AUTO_LENGTH, &key));
- ret[0] = napi_has_property(NULL, object, key, &result);
-
- ret[1] = napi_has_property(env, NULL, key, &result);
-
- ret[2] = napi_has_property(env, object, NULL, &result);
-
- ret[3] = napi_has_property(env, object, key, NULL);
-
- NAPI_CALL(env, napi_create_string_utf8(env,
- (ret[0] == napi_invalid_arg ?
- "pass" : "fail"),
- NAPI_AUTO_LENGTH,
- &prop_result));
- NAPI_CALL(env, napi_set_named_property(env,
- object,
- "envIsNull",
- prop_result));
-
- NAPI_CALL(env, napi_create_string_utf8(env,
- (ret[1] == napi_invalid_arg ?
- "pass" : "fail"),
- NAPI_AUTO_LENGTH,
- &prop_result));
- NAPI_CALL(env, napi_set_named_property(env,
- object,
- "objectIsNull",
- prop_result));
-
- NAPI_CALL(env, napi_create_string_utf8(env,
- (ret[2] == napi_invalid_arg ?
- "pass" : "fail"),
- NAPI_AUTO_LENGTH,
- &prop_result));
- NAPI_CALL(env, napi_set_named_property(env,
- object,
- "keyIsNull",
- prop_result));
-
- NAPI_CALL(env, napi_create_string_utf8(env,
- (ret[3] == napi_invalid_arg ?
- "pass" : "fail"),
- NAPI_AUTO_LENGTH,
- &prop_result));
- NAPI_CALL(env, napi_set_named_property(env,
- object,
- "resultIsNull",
- prop_result));
+ status = napi_has_property(NULL, object, key, &result);
+
+ add_returned_status(env,
+ "envIsNull",
+ object,
+ "Invalid argument",
+ napi_invalid_arg,
+ status);
+
+ napi_has_property(env, NULL, key, &result);
+
+ add_last_status(env, "objectIsNull", object);
+
+ napi_has_property(env, object, NULL, &result);
+
+ add_last_status(env, "keyIsNull", object);
+
+ napi_has_property(env, object, key, NULL);
+
+ add_last_status(env, "resultIsNull", object);
return object;
}
static napi_value TestGetProperty(napi_env env,
napi_callback_info info) {
- napi_status ret[4];
- napi_value object, key, result, prop_result;
+ napi_status status;
+ napi_value object, key, result;
NAPI_CALL(env, napi_create_object(env, &object));
@@ -473,53 +419,26 @@ static napi_value TestGetProperty(napi_env env,
NAPI_CALL(env, napi_create_object(env, &result));
- ret[0] = napi_get_property(NULL, object, key, &result);
-
- ret[1] = napi_get_property(env, NULL, key, &result);
-
- ret[2] = napi_get_property(env, object, NULL, &result);
-
- ret[3] = napi_get_property(env, object, key, NULL);
-
- NAPI_CALL(env, napi_create_string_utf8(env,
- (ret[0] == napi_invalid_arg ?
- "pass" : "fail"),
- NAPI_AUTO_LENGTH,
- &prop_result));
- NAPI_CALL(env, napi_set_named_property(env,
- object,
- "envIsNull",
- prop_result));
-
- NAPI_CALL(env, napi_create_string_utf8(env,
- (ret[1] == napi_invalid_arg ?
- "pass" : "fail"),
- NAPI_AUTO_LENGTH,
- &prop_result));
- NAPI_CALL(env, napi_set_named_property(env,
- object,
- "objectIsNull",
- prop_result));
-
- NAPI_CALL(env, napi_create_string_utf8(env,
- (ret[2] == napi_invalid_arg ?
- "pass" : "fail"),
- NAPI_AUTO_LENGTH,
- &prop_result));
- NAPI_CALL(env, napi_set_named_property(env,
- object,
- "keyIsNull",
- prop_result));
-
- NAPI_CALL(env, napi_create_string_utf8(env,
- (ret[3] == napi_invalid_arg ?
- "pass" : "fail"),
- NAPI_AUTO_LENGTH,
- &prop_result));
- NAPI_CALL(env, napi_set_named_property(env,
- object,
- "resultIsNull",
- prop_result));
+ status = napi_get_property(NULL, object, key, &result);
+
+ add_returned_status(env,
+ "envIsNull",
+ object,
+ "Invalid argument",
+ napi_invalid_arg,
+ status);
+
+ napi_get_property(env, NULL, key, &result);
+
+ add_last_status(env, "objectIsNull", object);
+
+ napi_get_property(env, object, NULL, &result);
+
+ add_last_status(env, "keyIsNull", object);
+
+ napi_get_property(env, object, key, NULL);
+
+ add_last_status(env, "resultIsNull", object);
return object;
}