X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_bt_values.c;h=97e26b97b26b97febc4dc1255ceef2ac311f1664;hb=847ab606a7c62eccf63c86e4030a667e57d5b3e8;hp=f9526379ca2ed5c907f28e075d756c370549c113;hpb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;p=babeltrace.git diff --git a/tests/lib/test_bt_values.c b/tests/lib/test_bt_values.c index f9526379..97e26b97 100644 --- a/tests/lib/test_bt_values.c +++ b/tests/lib/test_bt_values.c @@ -21,11 +21,11 @@ */ #include -#include +#include "common/assert.h" #include #include "tap/tap.h" -#define NR_TESTS 166 +#define NR_TESTS 188 static void test_null(void) @@ -78,27 +78,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 +109,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 +177,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 +192,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 +208,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 +216,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,19 +231,19 @@ 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), "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), "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); @@ -261,7 +262,7 @@ void test_array(void) ok(obj == 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"); @@ -269,7 +270,7 @@ void test_array(void) obj = bt_value_array_borrow_element_by_index(array_obj, 2); ok(obj && 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,12 +290,24 @@ 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"); @@ -308,13 +321,13 @@ void test_array(void) obj = bt_value_array_borrow_element_by_index(array_obj, 6); ok(obj && 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), "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); @@ -327,7 +340,7 @@ void test_array(void) ok(obj && 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), @@ -335,6 +348,16 @@ void test_array(void) 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_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(obj && 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(obj && bt_value_is_map(obj), "bt_value_array_append_empty_map_element() appends a map value object"); ok(bt_value_map_is_empty(obj), @@ -370,7 +393,9 @@ struct map_foreach_checklist { bt_bool real2; bt_bool string2; bt_bool array2; + bt_bool array3; bt_bool map2; + bt_bool map3; }; static @@ -379,7 +404,7 @@ bt_bool test_map_foreach_cb_check(const char *key, bt_value *object, { 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 +419,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 +434,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 +449,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 +464,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 +486,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 +501,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 +516,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 +524,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 +540,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 { @@ -542,6 +585,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 +594,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 +628,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 +659,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,18 +701,22 @@ 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_STATUS_CANCELED && count == 3, + 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_FALSE"); memset(&checklist, 0, sizeof(checklist)); ret = bt_value_map_foreach_entry(map_obj, test_map_foreach_cb_check, &checklist); - ok(ret == BT_VALUE_STATUS_OK, + ok(ret == BT_VALUE_MAP_FOREACH_ENTRY_STATUS_OK, "bt_value_map_foreach_entry() succeeds with test_map_foreach_cb_check()"); ok(checklist.bool1 && checklist.uint && checklist.int1 && checklist.real1 && checklist.null1 && checklist.bool2 && @@ -719,11 +778,11 @@ static void test_compare_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, @@ -742,11 +801,11 @@ void test_compare_unsigned_integer(void) void test_compare_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, @@ -822,34 +881,34 @@ void test_compare_array(void) bt_value *array1 = bt_value_array_create(); bt_value *array2 = bt_value_array_create(); bt_value *array3 = bt_value_array_create(); - bt_value_status status; + bt_value_array_append_element_status append_status; BT_ASSERT(array1 && array2 && array3); ok(bt_value_compare(array1, array2), "empty array value objects are equivalent"); - status = bt_value_array_append_signed_integer_element(array1, 23); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_array_append_real_element(array1, 14.2); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_array_append_bool_element(array1, BT_FALSE); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_array_append_real_element(array2, 14.2); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_array_append_signed_integer_element(array2, 23); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_array_append_bool_element(array2, BT_FALSE); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_array_append_signed_integer_element(array3, 23); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_array_append_real_element(array3, 14.2); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_array_append_bool_element(array3, BT_FALSE); - BT_ASSERT(status == BT_VALUE_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); + append_status = bt_value_array_append_signed_integer_element(array1, 23); + BT_ASSERT(append_status == BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK); + append_status = bt_value_array_append_real_element(array1, 14.2); + BT_ASSERT(append_status == BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK); + append_status = bt_value_array_append_bool_element(array1, BT_FALSE); + BT_ASSERT(append_status == BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK); + append_status = bt_value_array_append_real_element(array2, 14.2); + BT_ASSERT(append_status == BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK); + append_status = bt_value_array_append_signed_integer_element(array2, 23); + BT_ASSERT(append_status == BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK); + append_status = bt_value_array_append_bool_element(array2, BT_FALSE); + BT_ASSERT(append_status == BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK); + append_status = bt_value_array_append_signed_integer_element(array3, 23); + BT_ASSERT(append_status == BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK); + append_status = bt_value_array_append_real_element(array3, 14.2); + 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_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), @@ -872,7 +931,7 @@ void test_compare_map(void) bt_value *map1 = bt_value_map_create(); bt_value *map2 = bt_value_map_create(); bt_value *map3 = bt_value_map_create(); - bt_value_status status; + bt_value_map_insert_entry_status insert_status; BT_ASSERT(map1 && map2 && map3); @@ -881,27 +940,27 @@ void test_compare_map(void) "empty map value objects are equivalent"); - status = bt_value_map_insert_signed_integer_entry(map1, "one", 23); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_insert_real_entry(map1, "two", 14.2); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_insert_bool_entry(map1, "three", + insert_status = bt_value_map_insert_signed_integer_entry(map1, "one", 23); + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); + insert_status = bt_value_map_insert_real_entry(map1, "two", 14.2); + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); + insert_status = bt_value_map_insert_bool_entry(map1, "three", BT_FALSE); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_insert_real_entry(map2, "one", 14.2); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_insert_signed_integer_entry(map2, "two", 23); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_insert_bool_entry(map2, "three", + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); + insert_status = bt_value_map_insert_real_entry(map2, "one", 14.2); + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); + insert_status = bt_value_map_insert_signed_integer_entry(map2, "two", 23); + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); + insert_status = bt_value_map_insert_bool_entry(map2, "three", BT_FALSE); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_insert_bool_entry(map3, "three", + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); + insert_status = bt_value_map_insert_bool_entry(map3, "three", BT_FALSE); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_insert_signed_integer_entry(map3, "one", 23); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_insert_real_entry(map3, "two", 14.2); - BT_ASSERT(status == BT_VALUE_STATUS_OK); + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); + insert_status = bt_value_map_insert_signed_integer_entry(map3, "one", 23); + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); + insert_status = bt_value_map_insert_real_entry(map3, "two", 14.2); + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); BT_ASSERT(bt_value_map_get_size(map1) == 3); BT_ASSERT(bt_value_map_get_size(map2) == 3); BT_ASSERT(bt_value_map_get_size(map3) == 3); @@ -953,11 +1012,13 @@ void test_copy(void) bt_value *string_obj, *string_copy_obj; bt_value *array_obj, *array_copy_obj; bt_value *map_obj, *map_copy_obj; - bt_value_status status; + bt_value_array_append_element_status append_status; + bt_value_map_insert_entry_status insert_status; + 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(); @@ -966,23 +1027,23 @@ void test_copy(void) BT_ASSERT(bool_obj && unsigned_integer_obj && signed_integer_obj && real_obj && string_obj && array_obj && map_obj); - status = bt_value_array_append_element(array_obj, bool_obj); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_array_append_element(array_obj, unsigned_integer_obj); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_array_append_element(array_obj, signed_integer_obj); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_array_append_element(array_obj, real_obj); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_array_append_element(array_obj, bt_value_null); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_insert_entry(map_obj, "array", array_obj); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_insert_entry(map_obj, "string", string_obj); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - - status = bt_value_copy(map_obj, &map_copy_obj); - ok(status == BT_VALUE_STATUS_OK && map_copy_obj, + append_status = bt_value_array_append_element(array_obj, bool_obj); + BT_ASSERT(append_status == BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK); + append_status = bt_value_array_append_element(array_obj, unsigned_integer_obj); + BT_ASSERT(append_status == BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK); + append_status = bt_value_array_append_element(array_obj, signed_integer_obj); + BT_ASSERT(append_status == BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK); + append_status = bt_value_array_append_element(array_obj, real_obj); + BT_ASSERT(append_status == BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK); + append_status = bt_value_array_append_element(array_obj, bt_value_null); + BT_ASSERT(append_status == BT_VALUE_ARRAY_APPEND_ELEMENT_STATUS_OK); + insert_status = bt_value_map_insert_entry(map_obj, "array", array_obj); + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); + insert_status = bt_value_map_insert_entry(map_obj, "string", string_obj); + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); + + copy_status = bt_value_copy(map_obj, &map_copy_obj); + ok(copy_status == BT_VALUE_COPY_STATUS_OK && map_copy_obj, "bt_value_copy() succeeds"); ok(map_obj != map_copy_obj, @@ -1050,34 +1111,35 @@ void test_extend(void) bt_value *extension_map = bt_value_map_create(); bt_value *extended_map = NULL; bt_value *array = bt_value_array_create(); - bt_value_status status; + bt_value_map_insert_entry_status insert_status; + bt_value_map_extend_status extend_status; BT_ASSERT(base_map); BT_ASSERT(extension_map); BT_ASSERT(array); - status = bt_value_map_insert_bool_entry(base_map, "file", + insert_status = bt_value_map_insert_bool_entry(base_map, "file", BT_TRUE); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_insert_bool_entry(base_map, "edit", + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); + insert_status = bt_value_map_insert_bool_entry(base_map, "edit", BT_FALSE); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_insert_signed_integer_entry(base_map, + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); + insert_status = bt_value_map_insert_signed_integer_entry(base_map, "selection", 17); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_insert_signed_integer_entry(base_map, "find", + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); + insert_status = bt_value_map_insert_signed_integer_entry(base_map, "find", -34); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_insert_bool_entry(extension_map, "edit", + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); + insert_status = bt_value_map_insert_bool_entry(extension_map, "edit", BT_TRUE); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_insert_signed_integer_entry(extension_map, + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); + insert_status = bt_value_map_insert_signed_integer_entry(extension_map, "find", 101); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_insert_real_entry(extension_map, + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); + insert_status = bt_value_map_insert_real_entry(extension_map, "project", -404); - BT_ASSERT(status == BT_VALUE_STATUS_OK); - status = bt_value_map_extend(base_map, extension_map, &extended_map); - ok(status == BT_VALUE_STATUS_OK && + BT_ASSERT(insert_status == BT_VALUE_MAP_INSERT_ENTRY_STATUS_OK); + extend_status = bt_value_map_extend(base_map, extension_map, &extended_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, "bt_value_map_extend() returns a map object with the correct size");