YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rework the public API (#4829)

Browse Source 
Related to #4186.

Some notable changes:
  - The term 'Error' now strictly refers to native Error objects defined in
    the ECMA standard, which are ordinary objects. All other uses of
    'error' or 'error reference' where the term refers to a thrown value is
    now called 'exception'.

  - Simplified the naming scheme of many String API functions. These functions
    will now also take an 'encoding' argument to specify the desired
    encoding in which to operate.

  - Removed the substring-copy-to-buffer functions. These functions
    behaved awkwardly, as they use character index to specify the
    start/end positions, and were mostly used incorrectly with byte
    offsets instead. The functionality can still be replicated with
    other functions if necessary.

  - String-to-buffer functions will no longer fail if the buffer is not
    sufficiently large, the string will instead be cropped.

  - Fixed the usage of the '_sz' prefix in many API functions. The term
    'sz' means zero-terminated string in hungarian notation, this was
    used incorrectly in many cases.

  - Renamed most of the public API functions to have shorter, more on-point
    names, rather than the often too long descriptive names. Functions are now
    also grouped by the type of value they operate on, where this makes
    sense.

JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai dbatyai@inf.u-szeged.hu
This commit is contained in:
Dániel Bátyai
2021-12-06 10:20:09 +01:00
committed by GitHub
parent 81d2319144
commit 9860d66a56
180 changed files with 10738 additions and 11025 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit-ext/module/jerry-module-test.c
+25 -25
View File
@@ -80,13 +80,13 @@ const char eval_string7[] = "(function() {"
static bool
resolve_differently_handled_module (const jerry_value_t name, jerry_value_t *result)
{
jerry_size_t name_size = jerry_get_utf8_string_size (name);
jerry_size_t name_size = jerry_string_size (name, JERRY_ENCODING_UTF8);
JERRY_VLA (jerry_char_t, name_string, name_size);
jerry_string_to_utf8_char_buffer (name, name_string, name_size);
jerry_string_to_buffer (name, JERRY_ENCODING_UTF8, name_string, name_size);
if (!strncmp ((char *) name_string, "differently-handled-module", name_size))
{
(*result) = jerry_create_number (29);
(*result) = jerry_number (29);
return true;
}
return false;
@@ -102,13 +102,13 @@ static jerryx_module_resolver_t differently_handled_module_resolver = { NULL, re
static bool
cache_check (const jerry_value_t name, jerry_value_t *result)
{
jerry_size_t name_size = jerry_get_utf8_string_size (name);
jerry_size_t name_size = jerry_string_size (name, JERRY_ENCODING_UTF8);
JERRY_VLA (jerry_char_t, name_string, name_size);
jerry_string_to_utf8_char_buffer (name, name_string, name_size);
jerry_string_to_buffer (name, JERRY_ENCODING_UTF8, name_string, name_size);
if (!strncmp ((char *) name_string, "cache-check", name_size))
{
(*result) = jerry_create_object ();
(*result) = jerry_object ();
return true;
}
return false;
@@ -151,8 +151,8 @@ handle_require (const jerry_call_info_t *call_info_p, const jerry_value_t args_p
static void
assert_number (jerry_value_t js_value, double expected_result)
{
TEST_ASSERT (!jerry_value_is_error (js_value));
TEST_ASSERT (jerry_get_number_value (js_value) == expected_result);
TEST_ASSERT (!jerry_value_is_exception (js_value));
TEST_ASSERT (jerry_value_as_number (js_value) == expected_result);
} /* assert_number */
static void
@@ -161,7 +161,7 @@ eval_one (const char *the_string, double expected_result)
jerry_value_t js_eval_result =
jerry_eval ((const jerry_char_t *) the_string, strlen (the_string), JERRY_PARSE_STRICT_MODE);
assert_number (js_eval_result, expected_result);
jerry_release_value (js_eval_result);
jerry_value_free (js_eval_result);
} /* eval_one */
#ifndef ENABLE_INIT_FINI
@@ -184,27 +184,27 @@ main (int argc, char **argv)
jerry_init (JERRY_INIT_EMPTY);
js_global = jerry_get_global_object ();
js_global = jerry_current_realm ();
js_function = jerry_create_external_function (handle_require);
js_property_name = jerry_create_string ((const jerry_char_t *) "require");
res = jerry_set_property (js_global, js_property_name, js_function);
TEST_ASSERT (!jerry_value_is_error (res));
js_function = jerry_function_external (handle_require);
js_property_name = jerry_string_sz ("require");
res = jerry_object_set (js_global, js_property_name, js_function);
TEST_ASSERT (!jerry_value_is_exception (res));
TEST_ASSERT (jerry_value_is_boolean (res) && jerry_value_is_true (res));
jerry_release_value (res);
jerry_release_value (js_property_name);
jerry_release_value (js_function);
jerry_value_free (res);
jerry_value_free (js_property_name);
jerry_value_free (js_function);
js_function = jerry_create_external_function (handle_clear_require_cache);
js_property_name = jerry_create_string ((const jerry_char_t *) "clear_require_cache");
res = jerry_set_property (js_global, js_property_name, js_function);
TEST_ASSERT (!jerry_value_is_error (res));
js_function = jerry_function_external (handle_clear_require_cache);
js_property_name = jerry_string_sz ("clear_require_cache");
res = jerry_object_set (js_global, js_property_name, js_function);
TEST_ASSERT (!jerry_value_is_exception (res));
TEST_ASSERT (jerry_value_is_boolean (res) && jerry_value_is_true (res));
jerry_release_value (res);
jerry_release_value (js_property_name);
jerry_release_value (js_function);
jerry_value_free (res);
jerry_value_free (js_property_name);
jerry_value_free (js_function);
jerry_release_value (js_global);
jerry_value_free (js_global);
eval_one (eval_string1, 42);
eval_one (eval_string2, 29);
tests/unit-ext/module/my-custom-module.c
+1 -1
View File
@@ -22,7 +22,7 @@
static jerry_value_t
my_custom_module_on_resolve (void)
{
return jerry_create_number (42);
return jerry_number (42);
} /* my_custom_module_on_resolve */
JERRYX_NATIVE_MODULE (MODULE_NAME, my_custom_module_on_resolve)
tests/unit-ext/test-ext-arg.c
+72 -72
View File
@@ -116,7 +116,7 @@ test_validator1_handler (const jerry_call_info_t *call_info_p, /**< call informa
bool arg1;
double arg2 = 0.0;
char arg3[5] = "1234";
jerry_value_t arg4 = jerry_create_undefined ();
jerry_value_t arg4 = jerry_undefined ();
jerryx_arg_t mapping[] = { /* ignore this */
jerryx_arg_ignore (),
@@ -135,7 +135,7 @@ test_validator1_handler (const jerry_call_info_t *call_info_p, /**< call informa
if (validator1_count == 0)
{
TEST_ASSERT (!jerry_value_is_error (is_ok));
TEST_ASSERT (!jerry_value_is_exception (is_ok));
TEST_ASSERT (arg1);
TEST_ASSERT (arg2 == 10.5);
TEST_ASSERT (strcmp (arg3, "abc") == 0);
@@ -143,7 +143,7 @@ test_validator1_handler (const jerry_call_info_t *call_info_p, /**< call informa
}
else if (validator1_count == 1)
{
TEST_ASSERT (!jerry_value_is_error (is_ok));
TEST_ASSERT (!jerry_value_is_exception (is_ok));
TEST_ASSERT (arg1);
TEST_ASSERT (arg2 == 10.5);
TEST_ASSERT (strcmp (arg3, "abc") == 0);
@@ -151,7 +151,7 @@ test_validator1_handler (const jerry_call_info_t *call_info_p, /**< call informa
}
else if (validator1_count == 2)
{
TEST_ASSERT (!jerry_value_is_error (is_ok));
TEST_ASSERT (!jerry_value_is_exception (is_ok));
TEST_ASSERT (arg1);
TEST_ASSERT (arg2 == 10.5);
TEST_ASSERT (strcmp (arg3, "") == 0);
@@ -159,14 +159,14 @@ test_validator1_handler (const jerry_call_info_t *call_info_p, /**< call informa
}
else
{
TEST_ASSERT (jerry_value_is_error (is_ok));
TEST_ASSERT (jerry_value_is_exception (is_ok));
}
jerry_release_value (is_ok);
jerry_release_value (arg4);
jerry_value_free (is_ok);
jerry_value_free (arg4);
validator1_count++;
return jerry_create_undefined ();
return jerry_undefined ();
} /* test_validator1_handler */
/**
@@ -179,22 +179,22 @@ my_custom_transform (jerryx_arg_js_iterator_t *js_arg_iter_p, /**< available JS
jerry_value_t js_arg = jerryx_arg_js_iterator_pop (js_arg_iter_p);
jerry_value_t to_number = jerry_value_to_number (js_arg);
if (jerry_value_is_error (to_number))
if (jerry_value_is_exception (to_number))
{
jerry_release_value (to_number);
jerry_value_free (to_number);
return jerry_create_error (JERRY_ERROR_TYPE, (jerry_char_t *) "It can not be converted to a number.");
return jerry_throw_sz (JERRY_ERROR_TYPE, "It can not be converted to a number.");
}
int expected_num = (int) c_arg_p->extra_info;
int get_num = (int) jerry_get_number_value (to_number);
int get_num = (int) jerry_value_as_number (to_number);
if (get_num != expected_num)
{
return jerry_create_error (JERRY_ERROR_TYPE, (jerry_char_t *) "Number value is not expected.");
return jerry_throw_sz (JERRY_ERROR_TYPE, "Number value is not expected.");
}
return jerry_create_undefined ();
return jerry_undefined ();
} /* my_custom_transform */
/**
@@ -220,19 +220,19 @@ test_validator2_handler (const jerry_call_info_t *call_info_p, /**< call informa
if (validator2_count == 0)
{
TEST_ASSERT (!jerry_value_is_error (is_ok));
TEST_ASSERT (!jerry_value_is_exception (is_ok));
TEST_ASSERT (thing_p == &my_thing_a);
TEST_ASSERT (thing_p->x == 1);
}
else
{
TEST_ASSERT (jerry_value_is_error (is_ok));
TEST_ASSERT (jerry_value_is_exception (is_ok));
}
jerry_release_value (is_ok);
jerry_value_free (is_ok);
validator2_count++;
return jerry_create_undefined ();
return jerry_undefined ();
} /* test_validator2_handler */
/**
@@ -262,20 +262,20 @@ test_validator3_handler (const jerry_call_info_t *call_info_p, /**< call informa
if (validator3_count == 0)
{
TEST_ASSERT (!jerry_value_is_error (is_ok));
TEST_ASSERT (!jerry_value_is_exception (is_ok));
TEST_ASSERT (arg1);
TEST_ASSERT (arg2);
}
else if (validator3_count == 1)
{
TEST_ASSERT (!jerry_value_is_error (is_ok));
TEST_ASSERT (!jerry_value_is_exception (is_ok));
TEST_ASSERT (arg1);
/* arg2 must be unchanged */
TEST_ASSERT (!arg2);
}
else if (validator3_count == 2)
{
TEST_ASSERT (!jerry_value_is_error (is_ok));
TEST_ASSERT (!jerry_value_is_exception (is_ok));
/* arg1 must be unchanged */
TEST_ASSERT (!arg1);
/* arg2 must be unchanged */
@@ -283,17 +283,17 @@ test_validator3_handler (const jerry_call_info_t *call_info_p, /**< call informa
}
else if (validator3_count == 3)
{
TEST_ASSERT (!jerry_value_is_error (is_ok));
TEST_ASSERT (!jerry_value_is_exception (is_ok));
/* arg1 must be unchanged */
TEST_ASSERT (!arg1);
/* arg2 must be unchanged */
TEST_ASSERT (!arg2);
}
jerry_release_value (is_ok);
jerry_value_free (is_ok);
validator3_count++;
return jerry_create_undefined ();
return jerry_undefined ();
} /* test_validator3_handler */
/**
@@ -323,14 +323,14 @@ test_validator_prop1_handler (const jerry_call_info_t *call_info_p, /**< call in
mapping,
ARRAY_SIZE (mapping));
TEST_ASSERT (!jerry_value_is_error (is_ok));
TEST_ASSERT (!jerry_value_is_exception (is_ok));
TEST_ASSERT (native1);
TEST_ASSERT (native2 == 1.5);
TEST_ASSERT (native3 == 3);
validator_prop_count++;
return jerry_create_undefined ();
return jerry_undefined ();
} /* test_validator_prop1_handler */
/**
@@ -367,7 +367,7 @@ test_validator_prop2_handler (const jerry_call_info_t *call_info_p, /**< call in
jerry_value_t is_ok = jerryx_arg_transform_args (args_p, args_cnt, mapping, ARRAY_SIZE (mapping));
TEST_ASSERT (!jerry_value_is_error (is_ok));
TEST_ASSERT (!jerry_value_is_exception (is_ok));
if (validator_prop_count == 1)
{
@@ -378,7 +378,7 @@ test_validator_prop2_handler (const jerry_call_info_t *call_info_p, /**< call in
validator_prop_count++;
return jerry_create_undefined ();
return jerry_undefined ();
} /* test_validator_prop2_handler */
static jerry_value_t
@@ -405,14 +405,14 @@ test_validator_prop3_handler (const jerry_call_info_t *call_info_p, /**< call in
mapping,
ARRAY_SIZE (mapping));
TEST_ASSERT (jerry_value_is_error (is_ok));
TEST_ASSERT (jerry_value_is_exception (is_ok));
TEST_ASSERT (!native1);
TEST_ASSERT (native2);
validator_prop_count++;
jerry_release_value (is_ok);
jerry_value_free (is_ok);
return jerry_create_undefined ();
return jerry_undefined ();
} /* test_validator_prop3_handler */
/*
@@ -447,7 +447,7 @@ test_validator_int1_handler (const jerry_call_info_t *call_info_p, /**< call inf
jerry_value_t is_ok = jerryx_arg_transform_args (args_p, args_cnt, mapping, ARRAY_SIZE (mapping));
TEST_ASSERT (!jerry_value_is_error (is_ok));
TEST_ASSERT (!jerry_value_is_exception (is_ok));
TEST_ASSERT (num0 == 0);
TEST_ASSERT (num1 == 255);
TEST_ASSERT (num2 == 128);
@@ -461,10 +461,10 @@ test_validator_int1_handler (const jerry_call_info_t *call_info_p, /**< call inf
TEST_ASSERT (num10 == 2147483647);
TEST_ASSERT (num11 == -2147483647);
jerry_release_value (is_ok);
jerry_value_free (is_ok);
validator_int_count++;
return jerry_create_undefined ();
return jerry_undefined ();
} /* test_validator_int1_handler */
static jerry_value_t
@@ -493,7 +493,7 @@ test_validator_int2_handler (const jerry_call_info_t *call_info_p, /**< call inf
jerry_value_t is_ok = jerryx_arg_transform_args (args_p, args_cnt, mapping, ARRAY_SIZE (mapping));
TEST_ASSERT (jerry_value_is_error (is_ok));
TEST_ASSERT (jerry_value_is_exception (is_ok));
TEST_ASSERT (num0 == -2);
TEST_ASSERT (num1 == -2);
TEST_ASSERT (num2 == -1);
@@ -505,10 +505,10 @@ test_validator_int2_handler (const jerry_call_info_t *call_info_p, /**< call inf
TEST_ASSERT (num8 == 127);
TEST_ASSERT (num9 == 123);
jerry_release_value (is_ok);
jerry_value_free (is_ok);
validator_int_count++;
return jerry_create_undefined ();
return jerry_undefined ();
} /* test_validator_int2_handler */
static jerry_value_t
@@ -526,12 +526,12 @@ test_validator_int3_handler (const jerry_call_info_t *call_info_p, /**< call inf
jerry_value_t is_ok = jerryx_arg_transform_args (args_p, args_cnt, mapping, ARRAY_SIZE (mapping));
TEST_ASSERT (jerry_value_is_error (is_ok));
TEST_ASSERT (jerry_value_is_exception (is_ok));
jerry_release_value (is_ok);
jerry_value_free (is_ok);
validator_int_count++;
return jerry_create_undefined ();
return jerry_undefined ();
} /* test_validator_int3_handler */
static jerry_value_t
@@ -560,7 +560,7 @@ test_validator_array1_handler (const jerry_call_info_t *call_info_p, /**< call i
jerry_value_t is_ok = jerryx_arg_transform_args (args_p, args_cnt, mapping, ARRAY_SIZE (mapping));
TEST_ASSERT (!jerry_value_is_error (is_ok));
TEST_ASSERT (!jerry_value_is_exception (is_ok));
if (validator_array_count == 0)
{
@@ -571,7 +571,7 @@ test_validator_array1_handler (const jerry_call_info_t *call_info_p, /**< call i
validator_array_count++;
return jerry_create_undefined ();
return jerry_undefined ();
} /* test_validator_array1_handler */
static jerry_value_t
@@ -590,14 +590,14 @@ test_validator_array2_handler (const jerry_call_info_t *call_info_p, /**< call i
jerry_value_t is_ok = jerryx_arg_transform_array (args_p[0], item_mapping, ARRAY_SIZE (item_mapping));
TEST_ASSERT (jerry_value_is_error (is_ok));
TEST_ASSERT (jerry_value_is_exception (is_ok));
TEST_ASSERT (native1 == 1);
TEST_ASSERT (!native2);
validator_array_count++;
jerry_release_value (is_ok);
jerry_value_free (is_ok);
return jerry_create_undefined ();
return jerry_undefined ();
} /* test_validator_array2_handler */
/**
@@ -673,7 +673,7 @@ jerry_arg_to_double_or_bool_t (jerryx_arg_js_iterator_t *js_arg_iter_p, const je
(jerryx_arg_coerce_t) extra_info[0],
JERRYX_ARG_OPTIONAL);
conversion_result = conversion_function.func (js_arg_iter_p, &conversion_function);
if (!jerry_value_is_error (conversion_result))
if (!jerry_value_is_exception (conversion_result))
{
if (last_parameter)
{
@@ -696,9 +696,9 @@ jerry_arg_to_double_or_bool_t (jerryx_arg_js_iterator_t *js_arg_iter_p, const je
(jerryx_arg_coerce_t) extra_info[0],
(jerryx_arg_optional_t) extra_info[1]);
jerry_release_value (conversion_result);
jerry_value_free (conversion_result);
conversion_result = conversion_function.func (js_arg_iter_p, &conversion_function);
if (!jerry_value_is_error (conversion_result))
if (!jerry_value_is_exception (conversion_result))
{
if (last_parameter)
{
@@ -717,8 +717,8 @@ jerry_arg_to_double_or_bool_t (jerryx_arg_js_iterator_t *js_arg_iter_p, const je
/* Fall through indicates that whatever they gave us, it wasn't
* one of the types we were expecting... */
jerry_release_value (conversion_result);
return jerry_create_error (JERRY_ERROR_TYPE, (const jerry_char_t *) "double_or_bool-type error.");
jerry_value_free (conversion_result);
return jerry_throw_sz (JERRY_ERROR_TYPE, "double_or_bool-type error.");
} /* jerry_arg_to_double_or_bool_t */
/**
@@ -740,7 +740,7 @@ test_validator_restore_handler (const jerry_call_info_t *call_info_p, /**< call
jerry_value_t is_ok = jerryx_arg_transform_args (args_p, args_cnt, item_mapping, ARRAY_SIZE (item_mapping));
TEST_ASSERT (!jerry_value_is_error (is_ok));
TEST_ASSERT (!jerry_value_is_exception (is_ok));
/* We are going to call this with [false, 3.0] and [3.0, false] parameters... */
bool arg1_is_false = (arg1.type_of_value == BOOL_VALUE && arg1.value.bool_field == false);
@@ -749,16 +749,16 @@ test_validator_restore_handler (const jerry_call_info_t *call_info_p, /**< call
bool arg2_is_three = (arg2.type_of_value == DOUBLE_VALUE && arg2.value.double_field == 3.0);
TEST_ASSERT ((arg1_is_false && arg2_is_three) || (arg1_is_three && arg2_is_false));
jerry_release_value (is_ok);
jerry_value_free (is_ok);
return jerry_create_undefined ();
return jerry_undefined ();
} /* test_validator_restore_handler */
static void
test_utf8_string (void)
{
/* test string: 'str: {DESERET CAPITAL LETTER LONG I}' */
jerry_value_t str = jerry_create_string ((jerry_char_t *) "\x73\x74\x72\x3a \xed\xa0\x81\xed\xb0\x80");
jerry_value_t str = jerry_string_sz ("\x73\x74\x72\x3a \xed\xa0\x81\xed\xb0\x80");
char expect_utf8_buf[] = "\x73\x74\x72\x3a \xf0\x90\x90\x80";
size_t buf_len = sizeof (expect_utf8_buf) - 1;
JERRY_VLA (char, buf, buf_len + 1);
@@ -769,10 +769,10 @@ test_utf8_string (void)
jerry_value_t is_ok = jerryx_arg_transform_args (&str, 1, mapping, ARRAY_SIZE (mapping));
TEST_ASSERT (!jerry_value_is_error (is_ok));
TEST_ASSERT (!jerry_value_is_exception (is_ok));
TEST_ASSERT (!strcmp (buf, expect_utf8_buf));
jerry_release_value (str);
jerry_value_free (str);
} /* test_utf8_string */
static jerry_value_t
@@ -786,9 +786,9 @@ create_object_a_handler (const jerry_call_info_t *call_info_p, /**< call informa
TEST_ASSERT (jerry_value_is_object (call_info_p->this_value));
my_thing_a.x = 1;
jerry_set_object_native_pointer (call_info_p->this_value, &my_thing_a, &thing_a_info);
jerry_object_set_native_ptr (call_info_p->this_value, &thing_a_info, &my_thing_a);
return jerry_create_boolean (true);
return jerry_boolean (true);
} /* create_object_a_handler */
static jerry_value_t
@@ -802,9 +802,9 @@ create_object_b_handler (const jerry_call_info_t *call_info_p, /**< call informa
TEST_ASSERT (jerry_value_is_object (call_info_p->this_value));
my_thing_b.x = false;
jerry_set_object_native_pointer (call_info_p->this_value, &my_thing_b, &thing_b_info);
jerry_object_set_native_ptr (call_info_p->this_value, &thing_b_info, &my_thing_b);
return jerry_create_boolean (true);
return jerry_boolean (true);
} /* create_object_b_handler */
/**
@@ -814,17 +814,17 @@ static void
register_js_function (const char *name_p, /**< name of the function */
jerry_external_handler_t handler_p) /**< function callback */
{
jerry_value_t global_obj_val = jerry_get_global_object ();
jerry_value_t global_obj_val = jerry_current_realm ();
jerry_value_t function_val = jerry_create_external_function (handler_p);
jerry_value_t function_name_val = jerry_create_string ((const jerry_char_t *) name_p);
jerry_value_t result_val = jerry_set_property (global_obj_val, function_name_val, function_val);
jerry_value_t function_val = jerry_function_external (handler_p);
jerry_value_t function_name_val = jerry_string_sz (name_p);
jerry_value_t result_val = jerry_object_set (global_obj_val, function_name_val, function_val);
jerry_release_value (function_name_val);
jerry_release_value (function_val);
jerry_release_value (global_obj_val);
jerry_value_free (function_name_val);
jerry_value_free (function_val);
jerry_value_free (global_obj_val);
jerry_release_value (result_val);
jerry_value_free (result_val);
} /* register_js_function */
int
@@ -850,10 +850,10 @@ main (void)
register_js_function ("test_validator_restore", test_validator_restore_handler);
jerry_value_t parsed_code_val = jerry_parse (test_source, sizeof (test_source) - 1, NULL);
TEST_ASSERT (!jerry_value_is_error (parsed_code_val));
TEST_ASSERT (!jerry_value_is_exception (parsed_code_val));
jerry_value_t res = jerry_run (parsed_code_val);
TEST_ASSERT (!jerry_value_is_error (res));
TEST_ASSERT (!jerry_value_is_exception (res));
TEST_ASSERT (validator1_count == 5);
TEST_ASSERT (validator2_count == 3);
TEST_ASSERT (validator_prop_count == 4);
@@ -861,8 +861,8 @@ main (void)
TEST_ASSERT (validator_array_count == 3);
TEST_ASSERT (validator_restore_count == 4);
jerry_release_value (res);
jerry_release_value (parsed_code_val);
jerry_value_free (res);
jerry_value_free (parsed_code_val);
jerry_cleanup ();
} /* main */
tests/unit-ext/test-ext-autorelease.c
+3 -3
View File
@@ -42,8 +42,8 @@ static const jerry_object_native_info_t native_info = {
static jerry_value_t
create_object (void)
{
jerry_value_t obj = jerry_create_object ();
jerry_set_object_native_pointer (obj, NULL, &native_info);
jerry_value_t obj = jerry_object ();
jerry_object_set_native_ptr (obj, &native_info, NULL);
return obj;
} /* create_object */
@@ -61,7 +61,7 @@ main (void)
native_free_cb_call_count = 0;
test_autorelease_val ();
jerry_gc (JERRY_GC_PRESSURE_HIGH);
jerry_heap_gc (JERRY_GC_PRESSURE_HIGH);
TEST_ASSERT (native_free_cb_call_count == 1);
jerry_cleanup ();
tests/unit-ext/test-ext-handle-scope-escape.c
+4 -4
View File
@@ -44,8 +44,8 @@ create_object (void)
{
jerryx_escapable_handle_scope scope;
jerryx_open_escapable_handle_scope (&scope);
jerry_value_t obj = jerryx_create_handle (jerry_create_object ());
jerry_set_object_native_pointer (obj, NULL, &native_info);
jerry_value_t obj = jerryx_create_handle (jerry_object ());
jerry_object_set_native_ptr (obj, &native_info, NULL);
// If leaves `escaped` uninitialized, there will be a style error on linux thrown by compiler
jerry_value_t escaped = 0;
@@ -65,7 +65,7 @@ test_handle_scope_val (void)
jerry_value_t obj = create_object ();
(void) obj;
jerry_gc (JERRY_GC_PRESSURE_LOW);
jerry_heap_gc (JERRY_GC_PRESSURE_LOW);
TEST_ASSERT (native_free_cb_call_count == 0);
jerryx_close_handle_scope (scope);
@@ -79,7 +79,7 @@ main (void)
native_free_cb_call_count = 0;
test_handle_scope_val ();
jerry_gc (JERRY_GC_PRESSURE_LOW);
jerry_heap_gc (JERRY_GC_PRESSURE_LOW);
TEST_ASSERT (native_free_cb_call_count == 1);
jerry_cleanup ();
tests/unit-ext/test-ext-handle-scope-handle-prelist-escape.c
+4 -4
View File
@@ -51,8 +51,8 @@ create_object (void)
jerry_value_t obj;
for (size_t idx = 0; idx < handle_count; idx++)
{
obj = jerryx_create_handle (jerry_create_object ());
jerry_set_object_native_pointer (obj, NULL, &native_info);
obj = jerryx_create_handle (jerry_object ());
jerry_object_set_native_ptr (obj, &native_info, NULL);
}
// If leaves `escaped` uninitialized, there will be a style error on linux thrown by compiler
@@ -72,7 +72,7 @@ test_handle_scope_val (void)
jerry_value_t obj = create_object ();
(void) obj;
jerry_gc (JERRY_GC_PRESSURE_LOW);
jerry_heap_gc (JERRY_GC_PRESSURE_LOW);
TEST_ASSERT (native_free_cb_call_count == (handle_count - 1));
jerryx_close_handle_scope (scope);
@@ -86,7 +86,7 @@ main (void)
native_free_cb_call_count = 0;
test_handle_scope_val ();
jerry_gc (JERRY_GC_PRESSURE_LOW);
jerry_heap_gc (JERRY_GC_PRESSURE_LOW);
TEST_ASSERT (native_free_cb_call_count == handle_count);
jerry_cleanup ();
tests/unit-ext/test-ext-handle-scope-handle-prelist.c
+4 -4
View File
@@ -51,8 +51,8 @@ create_object (void)
jerry_value_t obj;
for (size_t idx = 0; idx < handle_count; idx++)
{
obj = jerryx_create_handle (jerry_create_object ());
jerry_set_object_native_pointer (obj, NULL, &native_info);
obj = jerryx_create_handle (jerry_object ());
jerry_object_set_native_ptr (obj, &native_info, NULL);
}
// If leaves `escaped` uninitialized, there will be a style error on linux thrown by compiler
@@ -72,7 +72,7 @@ test_handle_scope_val (void)
jerry_value_t obj = create_object ();
(void) obj;
jerry_gc (JERRY_GC_PRESSURE_LOW);
jerry_heap_gc (JERRY_GC_PRESSURE_LOW);
TEST_ASSERT (native_free_cb_call_count == (handle_count - 1));
jerryx_close_handle_scope (scope);
@@ -86,7 +86,7 @@ main (void)
native_free_cb_call_count = 0;
test_handle_scope_val ();
jerry_gc (JERRY_GC_PRESSURE_LOW);
jerry_heap_gc (JERRY_GC_PRESSURE_LOW);
TEST_ASSERT (native_free_cb_call_count == handle_count);
jerry_cleanup ();
tests/unit-ext/test-ext-handle-scope-nested.c
+4 -4
View File
@@ -51,8 +51,8 @@ create_object_nested (int times)
jerry_value_t obj;
if (times == 0)
{
obj = jerryx_create_handle (jerry_create_object ());
jerry_set_object_native_pointer (obj, NULL, &native_info);
obj = jerryx_create_handle (jerry_object ());
jerry_object_set_native_ptr (obj, &native_info, NULL);
}
else
{
@@ -85,7 +85,7 @@ test_handle_scope_val (void)
TEST_ASSERT (jerryx_handle_scope_get_current () == scope);
jerry_gc (JERRY_GC_PRESSURE_LOW);
jerry_heap_gc (JERRY_GC_PRESSURE_LOW);
TEST_ASSERT (native_free_cb_call_count == 0);
jerryx_close_handle_scope (scope);
@@ -99,7 +99,7 @@ main (void)
native_free_cb_call_count = 0;
test_handle_scope_val ();
jerry_gc (JERRY_GC_PRESSURE_LOW);
jerry_heap_gc (JERRY_GC_PRESSURE_LOW);
TEST_ASSERT (native_free_cb_call_count == 2);
jerry_cleanup ();
tests/unit-ext/test-ext-handle-scope-remove.c
+6 -6
View File
@@ -44,8 +44,8 @@ create_object (void)
{
jerryx_escapable_handle_scope scope;
jerryx_open_escapable_handle_scope (&scope);
jerry_value_t obj = jerryx_create_handle (jerry_create_object ());
jerry_set_object_native_pointer (obj, NULL, &native_info);
jerry_value_t obj = jerryx_create_handle (jerry_object ());
jerry_object_set_native_ptr (obj, &native_info, NULL);
// If leaves `escaped` uninitialized, there will be a style error on linux thrown by compiler
jerry_value_t escaped = 0;
@@ -65,15 +65,15 @@ test_handle_scope_val (void)
jerry_value_t obj = create_object ();
(void) obj;
jerry_gc (JERRY_GC_PRESSURE_LOW);
jerry_heap_gc (JERRY_GC_PRESSURE_LOW);
TEST_ASSERT (native_free_cb_call_count == 0);
jerryx_close_handle_scope (scope);
jerry_gc (JERRY_GC_PRESSURE_LOW);
jerry_heap_gc (JERRY_GC_PRESSURE_LOW);
TEST_ASSERT (native_free_cb_call_count == 0);
jerry_release_value (obj);
jerry_gc (JERRY_GC_PRESSURE_LOW);
jerry_value_free (obj);
jerry_heap_gc (JERRY_GC_PRESSURE_LOW);
TEST_ASSERT (native_free_cb_call_count == 1);
} /* test_handle_scope_val */
tests/unit-ext/test-ext-handle-scope-root.c
+4 -4
View File
@@ -43,8 +43,8 @@ static const jerry_object_native_info_t native_info = {
static jerry_value_t
create_object (void)
{
jerry_value_t obj = jerry_create_object ();
jerry_set_object_native_pointer (obj, NULL, &native_info);
jerry_value_t obj = jerry_object ();
jerry_object_set_native_ptr (obj, &native_info, NULL);
return obj;
} /* create_object */
@@ -58,7 +58,7 @@ test_handle_scope_val (void)
jerry_value_t obj = jerryx_create_handle (create_object ());
(void) obj;
jerryx_close_handle_scope (root);
jerry_gc (JERRY_GC_PRESSURE_LOW);
jerry_heap_gc (JERRY_GC_PRESSURE_LOW);
TEST_ASSERT (native_free_cb_call_count == (i + 1));
}
} /* test_handle_scope_val */
@@ -71,7 +71,7 @@ main (void)
native_free_cb_call_count = 0;
test_handle_scope_val ();
jerry_gc (JERRY_GC_PRESSURE_LOW);
jerry_heap_gc (JERRY_GC_PRESSURE_LOW);
TEST_ASSERT (native_free_cb_call_count == reusing_times);
jerry_cleanup ();
tests/unit-ext/test-ext-handle-scope.c
+3 -3
View File
@@ -42,8 +42,8 @@ static const jerry_object_native_info_t native_info = {
static jerry_value_t
create_object (void)
{
jerry_value_t obj = jerry_create_object ();
jerry_set_object_native_pointer (obj, NULL, &native_info);
jerry_value_t obj = jerry_object ();
jerry_object_set_native_ptr (obj, &native_info, NULL);
return obj;
} /* create_object */
@@ -64,7 +64,7 @@ main (void)
native_free_cb_call_count = 0;
test_handle_scope_val ();
jerry_gc (JERRY_GC_PRESSURE_LOW);
jerry_heap_gc (JERRY_GC_PRESSURE_LOW);
TEST_ASSERT (native_free_cb_call_count == 1);
jerry_cleanup ();
tests/unit-ext/test-ext-method-register.c
+60 -60
View File
@@ -31,7 +31,7 @@ method_hello (const jerry_call_info_t *call_info_p, /**< call information */
{
(void) call_info_p;
(void) jargv;
return jerry_create_number (jargc);
return jerry_number (jargc);
} /* method_hello */
/**
@@ -42,14 +42,14 @@ freeze_property (jerry_value_t target_obj, /**< target object */
const char *target_prop) /**< target property name */
{
// "freeze" property
jerry_property_descriptor_t prop_desc = jerry_property_descriptor_create ();
jerry_property_descriptor_t prop_desc = jerry_property_descriptor ();
prop_desc.flags |= JERRY_PROP_IS_CONFIGURABLE_DEFINED;
jerry_value_t prop_name = jerry_create_string ((const jerry_char_t *) target_prop);
jerry_value_t return_value = jerry_define_own_property (target_obj, prop_name, &prop_desc);
jerry_value_t prop_name = jerry_string_sz (target_prop);
jerry_value_t return_value = jerry_object_define_own_prop (target_obj, prop_name, &prop_desc);
TEST_ASSERT (jerry_value_is_boolean (return_value));
jerry_release_value (return_value);
jerry_release_value (prop_name);
jerry_value_free (return_value);
jerry_value_free (prop_name);
jerry_property_descriptor_free (&prop_desc);
} /* freeze_property */
@@ -62,14 +62,14 @@ test_simple_registration (void)
{
jerry_init (JERRY_INIT_EMPTY);
jerry_value_t target_object = jerry_create_object ();
jerry_value_t target_object = jerry_object ();
// Test simple registration
jerryx_property_entry methods[] = {
JERRYX_PROPERTY_FUNCTION ("hello", method_hello), JERRYX_PROPERTY_NUMBER ("my_number", 42.5),
JERRYX_PROPERTY_STRING ("my_str", "super_str"), JERRYX_PROPERTY_STRING_SZ ("my_str_sz", "super_str", 6),
JERRYX_PROPERTY_BOOLEAN ("my_bool", true), JERRYX_PROPERTY_BOOLEAN ("my_bool_false", false),
JERRYX_PROPERTY_UNDEFINED ("my_non_value"), JERRYX_PROPERTY_LIST_END (),
JERRYX_PROPERTY_FUNCTION ("hello", method_hello), JERRYX_PROPERTY_NUMBER ("my_number", 42.5),
JERRYX_PROPERTY_STRING_SZ ("my_str", "super_str"), JERRYX_PROPERTY_STRING ("my_str_sz", "super_str", 6),
JERRYX_PROPERTY_BOOLEAN ("my_bool", true), JERRYX_PROPERTY_BOOLEAN ("my_bool_false", false),
JERRYX_PROPERTY_UNDEFINED ("my_non_value"), JERRYX_PROPERTY_LIST_END (),
};
jerryx_register_result register_result = jerryx_set_properties (target_object, methods);
@@ -78,19 +78,19 @@ test_simple_registration (void)
TEST_ASSERT (jerry_value_is_undefined (register_result.result));
jerryx_release_property_entry (methods, register_result);
jerry_release_value (register_result.result);
jerry_value_free (register_result.result);
jerry_value_t global_obj = jerry_get_global_object ();
jerry_value_t global_obj = jerry_current_realm ();
jerryx_set_property_str (global_obj, "test", target_object);
jerry_release_value (target_object);
jerry_release_value (global_obj);
jerry_value_free (target_object);
jerry_value_free (global_obj);
{
const char *test_A = "test.my_number";
jerry_value_t result = jerry_eval ((const jerry_char_t *) test_A, strlen (test_A), 0);
TEST_ASSERT (jerry_value_is_number (result));
TEST_ASSERT (jerry_get_number_value (result) == 42.5);
jerry_release_value (result);
TEST_ASSERT (jerry_value_as_number (result) == 42.5);
jerry_value_free (result);
}
{
@@ -98,7 +98,7 @@ test_simple_registration (void)
jerry_value_t result = jerry_eval ((const jerry_char_t *) test_A, strlen (test_A), 0);
TEST_ASSERT (jerry_value_is_boolean (result));
TEST_ASSERT (jerry_value_is_true (result));
jerry_release_value (result);
jerry_value_free (result);
}
{
@@ -106,7 +106,7 @@ test_simple_registration (void)
jerry_value_t result = jerry_eval ((const jerry_char_t *) test_A, strlen (test_A), 0);
TEST_ASSERT (jerry_value_is_boolean (result));
TEST_ASSERT (jerry_value_is_true (result));
jerry_release_value (result);
jerry_value_free (result);
}
{
@@ -114,7 +114,7 @@ test_simple_registration (void)
jerry_value_t result = jerry_eval ((const jerry_char_t *) test_A, strlen (test_A), 0);
TEST_ASSERT (jerry_value_is_boolean (result));
TEST_ASSERT (jerry_value_is_true (result));
jerry_release_value (result);
jerry_value_free (result);
}
{
@@ -122,30 +122,30 @@ test_simple_registration (void)
jerry_value_t result = jerry_eval ((const jerry_char_t *) test_A, strlen (test_A), 0);
TEST_ASSERT (jerry_value_is_boolean (result));
TEST_ASSERT (jerry_value_is_true (result) == false);
jerry_release_value (result);
jerry_value_free (result);
}
{
const char *test_A = "test.my_non_value";
jerry_value_t result = jerry_eval ((const jerry_char_t *) test_A, strlen (test_A), 0);
TEST_ASSERT (jerry_value_is_undefined (result));
jerry_release_value (result);
jerry_value_free (result);
}
{
const char *test_A = "test.hello(33, 42, 2);";
jerry_value_t result = jerry_eval ((const jerry_char_t *) test_A, strlen (test_A), 0);
TEST_ASSERT (jerry_value_is_number (result));
TEST_ASSERT ((uint32_t) jerry_get_number_value (result) == 3u);
jerry_release_value (result);
TEST_ASSERT ((uint32_t) jerry_value_as_number (result) == 3u);
jerry_value_free (result);
}
{
const char *test_A = "test.hello();";
jerry_value_t result = jerry_eval ((const jerry_char_t *) test_A, strlen (test_A), 0);
TEST_ASSERT (jerry_value_is_number (result));
TEST_ASSERT ((uint32_t) jerry_get_number_value (result) == 0u);
jerry_release_value (result);
TEST_ASSERT ((uint32_t) jerry_value_as_number (result) == 0u);
jerry_value_free (result);
}
jerry_cleanup ();
@@ -163,16 +163,16 @@ test_error_setvalue (void)
jerry_init (JERRY_INIT_EMPTY);
const char *target_prop = "test_err";
jerry_value_t global_obj = jerry_get_global_object ();
jerry_value_t global_obj = jerry_current_realm ();
freeze_property (global_obj, target_prop);
jerry_value_t new_object = jerry_create_object ();
jerry_value_t new_object = jerry_object ();
jerry_value_t set_result = jerryx_set_property_str (global_obj, target_prop, new_object);
TEST_ASSERT (jerry_value_is_error (set_result));
TEST_ASSERT (jerry_value_is_exception (set_result));
jerry_release_value (set_result);
jerry_release_value (new_object);
jerry_release_value (global_obj);
jerry_value_free (set_result);
jerry_value_free (new_object);
jerry_value_free (global_obj);
jerry_cleanup ();
} /* test_error_setvalue */
@@ -189,7 +189,7 @@ test_error_single_function (void)
jerry_init (JERRY_INIT_EMPTY);
const char *target_prop = "test_err";
jerry_value_t target_object = jerry_create_object ();
jerry_value_t target_object = jerry_object ();
freeze_property (target_object, target_prop);
jerryx_property_entry methods[] = {
@@ -200,11 +200,11 @@ test_error_single_function (void)
jerryx_register_result register_result = jerryx_set_properties (target_object, methods);
TEST_ASSERT (register_result.registered == 0);
TEST_ASSERT (jerry_value_is_error (register_result.result));
TEST_ASSERT (jerry_value_is_exception (register_result.result));
jerryx_release_property_entry (methods, register_result);
jerry_release_value (register_result.result);
jerry_value_free (register_result.result);
jerry_release_value (target_object);
jerry_value_free (target_object);
jerry_cleanup ();
} /* test_error_single_function */
@@ -220,7 +220,7 @@ test_error_multiple_functions (void)
const char *prop_ok = "prop_ok";
const char *prop_err = "prop_err";
const char *prop_not = "prop_not";
jerry_value_t target_object = jerry_create_object ();
jerry_value_t target_object = jerry_object ();
freeze_property (target_object, prop_err);
jerryx_property_entry methods[] = {
@@ -233,59 +233,59 @@ test_error_multiple_functions (void)
jerryx_register_result register_result = jerryx_set_properties (target_object, methods);
TEST_ASSERT (register_result.registered == 1);
TEST_ASSERT (jerry_value_is_error (register_result.result));
TEST_ASSERT (jerry_value_is_exception (register_result.result));
jerryx_release_property_entry (methods, register_result);
jerry_release_value (register_result.result);
jerry_value_free (register_result.result);
{
// Test if property "prop_ok" is correctly registered.
jerry_value_t prop_ok_val = jerry_create_string ((const jerry_char_t *) prop_ok);
jerry_value_t prop_ok_exists = jerry_has_own_property (target_object, prop_ok_val);
jerry_value_t prop_ok_val = jerry_string_sz (prop_ok);
jerry_value_t prop_ok_exists = jerry_object_has_own (target_object, prop_ok_val);
TEST_ASSERT (jerry_value_is_true (prop_ok_exists));
jerry_release_value (prop_ok_exists);
jerry_value_free (prop_ok_exists);
// Try calling the method
jerry_value_t prop_ok_func = jerry_get_property (target_object, prop_ok_val);
jerry_value_t prop_ok_func = jerry_object_get (target_object, prop_ok_val);
TEST_ASSERT (jerry_value_is_function (prop_ok_func) == true);
jerry_value_t args[2] = {
jerry_create_number (22),
jerry_create_number (-3),
jerry_number (22),
jerry_number (-3),
};
jerry_size_t args_cnt = sizeof (args) / sizeof (jerry_value_t);
jerry_value_t func_result = jerry_call_function (prop_ok_func, jerry_create_undefined (), args, args_cnt);
jerry_value_t func_result = jerry_call (prop_ok_func, jerry_undefined (), args, args_cnt);
TEST_ASSERT (jerry_value_is_number (func_result) == true);
TEST_ASSERT ((uint32_t) jerry_get_number_value (func_result) == 2u);
jerry_release_value (func_result);
TEST_ASSERT ((uint32_t) jerry_value_as_number (func_result) == 2u);
jerry_value_free (func_result);
for (jerry_size_t idx = 0; idx < args_cnt; idx++)
{
jerry_release_value (args[idx]);
jerry_value_free (args[idx]);
}
jerry_release_value (prop_ok_func);
jerry_release_value (prop_ok_val);
jerry_value_free (prop_ok_func);
jerry_value_free (prop_ok_val);
}
{
// The "prop_err" should exist - as it was "freezed" - but it should not be a function
jerry_value_t prop_err_val = jerry_create_string ((const jerry_char_t *) prop_err);
jerry_value_t prop_err_exists = jerry_has_own_property (target_object, prop_err_val);
jerry_value_t prop_err_val = jerry_string_sz (prop_err);
jerry_value_t prop_err_exists = jerry_object_has_own (target_object, prop_err_val);
TEST_ASSERT (jerry_value_is_true (prop_err_exists));
jerry_release_value (prop_err_exists);
jerry_value_free (prop_err_exists);
jerry_value_t prop_err_func = jerry_value_is_function (prop_err_val);
TEST_ASSERT (jerry_value_is_function (prop_err_func) == false);
jerry_release_value (prop_err_val);
jerry_value_free (prop_err_val);
}
{ // The "prop_not" is not available on the target object
jerry_value_t prop_not_val = jerry_create_string ((const jerry_char_t *) prop_not);
jerry_value_t prop_not_exists = jerry_has_own_property (target_object, prop_not_val);
jerry_value_t prop_not_val = jerry_string_sz (prop_not);
jerry_value_t prop_not_exists = jerry_object_has_own (target_object, prop_not_val);
TEST_ASSERT (jerry_value_is_true (prop_not_exists) == false);
jerry_release_value (prop_not_exists);
jerry_release_value (prop_not_val);
jerry_value_free (prop_not_exists);
jerry_value_free (prop_not_val);
}
jerry_release_value (target_object);
jerry_value_free (target_object);
jerry_cleanup ();
} /* test_error_multiple_functions */
tests/unit-ext/test-ext-module-canonical.c
+22 -22
View File
@@ -26,36 +26,36 @@
static jerry_value_t
get_canonical_name (const jerry_value_t name)
{
jerry_size_t name_size = jerry_get_string_size (name);
jerry_size_t name_size = jerry_string_size (name, JERRY_ENCODING_CESU8);
JERRY_VLA (jerry_char_t, name_string, name_size + 1);
jerry_string_to_char_buffer (name, name_string, name_size);
jerry_string_to_buffer (name, JERRY_ENCODING_CESU8, name_string, name_size);
name_string[name_size] = 0;
if (!strcmp ((char *) name_string, ACTUAL_NAME))
{
return jerry_acquire_value (name);
return jerry_value_copy (name);
}
else if (!strcmp ((char *) name_string, ALIAS_NAME))
{
return jerry_create_string ((jerry_char_t *) ACTUAL_NAME);
return jerry_string_sz (ACTUAL_NAME);
}
else
{
return jerry_create_undefined ();
return jerry_undefined ();
}
} /* get_canonical_name */
static bool
resolve (const jerry_value_t canonical_name, jerry_value_t *result)
{
jerry_size_t name_size = jerry_get_string_size (canonical_name);
jerry_size_t name_size = jerry_string_size (canonical_name, JERRY_ENCODING_CESU8);
JERRY_VLA (jerry_char_t, name_string, name_size + 1);
jerry_string_to_char_buffer (canonical_name, name_string, name_size);
jerry_string_to_buffer (canonical_name, JERRY_ENCODING_CESU8, name_string, name_size);
name_string[name_size] = 0;
if (!strcmp ((char *) name_string, ACTUAL_NAME))
{
*result = jerry_create_object ();
*result = jerry_object ();
return true;
}
return false;
@@ -76,28 +76,28 @@ main (int argc, char **argv)
jerry_init (JERRY_INIT_EMPTY);
jerry_value_t actual_name = jerry_create_string ((jerry_char_t *) ACTUAL_NAME);
jerry_value_t alias_name = jerry_create_string ((jerry_char_t *) ALIAS_NAME);
jerry_value_t actual_name = jerry_string_sz (ACTUAL_NAME);
jerry_value_t alias_name = jerry_string_sz (ALIAS_NAME);
/* It's important that we resolve by the non-canonical name first. */
jerry_value_t result2 = jerryx_module_resolve (alias_name, &resolver, 1);
jerry_value_t result1 = jerryx_module_resolve (actual_name, &resolver, 1);
jerry_release_value (actual_name);
jerry_release_value (alias_name);
jerry_value_free (actual_name);
jerry_value_free (alias_name);
/* An elaborate way of doing strict equal - set a property on one object and it "magically" appears on the other. */
jerry_value_t prop_name = jerry_create_string ((jerry_char_t *) "something");
jerry_value_t prop_value = jerry_create_number (TEST_VALUE);
jerry_release_value (jerry_set_property (result1, prop_name, prop_value));
jerry_release_value (prop_value);
jerry_value_t prop_name = jerry_string_sz ("something");
jerry_value_t prop_value = jerry_number (TEST_VALUE);
jerry_value_free (jerry_object_set (result1, prop_name, prop_value));
jerry_value_free (prop_value);
prop_value = jerry_get_property (result2, prop_name);
TEST_ASSERT (jerry_get_number_value (prop_value) == TEST_VALUE);
jerry_release_value (prop_value);
prop_value = jerry_object_get (result2, prop_name);
TEST_ASSERT (jerry_value_as_number (prop_value) == TEST_VALUE);
jerry_value_free (prop_value);
jerry_release_value (prop_name);
jerry_release_value (result1);
jerry_release_value (result2);
jerry_value_free (prop_name);
jerry_value_free (result1);
jerry_value_free (result2);
jerry_cleanup ();
tests/unit-ext/test-ext-module-empty.c
+15 -15
View File
@@ -33,43 +33,43 @@ main (int argc, char **argv)
jerry_init (JERRY_INIT_EMPTY);
/* Attempt to load a non-existing module. */
module_name = jerry_create_string ((jerry_char_t *) "some-unknown-module-name");
module_name = jerry_string_sz ("some-unknown-module-name");
jerry_value_t module = jerryx_module_resolve (module_name, &resolver, 1);
jerry_release_value (module_name);
jerry_value_free (module_name);
TEST_ASSERT (jerry_value_is_error (module));
TEST_ASSERT (jerry_value_is_exception (module));
/* Retrieve the error message. */
module = jerry_get_value_from_error (module, true);
jerry_value_t prop_name = jerry_create_string ((const jerry_char_t *) "message");
jerry_value_t prop = jerry_get_property (module, prop_name);
module = jerry_exception_value (module, true);
jerry_value_t prop_name = jerry_string_sz ("message");
jerry_value_t prop = jerry_object_get (module, prop_name);
/* Assert that the error message is a string with specific contents. */
TEST_ASSERT (jerry_value_is_string (prop));
bytes_copied = jerry_substring_to_utf8_char_buffer (prop, 0, 254, buffer, 256);
bytes_copied = jerry_string_to_buffer (prop, JERRY_ENCODING_UTF8, buffer, sizeof (buffer));
buffer[bytes_copied] = 0;
TEST_ASSERT (!strcmp ((const char *) buffer, "Module not found"));
/* Release the error message property name and value. */
jerry_release_value (prop);
jerry_release_value (prop_name);
jerry_value_free (prop);
jerry_value_free (prop_name);
/* Retrieve the moduleName property. */
prop_name = jerry_create_string ((const jerry_char_t *) "moduleName");
prop = jerry_get_property (module, prop_name);
prop_name = jerry_string_sz ("moduleName");
prop = jerry_object_get (module, prop_name);
/* Assert that the moduleName property is a string containing the requested module name. */
TEST_ASSERT (jerry_value_is_string (prop));
bytes_copied = jerry_substring_to_utf8_char_buffer (prop, 0, 254, buffer, 256);
bytes_copied = jerry_string_to_buffer (prop, JERRY_ENCODING_UTF8, buffer, sizeof (buffer));
buffer[bytes_copied] = 0;
TEST_ASSERT (!strcmp ((const char *) buffer, "some-unknown-module-name"));
/* Release everything. */
jerry_release_value (prop);
jerry_release_value (prop_name);
jerry_release_value (module);
jerry_value_free (prop);
jerry_value_free (prop_name);
jerry_value_free (module);
return 0;
} /* main */