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

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

diff --git a/tests/lib/test_bt_notification_heap.c b/tests/lib/test_bt_notification_heap.c
index c200c6357fd8003a654b9ed06f9723e8bfed2576..531ddf680464a4aa3ab6b4173ff52956bd275bdd 100644 (file)
--- a/tests/lib/test_bt_notification_heap.c
+++ b/tests/lib/test_bt_notification_heap.c
@@ -20,13 +20,12 @@
  */
 
 #include "tap/tap.h"
-#include <stdbool.h>
 #include <stdlib.h>
-#include <babeltrace/compiler.h>
+#include <babeltrace/compiler-internal.h>
 #include <babeltrace/ref.h>
-#include <babeltrace/plugin/notification/heap.h>
-#include <babeltrace/plugin/notification/notification.h>
-#include <babeltrace/plugin/notification/notification-internal.h>
+#include <babeltrace/graph/notification-heap.h>
+#include <babeltrace/graph/notification.h>
+#include <babeltrace/graph/notification-internal.h>
 
 #define NR_TESTS 7
 
@@ -46,8 +45,7 @@ void bt_notification_init(struct bt_notification *notification,
                enum bt_notification_type type,
                bt_object_release_func release)
 {
-       assert(type > BT_NOTIFICATION_TYPE_ALL &&
-                       type < BT_NOTIFICATION_TYPE_NR);
+       assert(type > 0 && type < BT_NOTIFICATION_TYPE_NR);
        notification->type = type;
        bt_object_init(&notification->base, release);
 }
@@ -71,7 +69,8 @@ error:
 }
 
 static
-bool compare_notifications(struct bt_notification *a, struct bt_notification *b)
+bt_bool compare_notifications(struct bt_notification *a, struct bt_notification *b,
+               void *unused)
 {
        uint64_t val_a = ((struct dummy_notification *) a)->value;
        uint64_t val_b = ((struct dummy_notification *) b)->value;
@@ -91,7 +90,7 @@ int main(int argc, char **argv)
 
        /* Initialize tap harness before any tests */
        plan_tests(NR_TESTS);
-       heap = bt_notification_heap_create(compare_notifications);
+       heap = bt_notification_heap_create(compare_notifications, NULL);
        ok(heap, "Created a notification heap");
 
        /* Insert 10 000 notifications with random values. */