X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_cc_prio_map.c;h=9982b7971eb81b4dfcd5ecf2fdbe7f1d0556bf7c;hb=25583cd07e351a64d645978905be94227355f0e5;hp=23305c2abff9e840a26d34a6a66808c8b6cc6dec;hpb=7b5d7f76ccd2b17bb721a57ba4762dd3aa17db0f;p=babeltrace.git diff --git a/tests/lib/test_cc_prio_map.c b/tests/lib/test_cc_prio_map.c index 23305c2a..9982b797 100644 --- a/tests/lib/test_cc_prio_map.c +++ b/tests/lib/test_cc_prio_map.c @@ -17,57 +17,50 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include #include #include -#include +#include #include "tap/tap.h" -#define NR_TESTS 18 +#define NR_TESTS 17 static void test_clock_class_priority_map(void) { struct bt_clock_class_priority_map *cc_prio_map; struct bt_clock_class_priority_map *cc_prio_map_copy; - struct bt_ctf_clock_class *cc1; - struct bt_ctf_clock_class *cc2; - struct bt_ctf_clock_class *cc3; - struct bt_ctf_clock_class *cc; + struct bt_clock_class *cc1; + struct bt_clock_class *cc2; + struct bt_clock_class *cc3; + struct bt_clock_class *cc; uint64_t prio; int ret; cc_prio_map = bt_clock_class_priority_map_create(); ok(cc_prio_map, "bt_clock_class_priority_map_create() succeeds"); - cc1 = bt_ctf_clock_class_create("cc1"); - assert(cc1); - cc2 = bt_ctf_clock_class_create("cc2"); - assert(cc2); - cc3 = bt_ctf_clock_class_create("cc3"); - assert(cc3); - ok(!bt_clock_class_priority_map_get_highest_priority_clock_class(NULL), - "bt_clock_class_priority_map_get_highest_priority_clock_class() handles NULL"); - ok(bt_clock_class_priority_map_get_clock_class_priority(NULL, cc1, &prio) < 0, - "bt_clock_class_priority_map_get_highest_priority_clock_class() handles NULL (CC priority map)"); - ok(bt_clock_class_priority_map_get_clock_class_priority(cc_prio_map, NULL, &prio) < 0, - "bt_clock_class_priority_map_get_highest_priority_clock_class() handles NULL (clock class)"); - ok(bt_clock_class_priority_map_get_clock_class_priority(cc_prio_map, cc1, NULL) < 0, - "bt_clock_class_priority_map_get_highest_priority_clock_class() handles NULL (priority)"); + cc1 = bt_clock_class_create("cc1", 1); + BT_ASSERT(cc1); + cc2 = bt_clock_class_create("cc2", 2); + BT_ASSERT(cc2); + cc3 = bt_clock_class_create("cc3", 3); + BT_ASSERT(cc3); ok(!bt_clock_class_priority_map_get_highest_priority_clock_class(cc_prio_map), "bt_clock_class_priority_map_get_highest_priority_clock_class() returns NULL when there's no clock classes"); ret = bt_clock_class_priority_map_add_clock_class(cc_prio_map, cc2, 75); - assert(ret == 0); + BT_ASSERT(ret == 0); cc = bt_clock_class_priority_map_get_highest_priority_clock_class(cc_prio_map); ok(cc == cc2, "bt_clock_class_priority_map_get_highest_priority_clock_class() returns the expected clock class (1)"); BT_PUT(cc); ret = bt_clock_class_priority_map_add_clock_class(cc_prio_map, cc1, 1001); - assert(ret == 0); + BT_ASSERT(ret == 0); cc = bt_clock_class_priority_map_get_highest_priority_clock_class(cc_prio_map); ok(cc == cc2, "bt_clock_class_priority_map_get_highest_priority_clock_class() returns the expected clock class (2)"); BT_PUT(cc); ret = bt_clock_class_priority_map_add_clock_class(cc_prio_map, cc3, 11); - assert(ret == 0); + BT_ASSERT(ret == 0); cc = bt_clock_class_priority_map_get_highest_priority_clock_class(cc_prio_map); ok(cc == cc3, "bt_clock_class_priority_map_get_highest_priority_clock_class() returns the expected clock class (3)"); @@ -77,30 +70,40 @@ static void test_clock_class_priority_map(void) ok(prio == 1001, "bt_clock_class_priority_map_get_clock_class_priority() returns the expected priority (1)"); ret = bt_clock_class_priority_map_get_clock_class_priority(cc_prio_map, cc2, &prio); - assert(ret == 0); + BT_ASSERT(ret == 0); ok(prio == 75, "bt_clock_class_priority_map_get_clock_class_priority() returns the expected priority (2)"); ret = bt_clock_class_priority_map_get_clock_class_priority(cc_prio_map, cc3, &prio); - assert(ret == 0); + BT_ASSERT(ret == 0); ok(prio == 11, "bt_clock_class_priority_map_get_clock_class_priority() returns the expected priority (3)"); cc_prio_map_copy = bt_clock_class_priority_map_copy(cc_prio_map); ok(cc_prio_map_copy, "bt_clock_class_priority_map_copy() succeeds"); ret = bt_clock_class_priority_map_get_clock_class_priority(cc_prio_map_copy, cc1, &prio); - assert(ret == 0); + BT_ASSERT(ret == 0); ok(prio == 1001, "bt_clock_class_priority_map_get_clock_class_priority() returns the expected priority (1, copy)"); ret = bt_clock_class_priority_map_get_clock_class_priority(cc_prio_map_copy, cc2, &prio); - assert(ret == 0); + BT_ASSERT(ret == 0); ok(prio == 75, "bt_clock_class_priority_map_get_clock_class_priority() returns the expected priority (2, copy)"); ret = bt_clock_class_priority_map_get_clock_class_priority(cc_prio_map_copy, cc3, &prio); - assert(ret == 0); + BT_ASSERT(ret == 0); ok(prio == 11, "bt_clock_class_priority_map_get_clock_class_priority() returns the expected priority (3, copy)"); cc = bt_clock_class_priority_map_get_highest_priority_clock_class(cc_prio_map_copy); ok(cc == cc3, - "bt_clock_class_priority_map_get_highest_priority_clock_class() returns the expected clock class (3, copy)"); + "bt_clock_class_priority_map_get_highest_priority_clock_class() returns the expected clock class (copy)"); + BT_PUT(cc); + ret = bt_clock_class_priority_map_add_clock_class(cc_prio_map_copy, cc3, 253); + ok(ret == 0, "bt_clock_class_priority_map_add_clock_class() succeeds for an existing clock class"); + ret = bt_clock_class_priority_map_get_clock_class_priority(cc_prio_map_copy, cc3, &prio); + BT_ASSERT(ret == 0); + ok(prio == 253, + "bt_clock_class_priority_map_get_clock_class_priority() returns the expected priority (updated, copy)"); + cc = bt_clock_class_priority_map_get_highest_priority_clock_class(cc_prio_map_copy); + ok(cc == cc2, + "bt_clock_class_priority_map_get_highest_priority_clock_class() returns the expected clock class (updated, copy)"); BT_PUT(cc); BT_PUT(cc3);