Re-organize sources

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

diff --git a/tests/lib/test_plugin.c b/tests/lib/test_plugin.c
index e9739f3e928f2f4be3eaed95a000e84d414216ca..39b054e53ee3ddac324839284d9fa04fc12fce2f 100644 (file)
--- a/tests/lib/test_plugin.c
+++ b/tests/lib/test_plugin.c
@@ -15,11 +15,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <babeltrace/babeltrace.h>
+#include <babeltrace2/babeltrace.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <babeltrace/assert-internal.h>
+#include "common/assert.h"
 #include <glib.h>
 #include "tap/tap.h"
 #include "common.h"
@@ -72,13 +72,13 @@ static void test_minimal(const char *plugin_dir)
        diag("minimal plugin test below");
 
        reset_test_plugin_env_vars();
-       plugin_set = bt_plugin_create_all_from_file(minimal_path);
+       plugin_set = bt_plugin_find_all_from_file(minimal_path);
        ok(plugin_set && bt_plugin_set_get_plugin_count(plugin_set) == 1,
-               "bt_plugin_create_all_from_file() succeeds with a valid file");
+               "bt_plugin_find_all_from_file() succeeds with a valid file");
        ok(check_env_var("BT_TEST_PLUGIN_INIT_CALLED") == 1,
-               "plugin's initialization function is called during bt_plugin_create_all_from_file()");
+               "plugin's initialization function is called during bt_plugin_find_all_from_file()");
        ok(bt_plugin_set_get_plugin_count(plugin_set) == 1,
-               "bt_plugin_create_all_from_file() returns the expected number of plugins");
+               "bt_plugin_find_all_from_file() returns the expected number of plugins");
        plugin = bt_plugin_set_borrow_plugin_by_index_const(plugin_set, 0);
        ok(strcmp(bt_plugin_get_name(plugin), "test_minimal") == 0,
                "bt_plugin_get_name() returns the expected name");
@@ -124,7 +124,7 @@ static void test_sfs(const char *plugin_dir)
        const bt_value *res_params;
        bt_graph *graph;
        const char *object_str;
-       enum bt_graph_status graph_ret;
+       bt_graph_status graph_ret;
        bt_query_executor *query_exec = bt_query_executor_create();
        int ret;
 
@@ -132,7 +132,7 @@ static void test_sfs(const char *plugin_dir)
        BT_ASSERT(sfs_path);
        diag("sfs plugin test below");
 
-       plugin_set = bt_plugin_create_all_from_file(sfs_path);
+       plugin_set = bt_plugin_find_all_from_file(sfs_path);
        BT_ASSERT(plugin_set && bt_plugin_set_get_plugin_count(plugin_set) == 1);
        plugin = bt_plugin_set_borrow_plugin_by_index_const(plugin_set, 0);
        ok(bt_plugin_get_version(plugin, &major, &minor, &patch, &extra) ==
@@ -173,7 +173,7 @@ static void test_sfs(const char *plugin_dir)
                plugin, "filter");
        ok(filter_comp_class,
                "bt_plugin_borrow_filter_component_class_by_name_const() finds a filter component class");
-       params = bt_value_integer_create_init(23);
+       params = bt_value_signed_integer_create_init(23);
        BT_ASSERT(params);
        ret = bt_query_executor_query(query_exec,
                bt_component_class_filter_as_component_class_const(filter_comp_class),
@@ -214,17 +214,17 @@ static void test_create_all_from_dir(const char *plugin_dir)
 
        diag("create from all test below");
 
-       plugin_set = bt_plugin_create_all_from_dir(NON_EXISTING_PATH, BT_FALSE);
+       plugin_set = bt_plugin_find_all_from_dir(NON_EXISTING_PATH, BT_FALSE);
        ok(!plugin_set,
-               "bt_plugin_create_all_from_dir() fails with an invalid path");
+               "bt_plugin_find_all_from_dir() fails with an invalid path");
 
-       plugin_set = bt_plugin_create_all_from_dir(plugin_dir, BT_FALSE);
-       ok(plugin_set, "bt_plugin_create_all_from_dir() succeeds with a valid path");
+       plugin_set = bt_plugin_find_all_from_dir(plugin_dir, BT_FALSE);
+       ok(plugin_set, "bt_plugin_find_all_from_dir() succeeds with a valid path");
 
        /* 2 or 4, if `.la` files are considered or not */
        ok(bt_plugin_set_get_plugin_count(plugin_set) == 2 ||
                bt_plugin_set_get_plugin_count(plugin_set) == 4,
-               "bt_plugin_create_all_from_dir() returns the expected number of plugin objects");
+               "bt_plugin_find_all_from_dir() returns the expected number of plugin objects");
 
        bt_plugin_set_put_ref(plugin_set);
 }