tests: test removing a destruction listener from a destruction listener

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

diff --git a/tests/lib/plugin.c b/tests/lib/plugin.c
index ff287c1c100a945bf14b7dc8cf9898b1cfab7349..6ef8d5db44c8871693bc107dbf9967b27e6d9bc0 100644 (file)
--- a/tests/lib/plugin.c
+++ b/tests/lib/plugin.c
@@ -41,8 +41,8 @@ static int check_env_var(const char *name)
 
 static void reset_test_plugin_env_vars(void)
 {
-       g_setenv("BT_TEST_PLUGIN_INIT_CALLED", "0", 1);
-       g_setenv("BT_TEST_PLUGIN_EXIT_CALLED", "0", 1);
+       g_setenv("BT_TEST_PLUGIN_INITIALIZE_CALLED", "0", 1);
+       g_setenv("BT_TEST_PLUGIN_FINALIZE_CALLED", "0", 1);
 }
 
 static char *get_test_plugin_path(const char *plugin_dir,
@@ -79,7 +79,7 @@ static void test_minimal(const char *plugin_dir)
                "bt_plugin_find_all_from_file() succeeds with a valid file");
        ok(plugin_set,
                "bt_plugin_find_all_from_file() returns a plugin set");
-       ok(check_env_var("BT_TEST_PLUGIN_INIT_CALLED") == 1,
+       ok(check_env_var("BT_TEST_PLUGIN_INITIALIZE_CALLED") == 1,
                "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_find_all_from_file() returns the expected number of plugins");
@@ -105,8 +105,8 @@ static void test_minimal(const char *plugin_dir)
        ok(bt_plugin_get_sink_component_class_count(plugin) == 0,
                "bt_plugin_get_sink_component_class_count() returns the expected value");
        bt_plugin_set_put_ref(plugin_set);
-       ok(check_env_var("BT_TEST_PLUGIN_EXIT_CALLED") == 1,
-               "plugin's exit function is called when the plugin is destroyed");
+       ok(check_env_var("BT_TEST_PLUGIN_FINALIZE_CALLED") == 1,
+               "plugin's finalize function is called when the plugin is destroyed");
 
        free(minimal_path);
 }
@@ -188,16 +188,15 @@ static void test_sfs(const char *plugin_dir)
        ok(ret == 0 && results, "bt_query_executor_query() succeeds");
        BT_ASSERT(bt_value_is_array(results) && bt_value_array_get_length(results) == 2);
        object = bt_value_array_borrow_element_by_index_const(results, 0);
-       BT_ASSERT(object && bt_value_is_string(object));
+       BT_ASSERT(bt_value_is_string(object));
        object_str = bt_value_string_get(object);
        ok(strcmp(object_str, "get-something") == 0,
                "bt_component_class_query() receives the expected object name");
        res_params = bt_value_array_borrow_element_by_index_const(results, 1);
-       ok(bt_value_compare(res_params, params),
+       ok(bt_value_is_equal(res_params, params),
                "bt_component_class_query() receives the expected parameters");
 
        bt_component_class_sink_get_ref(sink_comp_class);
-       diag("> putting the plugin set object here");
        BT_PLUGIN_SET_PUT_REF_AND_RESET(plugin_set);
        graph = bt_graph_create(0);
        BT_ASSERT(graph);