lib: add internal object pool API and use it; adapt plugins/tests

[babeltrace.git] / tests / lib / test_cc_prio_map.c

diff --git a/tests/lib/test_cc_prio_map.c b/tests/lib/test_cc_prio_map.c
index d2d128a88c88f1fe12815ba93405deba2e3a9925..b9378d34edd73ea35051ca93eefef528414d364a 100644 (file)
--- a/tests/lib/test_cc_prio_map.c
+++ b/tests/lib/test_cc_prio_map.c
@@ -17,41 +17,34 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <babeltrace/ref.h>
 #include <babeltrace/graph/clock-class-priority-map.h>
 #include <babeltrace/ctf-ir/clock-class.h>
 #include <assert.h>
 
 #include "tap/tap.h"
 
-#define NR_TESTS       21
+#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");
+       cc1 = bt_clock_class_create("cc1", 1);
        assert(cc1);
-       cc2 = bt_ctf_clock_class_create("cc2");
+       cc2 = bt_clock_class_create("cc2", 2);
        assert(cc2);
-       cc3 = bt_ctf_clock_class_create("cc3");
+       cc3 = bt_clock_class_create("cc3", 3);
        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)");
        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);