X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=tests%2Flib%2Ftest_bt_values.c;h=0a7aeb1ccb6b5330a37b91d5cef6c6e14980406e;hb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;hp=ed7e4049a99b4f8aa3dfd337c3fbfaa9577194d7;hpb=21d04293d33d222b3e6583658040871d699033c3;p=babeltrace.git diff --git a/tests/lib/test_bt_values.c b/tests/lib/test_bt_values.c index ed7e4049..0a7aeb1c 100644 --- a/tests/lib/test_bt_values.c +++ b/tests/lib/test_bt_values.c @@ -1,23 +1,10 @@ /* - * test_bt_values.c + * SPDX-License-Identifier: GPL-2.0-only * - * Babeltrace value objects tests - * - * Copyright (c) 2015 EfficiOS Inc. and Linux Foundation - * Copyright (c) 2015 Philippe Proulx - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; under version 2 of the License. + * Copyright (C) 2015 EfficiOS Inc. and Linux Foundation + * Copyright (C) 2015 Philippe Proulx * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * Babeltrace value objects tests */ #include @@ -25,7 +12,7 @@ #include #include "tap/tap.h" -#define NR_TESTS 166 +#define NR_TESTS 190 static void test_null(void) @@ -78,27 +65,27 @@ void test_unsigned_integer(void) uint64_t value; bt_value *obj; - obj = bt_value_unsigned_integer_create(); + obj = bt_value_integer_unsigned_create(); ok(obj && bt_value_is_unsigned_integer(obj), - "bt_value_unsigned_integer_create() returns an unsigned integer value object"); + "bt_value_integer_unsigned_create() returns an unsigned integer value object"); value = 1961; - value = bt_value_unsigned_integer_get(obj); + value = bt_value_integer_unsigned_get(obj); ok(value == 0, "default unsigned integer value object value is 0"); - bt_value_unsigned_integer_set(obj, 98765); - value = bt_value_unsigned_integer_get(obj); - ok(value == 98765, "bt_value_unsigned_integer_bool_set() works"); + bt_value_integer_unsigned_set(obj, 98765); + value = bt_value_integer_unsigned_get(obj); + ok(value == 98765, "bt_value_integer_unsigned_bool_set() works"); BT_VALUE_PUT_REF_AND_RESET(obj); pass("putting an existing unsigned integer value object does not cause a crash") - obj = bt_value_unsigned_integer_create_init(321456987); + obj = bt_value_integer_unsigned_create_init(321456987); ok(obj && bt_value_is_unsigned_integer(obj), - "bt_value_unsigned_integer_create_init() returns an unsigned integer value object"); - value = bt_value_unsigned_integer_get(obj); + "bt_value_integer_unsigned_create_init() returns an unsigned integer value object"); + value = bt_value_integer_unsigned_get(obj); ok(value == 321456987, - "bt_value_unsigned_integer_create_init() sets the appropriate initial value"); + "bt_value_integer_unsigned_create_init() sets the appropriate initial value"); BT_VALUE_PUT_REF_AND_RESET(obj); } @@ -109,27 +96,27 @@ void test_signed_integer(void) int64_t value; bt_value *obj; - obj = bt_value_signed_integer_create(); + obj = bt_value_integer_signed_create(); ok(obj && bt_value_is_signed_integer(obj), - "bt_value_signed_integer_create() returns a signed integer value object"); + "bt_value_integer_signed_create() returns a signed integer value object"); value = 1961; - value = bt_value_signed_integer_get(obj); + value = bt_value_integer_signed_get(obj); ok(value == 0, "default signed integer value object value is 0"); - bt_value_signed_integer_set(obj, 98765); - value = bt_value_signed_integer_get(obj); - ok(value == 98765, "bt_value_signed_integer_bool_set() works"); + bt_value_integer_signed_set(obj, 98765); + value = bt_value_integer_signed_get(obj); + ok(value == 98765, "bt_value_integer_signed_bool_set() works"); BT_VALUE_PUT_REF_AND_RESET(obj); pass("putting an existing signed integer value object does not cause a crash") - obj = bt_value_signed_integer_create_init(-321456987); + obj = bt_value_integer_signed_create_init(-321456987); ok(obj && bt_value_is_signed_integer(obj), - "bt_value_signed_integer_create_init() returns a signed integer value object"); - value = bt_value_signed_integer_get(obj); + "bt_value_integer_signed_create_init() returns a signed integer value object"); + value = bt_value_integer_signed_get(obj); ok(value == -321456987, - "bt_value_signed_integer_create_init() sets the appropriate initial value"); + "bt_value_integer_signed_create_init() sets the appropriate initial value"); BT_VALUE_PUT_REF_AND_RESET(obj); } @@ -177,12 +164,12 @@ void test_string(void) "bt_value_string_create() returns a string value object"); value = bt_value_string_get(obj); - ok(value && !strcmp(value, ""), + ok(value && strcmp(value, "") == 0, "default string value object value is \"\""); bt_value_string_set(obj, "hello worldz"); value = bt_value_string_get(obj); - ok(value && !strcmp(value, "hello worldz"), + ok(value && strcmp(value, "hello worldz") == 0, "bt_value_string_get() works"); BT_VALUE_PUT_REF_AND_RESET(obj); @@ -192,7 +179,7 @@ void test_string(void) ok(obj && bt_value_is_string(obj), "bt_value_string_create_init() returns a string value object"); value = bt_value_string_get(obj); - ok(value && !strcmp(value, "initial value"), + ok(value && strcmp(value, "initial value") == 0, "bt_value_string_create_init() sets the appropriate initial value"); BT_VALUE_PUT_REF_AND_RESET(obj); @@ -208,6 +195,7 @@ void test_array(void) bt_value *obj; const char *string_value; bt_value *array_obj; + bt_value *appended_obj; array_obj = bt_value_array_create(); ok(array_obj && bt_value_is_array(array_obj), @@ -215,10 +203,10 @@ void test_array(void) ok(bt_value_array_is_empty(array_obj), "initial array value object size is 0"); - obj = bt_value_unsigned_integer_create_init(345); + obj = bt_value_integer_unsigned_create_init(345); ret = bt_value_array_append_element(array_obj, obj); BT_VALUE_PUT_REF_AND_RESET(obj); - obj = bt_value_signed_integer_create_init(-507); + obj = bt_value_integer_signed_create_init(-507); ret |= bt_value_array_append_element(array_obj, obj); BT_VALUE_PUT_REF_AND_RESET(obj); obj = bt_value_real_create_init(-17.45); @@ -230,46 +218,46 @@ void test_array(void) ret |= bt_value_array_append_element(array_obj, bt_value_null); ok(!ret, "bt_value_array_append_element() succeeds"); - ok(bt_value_array_get_size(array_obj) == 5, + ok(bt_value_array_get_length(array_obj) == 5, "appending an element to an array value object increment its size"); obj = bt_value_array_borrow_element_by_index(array_obj, 0); - ok(obj && bt_value_is_unsigned_integer(obj), + ok(bt_value_is_unsigned_integer(obj), "bt_value_array_borrow_element_by_index() returns an value object with the appropriate type (unsigned integer)"); - int_value = bt_value_unsigned_integer_get(obj); + int_value = bt_value_integer_unsigned_get(obj); ok(int_value == 345, "bt_value_array_borrow_element_by_index() returns an value object with the appropriate value (unsigned integer)"); obj = bt_value_array_borrow_element_by_index(array_obj, 1); - ok(obj && bt_value_is_signed_integer(obj), + ok(bt_value_is_signed_integer(obj), "bt_value_array_borrow_element_by_index() returns an value object with the appropriate type (signed integer)"); - int_value = bt_value_signed_integer_get(obj); + int_value = bt_value_integer_signed_get(obj); ok(int_value == -507, "bt_value_array_borrow_element_by_index() returns an value object with the appropriate value (signed integer)"); obj = bt_value_array_borrow_element_by_index(array_obj, 2); - ok(obj && bt_value_is_real(obj), + ok(bt_value_is_real(obj), "bt_value_array_borrow_element_by_index() returns an value object with the appropriate type (real number)"); real_value = bt_value_real_get(obj); ok(real_value == -17.45, "bt_value_array_borrow_element_by_index() returns an value object with the appropriate value (real number)"); obj = bt_value_array_borrow_element_by_index(array_obj, 3); - ok(obj && bt_value_is_bool(obj), + ok(bt_value_is_bool(obj), "bt_value_array_borrow_element_by_index() returns an value object with the appropriate type (boolean)"); bool_value = bt_value_bool_get(obj); ok(bool_value, "bt_value_array_borrow_element_by_index() returns an value object with the appropriate value (boolean)"); obj = bt_value_array_borrow_element_by_index(array_obj, 4); - ok(obj == bt_value_null, + ok(bt_value_null, "bt_value_array_borrow_element_by_index() returns an value object with the appropriate type (null)"); - obj = bt_value_signed_integer_create_init(1001); + obj = bt_value_integer_signed_create_init(1001); BT_ASSERT(obj); ok(!bt_value_array_set_element_by_index(array_obj, 2, obj), "bt_value_array_set_element_by_index() succeeds"); BT_VALUE_PUT_REF_AND_RESET(obj); obj = bt_value_array_borrow_element_by_index(array_obj, 2); - ok(obj && bt_value_is_signed_integer(obj), + ok(bt_value_is_signed_integer(obj), "bt_value_array_set_element_by_index() inserts an value object with the appropriate type"); - int_value = bt_value_signed_integer_get(obj); + int_value = bt_value_integer_signed_get(obj); BT_ASSERT(!ret); ok(int_value == 1001, "bt_value_array_set_element_by_index() inserts an value object with the appropriate value"); @@ -289,53 +277,75 @@ void test_array(void) ret = bt_value_array_append_string_element(array_obj, "bt_value"); ok(!ret, "bt_value_array_append_string_element() succeeds"); - ret = bt_value_array_append_empty_array_element(array_obj); + ret = bt_value_array_append_empty_array_element(array_obj, NULL); ok(!ret, "bt_value_array_append_empty_array_element() succeeds"); - ret = bt_value_array_append_empty_map_element(array_obj); + ret = bt_value_array_append_empty_array_element(array_obj, &appended_obj); + ok(!ret, "bt_value_array_append_empty_array_element() with returned value object succeeds"); + ok(appended_obj, + "object returned by bt_value_array_append_empty_array_element() is not NULL"); + ok(bt_value_is_array(appended_obj), + "object returned by bt_value_array_append_empty_array_element() is an array value"); + ret = bt_value_array_append_empty_map_element(array_obj, NULL); ok(!ret, "bt_value_array_append_empty_map_element() succeeds"); - - ok(bt_value_array_get_size(array_obj) == 12, + ret = bt_value_array_append_empty_map_element(array_obj, &appended_obj); + ok(!ret, "bt_value_array_append_empty_map_element() with returned value object succeeds"); + ok(appended_obj, + "object returned by bt_value_array_append_empty_map_element() is not NULL"); + ok(bt_value_is_map(appended_obj), + "object returned by bt_value_array_append_empty_map_element() is an array value"); + + ok(bt_value_array_get_length(array_obj) == 14, "the bt_value_array_append_element_*() functions increment the array value object's size"); ok(!bt_value_array_is_empty(array_obj), "map value object is not empty"); obj = bt_value_array_borrow_element_by_index(array_obj, 5); - ok(obj && bt_value_is_bool(obj), + ok(bt_value_is_bool(obj), "bt_value_array_append_bool_element() appends a boolean value object"); bool_value = bt_value_bool_get(obj); ok(!bool_value, "bt_value_array_append_bool_element() appends the appropriate value"); obj = bt_value_array_borrow_element_by_index(array_obj, 6); - ok(obj && bt_value_is_unsigned_integer(obj), + ok(bt_value_is_unsigned_integer(obj), "bt_value_array_append_unsigned_integer_element() appends an unsigned integer value object"); - int_value = bt_value_unsigned_integer_get(obj); + int_value = bt_value_integer_unsigned_get(obj); ok(int_value == 98765, "bt_value_array_append_unsigned_integer_element() appends the appropriate value"); obj = bt_value_array_borrow_element_by_index(array_obj, 7); - ok(obj && bt_value_is_signed_integer(obj), + ok(bt_value_is_signed_integer(obj), "bt_value_array_append_signed_integer_element() appends a signed integer value object"); - int_value = bt_value_signed_integer_get(obj); + int_value = bt_value_integer_signed_get(obj); ok(int_value == -10101, "bt_value_array_append_signed_integer_element() appends the appropriate value"); obj = bt_value_array_borrow_element_by_index(array_obj, 8); - ok(obj && bt_value_is_real(obj), + ok(bt_value_is_real(obj), "bt_value_array_append_real_element() appends a real number value object"); real_value = bt_value_real_get(obj); ok(real_value == 2.49578, "bt_value_array_append_real_element() appends the appropriate value"); obj = bt_value_array_borrow_element_by_index(array_obj, 9); - ok(obj && bt_value_is_string(obj), + ok(bt_value_is_string(obj), "bt_value_array_append_string_element() appends a string value object"); string_value = bt_value_string_get(obj); - ok(!ret && string_value && !strcmp(string_value, "bt_value"), + ok(!ret && string_value && strcmp(string_value, "bt_value") == 0, "bt_value_array_append_string_element() appends the appropriate value"); obj = bt_value_array_borrow_element_by_index(array_obj, 10); - ok(obj && bt_value_is_array(obj), + ok(bt_value_is_array(obj), "bt_value_array_append_empty_array_element() appends an array value object"); ok(bt_value_array_is_empty(obj), "bt_value_array_append_empty_array_element() an empty array value object"); obj = bt_value_array_borrow_element_by_index(array_obj, 11); - ok(obj && bt_value_is_map(obj), + ok(bt_value_is_array(obj), + "bt_value_array_append_empty_array_element() appends an array value object"); + ok(bt_value_array_is_empty(obj), + "bt_value_array_append_empty_array_element() an empty array value object"); + obj = bt_value_array_borrow_element_by_index(array_obj, 12); + ok(bt_value_is_map(obj), + "bt_value_array_append_empty_map_element() appends a map value object"); + ok(bt_value_map_is_empty(obj), + "bt_value_array_append_empty_map_element() an empty map value object"); + obj = bt_value_array_borrow_element_by_index(array_obj, 13); + ok(bt_value_is_map(obj), "bt_value_array_append_empty_map_element() appends a map value object"); ok(bt_value_map_is_empty(obj), "bt_value_array_append_empty_map_element() an empty map value object"); @@ -345,18 +355,23 @@ void test_array(void) } static -bt_bool test_map_foreach_cb_count(const char *key, bt_value *object, +bt_value_map_foreach_entry_func_status test_map_foreach_cb_count( + const char *key, bt_value *object, void *data) { int *count = data; if (*count == 3) { - return BT_FALSE; + return BT_VALUE_MAP_FOREACH_ENTRY_FUNC_STATUS_INTERRUPT; + } else if (*count == 4) { + return BT_VALUE_MAP_FOREACH_ENTRY_FUNC_STATUS_ERROR; + } else if (*count == 5) { + return BT_VALUE_MAP_FOREACH_ENTRY_FUNC_STATUS_MEMORY_ERROR; } (*count)++; - return BT_TRUE; + return BT_VALUE_MAP_FOREACH_ENTRY_FUNC_STATUS_OK; } struct map_foreach_checklist { @@ -370,16 +385,18 @@ struct map_foreach_checklist { bt_bool real2; bt_bool string2; bt_bool array2; + bt_bool array3; bt_bool map2; + bt_bool map3; }; static -bt_bool test_map_foreach_cb_check(const char *key, bt_value *object, - void *data) +bt_value_map_foreach_entry_func_status test_map_foreach_cb_check( + const char *key, bt_value *object, void *data) { struct map_foreach_checklist *checklist = data; - if (!strcmp(key, "bt_bool")) { + if (strcmp(key, "bt_bool") == 0) { if (checklist->bool1) { fail("test_map_foreach_cb_check(): duplicate key \"bt_bool\""); } else { @@ -394,13 +411,13 @@ bt_bool test_map_foreach_cb_check(const char *key, bt_value *object, fail("test_map_foreach_cb_check(): \"bt_bool\" value object has the wrong value"); } } - } else if (!strcmp(key, "uint")) { + } else if (strcmp(key, "uint") == 0) { if (checklist->uint) { fail("test_map_foreach_cb_check(): duplicate key \"uint\""); } else { uint64_t val = 0; - val = bt_value_unsigned_integer_get(object); + val = bt_value_integer_unsigned_get(object); if (val == 19457) { pass("test_map_foreach_cb_check(): \"uint\" value object has the right value"); @@ -409,13 +426,13 @@ bt_bool test_map_foreach_cb_check(const char *key, bt_value *object, fail("test_map_foreach_cb_check(): \"uint\" value object has the wrong value"); } } - } else if (!strcmp(key, "int")) { + } else if (strcmp(key, "int") == 0) { if (checklist->int1) { fail("test_map_foreach_cb_check(): duplicate key \"int\""); } else { int64_t val = 0; - val = bt_value_signed_integer_get(object); + val = bt_value_integer_signed_get(object); if (val == -12345) { pass("test_map_foreach_cb_check(): \"int\" value object has the right value"); @@ -424,7 +441,7 @@ bt_bool test_map_foreach_cb_check(const char *key, bt_value *object, fail("test_map_foreach_cb_check(): \"int\" value object has the wrong value"); } } - } else if (!strcmp(key, "real")) { + } else if (strcmp(key, "real") == 0) { if (checklist->real1) { fail("test_map_foreach_cb_check(): duplicate key \"real\""); } else { @@ -439,14 +456,14 @@ bt_bool test_map_foreach_cb_check(const char *key, bt_value *object, fail("test_map_foreach_cb_check(): \"real\" value object has the wrong value"); } } - } else if (!strcmp(key, "null")) { + } else if (strcmp(key, "null") == 0) { if (checklist->null1) { fail("test_map_foreach_cb_check(): duplicate key \"bt_bool\""); } else { ok(bt_value_is_null(object), "test_map_foreach_cb_check(): success getting \"null\" value object"); checklist->null1 = BT_TRUE; } - } else if (!strcmp(key, "bool2")) { + } else if (strcmp(key, "bool2") == 0) { if (checklist->bool2) { fail("test_map_foreach_cb_check(): duplicate key \"bool2\""); } else { @@ -461,13 +478,13 @@ bt_bool test_map_foreach_cb_check(const char *key, bt_value *object, fail("test_map_foreach_cb_check(): \"bool2\" value object has the wrong value"); } } - } else if (!strcmp(key, "int2")) { + } else if (strcmp(key, "int2") == 0) { if (checklist->int2) { fail("test_map_foreach_cb_check(): duplicate key \"int2\""); } else { int64_t val = 0; - val = bt_value_signed_integer_get(object); + val = bt_value_integer_signed_get(object); if (val == 98765) { pass("test_map_foreach_cb_check(): \"int2\" value object has the right value"); @@ -476,7 +493,7 @@ bt_bool test_map_foreach_cb_check(const char *key, bt_value *object, fail("test_map_foreach_cb_check(): \"int2\" value object has the wrong value"); } } - } else if (!strcmp(key, "real2")) { + } else if (strcmp(key, "real2") == 0) { if (checklist->real2) { fail("test_map_foreach_cb_check(): duplicate key \"real2\""); } else { @@ -491,7 +508,7 @@ bt_bool test_map_foreach_cb_check(const char *key, bt_value *object, fail("test_map_foreach_cb_check(): \"real2\" value object has the wrong value"); } } - } else if (!strcmp(key, "string2")) { + } else if (strcmp(key, "string2") == 0) { if (checklist->string2) { fail("test_map_foreach_cb_check(): duplicate key \"string2\""); } else { @@ -499,14 +516,14 @@ bt_bool test_map_foreach_cb_check(const char *key, bt_value *object, val = bt_value_string_get(object); - if (val && !strcmp(val, "bt_value")) { + if (val && strcmp(val, "bt_value") == 0) { pass("test_map_foreach_cb_check(): \"string2\" value object has the right value"); checklist->string2 = BT_TRUE; } else { fail("test_map_foreach_cb_check(): \"string2\" value object has the wrong value"); } } - } else if (!strcmp(key, "array2")) { + } else if (strcmp(key, "array2") == 0) { if (checklist->array2) { fail("test_map_foreach_cb_check(): duplicate key \"array2\""); } else { @@ -515,7 +532,25 @@ bt_bool test_map_foreach_cb_check(const char *key, bt_value *object, "test_map_foreach_cb_check(): \"array2\" value object is empty"); checklist->array2 = BT_TRUE; } - } else if (!strcmp(key, "map2")) { + } else if (strcmp(key, "array3") == 0) { + if (checklist->array3) { + fail("test_map_foreach_cb_check(): duplicate key \"array3\""); + } else { + ok(bt_value_is_array(object), "test_map_foreach_cb_check(): success getting \"array3\" value object"); + ok(bt_value_array_is_empty(object), + "test_map_foreach_cb_check(): \"array3\" value object is empty"); + checklist->array3 = BT_TRUE; + } + } else if (strcmp(key, "map3") == 0) { + if (checklist->map3) { + fail("test_map_foreach_cb_check(): duplicate key \"map3\""); + } else { + ok(bt_value_is_map(object), "test_map_foreach_cb_check(): success getting \"map3\" value object"); + ok(bt_value_map_is_empty(object), + "test_map_foreach_cb_check(): \"map3\" value object is empty"); + checklist->map3 = BT_TRUE; + } + } else if (strcmp(key, "map2") == 0) { if (checklist->map2) { fail("test_map_foreach_cb_check(): duplicate key \"map2\""); } else { @@ -529,7 +564,7 @@ bt_bool test_map_foreach_cb_check(const char *key, bt_value *object, key); } - return BT_TRUE; + return BT_VALUE_MAP_FOREACH_ENTRY_FUNC_STATUS_OK; } static @@ -542,6 +577,7 @@ void test_map(void) double real_value; bt_value *obj; bt_value *map_obj; + bt_value *inserted_obj; struct map_foreach_checklist checklist; map_obj = bt_value_map_create(); @@ -550,10 +586,10 @@ void test_map(void) ok(bt_value_map_get_size(map_obj) == 0, "initial map value object size is 0"); - obj = bt_value_unsigned_integer_create_init(19457); + obj = bt_value_integer_unsigned_create_init(19457); ret = bt_value_map_insert_entry(map_obj, "uint", obj); BT_VALUE_PUT_REF_AND_RESET(obj); - obj = bt_value_signed_integer_create_init(-12345); + obj = bt_value_integer_signed_create_init(-12345); ret |= bt_value_map_insert_entry(map_obj, "int", obj); BT_VALUE_PUT_REF_AND_RESET(obj); obj = bt_value_real_create_init(5.444); @@ -584,13 +620,13 @@ void test_map(void) obj = bt_value_map_borrow_entry_value(map_obj, "uint"); ok(obj && bt_value_is_unsigned_integer(obj), "bt_value_map_borrow_entry_value() returns an value object with the appropriate type (unsigned integer)"); - int_value = bt_value_unsigned_integer_get(obj); + int_value = bt_value_integer_unsigned_get(obj); ok(int_value == 19457, "bt_value_map_borrow_entry_value() returns an value object with the appropriate value (unsigned integer)"); obj = bt_value_map_borrow_entry_value(map_obj, "int"); ok(obj && bt_value_is_signed_integer(obj), "bt_value_map_borrow_entry_value() returns an value object with the appropriate type (signed integer)"); - int_value = bt_value_signed_integer_get(obj); + int_value = bt_value_integer_signed_get(obj); ok(int_value == -12345, "bt_value_map_borrow_entry_value() returns an value object with the appropriate value (signed integer)"); obj = bt_value_map_borrow_entry_value(map_obj, "null"); @@ -615,13 +651,24 @@ void test_map(void) ret = bt_value_map_insert_string_entry(map_obj, "string2", "bt_value"); ok(!ret, "bt_value_map_insert_string_entry() succeeds"); - ret = bt_value_map_insert_empty_array_entry(map_obj, - "array2"); + ret = bt_value_map_insert_empty_array_entry(map_obj, "array2", NULL); ok(!ret, "bt_value_map_insert_empty_array_entry() succeeds"); - ret = bt_value_map_insert_empty_map_entry(map_obj, "map2"); + ret = bt_value_map_insert_empty_array_entry(map_obj, "array3", &inserted_obj); + ok(!ret, "bt_value_map_insert_empty_array_entry() with returned value object succeeds"); + ok(inserted_obj, + "object returned by bt_value_map_insert_empty_array_entry() is not NULL"); + ok(bt_value_is_array(inserted_obj), + "object returned by bt_value_map_insert_empty_array_entry() is an array value"); + ret = bt_value_map_insert_empty_map_entry(map_obj, "map2", NULL); ok(!ret, "bt_value_map_insert_empty_map_entry() succeeds"); - - ok(bt_value_map_get_size(map_obj) == 11, + ret = bt_value_map_insert_empty_map_entry(map_obj, "map3", &inserted_obj); + ok(!ret, "bt_value_map_insert_empty_map_entry() with returned value object succeeds"); + ok(inserted_obj, + "object returned by bt_value_map_insert_empty_map_entry() is not NULL"); + ok(bt_value_is_map(inserted_obj), + "object returned by bt_value_map_insert_empty_map_entry() is an array value"); + + ok(bt_value_map_get_size(map_obj) == 13, "the bt_value_map_insert*() functions increment the map value object's size"); ok(!bt_value_map_has_entry(map_obj, "hello"), @@ -646,13 +693,31 @@ void test_map(void) "map value object has key \"string2\""); ok(bt_value_map_has_entry(map_obj, "array2"), "map value object has key \"array2\""); + ok(bt_value_map_has_entry(map_obj, "array3"), + "map value object has key \"array3\""); ok(bt_value_map_has_entry(map_obj, "map2"), "map value object has key \"map2\""); + ok(bt_value_map_has_entry(map_obj, "map3"), + "map value object has key \"map3\""); ret = bt_value_map_foreach_entry(map_obj, test_map_foreach_cb_count, &count); - ok(ret == BT_VALUE_MAP_FOREACH_ENTRY_STATUS_CANCELED && count == 3, - "bt_value_map_foreach_entry() breaks the loop when the user function returns BT_FALSE"); + ok(ret == BT_VALUE_MAP_FOREACH_ENTRY_STATUS_INTERRUPTED && count == 3, + "bt_value_map_foreach_entry() breaks the loop when the user function returns BT_VALUE_MAP_FOREACH_ENTRY_FUNC_STATUS_INTERRUPT"); + + count = 4; + ret = bt_value_map_foreach_entry(map_obj, test_map_foreach_cb_count, + &count); + ok(ret == BT_VALUE_MAP_FOREACH_ENTRY_STATUS_USER_ERROR, + "bt_value_map_foreach_entry() fails when the user function returns BT_VALUE_MAP_FOREACH_ENTRY_FUNC_STATUS_ERROR"); + bt_current_thread_clear_error(); + + count = 5; + ret = bt_value_map_foreach_entry(map_obj, test_map_foreach_cb_count, + &count); + ok(ret == BT_VALUE_MAP_FOREACH_ENTRY_STATUS_MEMORY_ERROR, + "bt_value_map_foreach_entry() fails when the user function returns BT_VALUE_MAP_FOREACH_ENTRY_FUNC_STATUS_MEMORY_ERROR"); + bt_current_thread_clear_error(); memset(&checklist, 0, sizeof(checklist)); ret = bt_value_map_foreach_entry(map_obj, test_map_foreach_cb_check, @@ -683,14 +748,14 @@ void test_types(void) } static -void test_compare_null(void) +void test_is_equal_null(void) { - ok(bt_value_compare(bt_value_null, bt_value_null), + ok(bt_value_is_equal(bt_value_null, bt_value_null), "null value objects are equivalent"); } static -void test_compare_bool(void) +void test_is_equal_bool(void) { bt_value *bool1 = bt_value_bool_create_init(BT_FALSE); @@ -700,14 +765,11 @@ void test_compare_bool(void) bt_value_bool_create_init(BT_FALSE); BT_ASSERT(bool1 && bool2 && bool3); - ok(!bt_value_compare(bt_value_null, - bool1), + ok(!bt_value_is_equal(bt_value_null, bool1), "cannot compare null value object and bt_bool value object"); - ok(!bt_value_compare(bool1, - bool2), + ok(!bt_value_is_equal(bool1, bool2), "boolean value objects are not equivalent (BT_FALSE and BT_TRUE)"); - ok(bt_value_compare(bool1, - bool3), + ok(bt_value_is_equal(bool1, bool3), "boolean value objects are equivalent (BT_FALSE and BT_FALSE)"); BT_VALUE_PUT_REF_AND_RESET(bool1); @@ -716,22 +778,21 @@ void test_compare_bool(void) } static -void test_compare_unsigned_integer(void) +void test_is_equal_unsigned_integer(void) { bt_value *int1 = - bt_value_unsigned_integer_create_init(10); + bt_value_integer_unsigned_create_init(10); bt_value *int2 = - bt_value_unsigned_integer_create_init(23); + bt_value_integer_unsigned_create_init(23); bt_value *int3 = - bt_value_unsigned_integer_create_init(10); + bt_value_integer_unsigned_create_init(10); BT_ASSERT(int1 && int2 && int3); - ok(!bt_value_compare(bt_value_null, - int1), + ok(!bt_value_is_equal(bt_value_null, int1), "cannot compare null value object and unsigned integer value object"); - ok(!bt_value_compare(int1, int2), + ok(!bt_value_is_equal(int1, int2), "unsigned integer value objects are not equivalent (10 and 23)"); - ok(bt_value_compare(int1, int3), + ok(bt_value_is_equal(int1, int3), "unsigned integer value objects are equivalent (10 and 10)"); BT_VALUE_PUT_REF_AND_RESET(int1); @@ -739,22 +800,22 @@ void test_compare_unsigned_integer(void) BT_VALUE_PUT_REF_AND_RESET(int3); } -void test_compare_signed_integer(void) +static +void test_is_equal_signed_integer(void) { bt_value *int1 = - bt_value_signed_integer_create_init(10); + bt_value_integer_signed_create_init(10); bt_value *int2 = - bt_value_signed_integer_create_init(-23); + bt_value_integer_signed_create_init(-23); bt_value *int3 = - bt_value_signed_integer_create_init(10); + bt_value_integer_signed_create_init(10); BT_ASSERT(int1 && int2 && int3); - ok(!bt_value_compare(bt_value_null, - int1), + ok(!bt_value_is_equal(bt_value_null, int1), "cannot compare null value object and signed integer value object"); - ok(!bt_value_compare(int1, int2), + ok(!bt_value_is_equal(int1, int2), "signed integer value objects are not equivalent (10 and -23)"); - ok(bt_value_compare(int1, int3), + ok(bt_value_is_equal(int1, int3), "signed integer value objects are equivalent (10 and 10)"); BT_VALUE_PUT_REF_AND_RESET(int1); @@ -763,7 +824,7 @@ void test_compare_signed_integer(void) } static -void test_compare_real(void) +void test_is_equal_real(void) { bt_value *real1 = bt_value_real_create_init(17.38); @@ -774,14 +835,11 @@ void test_compare_real(void) BT_ASSERT(real1 && real2 && real3); - ok(!bt_value_compare(bt_value_null, - real1), + ok(!bt_value_is_equal(bt_value_null, real1), "cannot compare null value object and real number value object"); - ok(!bt_value_compare(real1, - real2), + ok(!bt_value_is_equal(real1, real2), "real number value objects are not equivalent (17.38 and -14.23)"); - ok(bt_value_compare(real1, - real3), + ok(bt_value_is_equal(real1, real3), "real number value objects are equivalent (17.38 and 17.38)"); BT_VALUE_PUT_REF_AND_RESET(real1); @@ -790,7 +848,7 @@ void test_compare_real(void) } static -void test_compare_string(void) +void test_is_equal_string(void) { bt_value *string1 = bt_value_string_create_init("hello"); @@ -801,14 +859,11 @@ void test_compare_string(void) BT_ASSERT(string1 && string2 && string3); - ok(!bt_value_compare(bt_value_null, - string1), + ok(!bt_value_is_equal(bt_value_null, string1), "cannot compare null value object and string value object"); - ok(!bt_value_compare(string1, - string2), + ok(!bt_value_is_equal(string1, string2), "string value objects are not equivalent (\"hello\" and \"bt_value\")"); - ok(bt_value_compare(string1, - string3), + ok(bt_value_is_equal(string1, string3), "string value objects are equivalent (\"hello\" and \"hello\")"); BT_VALUE_PUT_REF_AND_RESET(string1); @@ -817,7 +872,7 @@ void test_compare_string(void) } static -void test_compare_array(void) +void test_is_equal_array(void) { bt_value *array1 = bt_value_array_create(); bt_value *array2 = bt_value_array_create(); @@ -826,7 +881,7 @@ void test_compare_array(void) BT_ASSERT(array1 && array2 && array3); - ok(bt_value_compare(array1, array2), + ok(bt_value_is_equal(array1, array2), "empty array value objects are equivalent"); append_status = bt_value_array_append_signed_integer_element(array1, 23); @@ -847,18 +902,15 @@ void test_compare_array(void) BT_ASSERT(append_status == BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK); append_status = bt_value_array_append_bool_element(array3, BT_FALSE); BT_ASSERT(append_status == BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK); - BT_ASSERT(bt_value_array_get_size(array1) == 3); - BT_ASSERT(bt_value_array_get_size(array2) == 3); - BT_ASSERT(bt_value_array_get_size(array3) == 3); + BT_ASSERT(bt_value_array_get_length(array1) == 3); + BT_ASSERT(bt_value_array_get_length(array2) == 3); + BT_ASSERT(bt_value_array_get_length(array3) == 3); - ok(!bt_value_compare(bt_value_null, - array1), + ok(!bt_value_is_equal(bt_value_null, array1), "cannot compare null value object and array value object"); - ok(!bt_value_compare(array1, - array2), + ok(!bt_value_is_equal(array1, array2), "array value objects are not equivalent ([23, 14.2, BT_FALSE] and [14.2, 23, BT_FALSE])"); - ok(bt_value_compare(array1, - array3), + ok(bt_value_is_equal(array1, array3), "array value objects are equivalent ([23, 14.2, BT_FALSE] and [23, 14.2, BT_FALSE])"); BT_VALUE_PUT_REF_AND_RESET(array1); @@ -867,7 +919,7 @@ void test_compare_array(void) } static -void test_compare_map(void) +void test_is_equal_map(void) { bt_value *map1 = bt_value_map_create(); bt_value *map2 = bt_value_map_create(); @@ -876,8 +928,7 @@ void test_compare_map(void) BT_ASSERT(map1 && map2 && map3); - ok(bt_value_compare(map1, - map2), + ok(bt_value_is_equal(map1, map2), "empty map value objects are equivalent"); @@ -906,14 +957,11 @@ void test_compare_map(void) BT_ASSERT(bt_value_map_get_size(map2) == 3); BT_ASSERT(bt_value_map_get_size(map3) == 3); - ok(!bt_value_compare(bt_value_null, - map1), + ok(!bt_value_is_equal(bt_value_null, map1), "cannot compare null value object and map value object"); - ok(!bt_value_compare(map1, - map2), + ok(!bt_value_is_equal(map1, map2), "map value objects are not equivalent"); - ok(bt_value_compare(map1, - map3), + ok(bt_value_is_equal(map1, map3), "map value objects are equivalent"); BT_VALUE_PUT_REF_AND_RESET(map1); @@ -922,16 +970,16 @@ void test_compare_map(void) } static -void test_compare(void) +void test_is_equal(void) { - test_compare_null(); - test_compare_bool(); - test_compare_unsigned_integer(); - test_compare_signed_integer(); - test_compare_real(); - test_compare_string(); - test_compare_array(); - test_compare_map(); + test_is_equal_null(); + test_is_equal_bool(); + test_is_equal_unsigned_integer(); + test_is_equal_signed_integer(); + test_is_equal_real(); + test_is_equal_string(); + test_is_equal_array(); + test_is_equal_map(); } static @@ -940,9 +988,9 @@ void test_copy(void) /* * Here's the deal here. If we make sure that each value object * of our deep copy has a different address than its source, and - * that bt_value_compare() returns BT_TRUE for the top-level + * that bt_value_is_equal() returns BT_TRUE for the top-level * value object, taking into account that we test the - * correctness of bt_value_compare() elsewhere, then the deep + * correctness of bt_value_is_equal() elsewhere, then the deep * copy is a success. */ bt_value *null_copy_obj; @@ -958,8 +1006,8 @@ void test_copy(void) bt_value_copy_status copy_status; bool_obj = bt_value_bool_create_init(BT_TRUE); - unsigned_integer_obj = bt_value_unsigned_integer_create_init(23); - signed_integer_obj = bt_value_signed_integer_create_init(-47); + unsigned_integer_obj = bt_value_integer_unsigned_create_init(23); + signed_integer_obj = bt_value_integer_signed_create_init(-47); real_obj = bt_value_real_create_init(-3.1416); string_obj = bt_value_string_create_init("test"); array_obj = bt_value_array_create(); @@ -1018,7 +1066,7 @@ void test_copy(void) ok(null_copy_obj == bt_value_null, "bt_value_copy() returns the same pointer (null)"); - ok(bt_value_compare(map_obj, map_copy_obj), + ok(bt_value_is_equal(map_obj, map_copy_obj), "source and destination value objects have the same content"); BT_VALUE_PUT_REF_AND_RESET(map_copy_obj); @@ -1041,7 +1089,7 @@ bt_bool compare_map_elements(const bt_value *map_a, const bt_value *map_b, elem_a = bt_value_map_borrow_entry_value_const(map_a, key); elem_b = bt_value_map_borrow_entry_value_const(map_b, key); - equal = bt_value_compare(elem_a, elem_b); + equal = bt_value_is_equal(elem_a, elem_b); return equal; } @@ -1053,6 +1101,7 @@ void test_extend(void) bt_value *extended_map = NULL; bt_value *array = bt_value_array_create(); bt_value_map_insert_entry_status insert_status; + bt_value_copy_status copy_status; bt_value_map_extend_status extend_status; BT_ASSERT(base_map); @@ -1079,7 +1128,9 @@ void test_extend(void) insert_status = bt_value_map_insert_real_entry(extension_map, "project", -404); BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); - extend_status = bt_value_map_extend(base_map, extension_map, &extended_map); + copy_status = bt_value_copy(base_map, &extended_map); + BT_ASSERT(copy_status == BT_VALUE_COPY_STATUS_OK); + extend_status = bt_value_map_extend(extended_map, extension_map); ok(extend_status == BT_VALUE_MAP_EXTEND_STATUS_OK && extended_map, "bt_value_map_extend() succeeds"); ok(bt_value_map_get_size(extended_map) == 5, @@ -1110,7 +1161,7 @@ int main(void) { plan_tests(NR_TESTS); test_types(); - test_compare(); + test_is_equal(); test_copy(); test_extend(); return 0;