X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_plugin.c;h=1bcc4db0a14aa9372d30a04eb1fc964fb4fa9d41;hb=65300d60e4b4f167e5fc8f584677757ce09a3844;hp=c367b90d7b8e139a604442f8417d1a7a38b21861;hpb=c7eee084ca459af66ba1f6d375fba3f89db93584;p=babeltrace.git diff --git a/tests/lib/test_plugin.c b/tests/lib/test_plugin.c index c367b90d..1bcc4db0 100644 --- a/tests/lib/test_plugin.c +++ b/tests/lib/test_plugin.c @@ -1,7 +1,7 @@ /* * test_plugin.c * - * CTF IR Reference Count test + * Trace IR Reference Count test * * Copyright (c) 2017 Philippe Proulx * @@ -20,7 +20,7 @@ */ #include -#include +#include #include #include #include @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include "tap/tap.h" #include "common.h" @@ -114,7 +114,7 @@ static void test_minimal(const char *plugin_dir) struct bt_plugin *plugin; char *minimal_path = get_test_plugin_path(plugin_dir, "minimal"); - assert(minimal_path); + BT_ASSERT(minimal_path); diag("minimal plugin test below"); reset_test_plugin_env_vars(); @@ -142,8 +142,8 @@ static void test_minimal(const char *plugin_dir) "bt_plugin_get_path() returns the expected path"); ok(bt_plugin_get_component_class_count(plugin) == 0, "bt_plugin_get_component_class_count() returns the expected value"); - bt_put(plugin); - bt_put(plugin_set); + bt_object_put_ref(plugin); + bt_object_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"); @@ -172,12 +172,12 @@ static void test_sfs(const char *plugin_dir) struct bt_query_executor *query_exec = bt_query_executor_create(); int ret; - assert(query_exec); - assert(sfs_path); + BT_ASSERT(query_exec); + BT_ASSERT(sfs_path); diag("sfs plugin test below"); plugin_set = bt_plugin_create_all_from_file(sfs_path); - assert(plugin_set && bt_plugin_set_get_plugin_count(plugin_set) == 1); + BT_ASSERT(plugin_set && bt_plugin_set_get_plugin_count(plugin_set) == 1); plugin = bt_plugin_set_get_plugin(plugin_set, 0); ok(bt_plugin_get_version(plugin, &major, &minor, &patch, &extra) == BT_PLUGIN_STATUS_OK, @@ -217,7 +217,7 @@ static void test_sfs(const char *plugin_dir) BT_COMPONENT_CLASS_TYPE_SOURCE), "bt_plugin_get_component_class_by_name_and_type() does not find a component class given the wrong type"); params = bt_value_integer_create_init(23); - assert(params); + BT_ASSERT(params); ret = bt_query_executor_query(NULL, filter_comp_class, "object", params, &results); ok (ret, "bt_query_executor_query() handles NULL (query executor)"); @@ -230,54 +230,52 @@ static void test_sfs(const char *plugin_dir) ret = bt_query_executor_query(query_exec, filter_comp_class, "get-something", params, &results); ok(ret == 0 && results, "bt_query_executor_query() succeeds"); - assert(bt_value_is_array(results) && bt_value_array_size(results) == 2); - object = bt_value_array_get(results, 0); - assert(object && bt_value_is_string(object)); + BT_ASSERT(bt_value_is_array(results) && bt_value_array_get_size(results) == 2); + object = bt_value_array_borrow_element_by_index(results, 0); + BT_ASSERT(object && bt_value_is_string(object)); value_ret = bt_value_string_get(object, &object_str); - assert(value_ret == BT_VALUE_STATUS_OK); + BT_ASSERT(value_ret == BT_VALUE_STATUS_OK); ok(strcmp(object_str, "get-something") == 0, "bt_component_class_query() receives the expected object name"); - res_params = bt_value_array_get(results, 1); + res_params = bt_value_array_borrow_element_by_index(results, 1); ok(res_params == params, "bt_component_class_query() receives the expected parameters"); diag("> putting the plugin object here"); - BT_PUT(plugin); + BT_OBJECT_PUT_REF_AND_RESET(plugin); graph = bt_graph_create(); - assert(graph); + BT_ASSERT(graph); graph_ret = bt_graph_add_component(graph, sink_comp_class, "the-sink", NULL, &sink_component); ok(graph_ret == BT_GRAPH_STATUS_OK && sink_component, "bt_graph_add_component() still works after the plugin object is destroyed"); - BT_PUT(sink_component); - BT_PUT(source_comp_class); - bt_put(graph); + BT_OBJECT_PUT_REF_AND_RESET(sink_component); + BT_OBJECT_PUT_REF_AND_RESET(source_comp_class); + bt_object_put_ref(graph); graph = bt_graph_create(); - assert(graph); + BT_ASSERT(graph); graph_ret = bt_graph_add_component(graph, sink_comp_class, "the-sink", NULL, &sink_component); ok(graph_ret == BT_GRAPH_STATUS_OK && sink_component, "bt_graph_add_component() still works after the source component class object is destroyed"); - BT_PUT(sink_component); - BT_PUT(filter_comp_class); - bt_put(graph); + BT_OBJECT_PUT_REF_AND_RESET(sink_component); + BT_OBJECT_PUT_REF_AND_RESET(filter_comp_class); + bt_object_put_ref(graph); graph = bt_graph_create(); - assert(graph); + BT_ASSERT(graph); graph_ret = bt_graph_add_component(graph, sink_comp_class, "the-sink", NULL, &sink_component); ok(graph_ret == BT_GRAPH_STATUS_OK && sink_component, "bt_graph_add_component() still works after the filter component class object is destroyed"); - BT_PUT(sink_comp_class); - BT_PUT(sink_component); + BT_OBJECT_PUT_REF_AND_RESET(sink_comp_class); + BT_OBJECT_PUT_REF_AND_RESET(sink_component); free(sfs_path); - bt_put(graph); - bt_put(plugin_set); - bt_put(object); - bt_put(res_params); - bt_put(results); - bt_put(params); - bt_put(query_exec); + bt_object_put_ref(graph); + bt_object_put_ref(plugin_set); + bt_object_put_ref(results); + bt_object_put_ref(params); + bt_object_put_ref(query_exec); } static void test_create_all_from_dir(const char *plugin_dir) @@ -298,7 +296,7 @@ static void test_create_all_from_dir(const char *plugin_dir) bt_plugin_set_get_plugin_count(plugin_set) == 4, "bt_plugin_create_all_from_dir() returns the expected number of plugin objects"); - bt_put(plugin_set); + bt_object_put_ref(plugin_set); } static void test_find(const char *plugin_dir) @@ -320,14 +318,14 @@ static void test_find(const char *plugin_dir) "8db46494-a398-466a-9649-c765ae077629" G_SEARCHPATH_SEPARATOR_S, NON_EXISTING_PATH, plugin_dir); - assert(ret > 0 && plugin_path); + BT_ASSERT(ret > 0 && plugin_path); g_setenv("BABELTRACE_PLUGIN_PATH", plugin_path, 1); plugin = bt_plugin_find("test_minimal"); ok(plugin, "bt_plugin_find() succeeds with a plugin name it can find"); ok(strcmp(bt_plugin_get_author(plugin), "Janine Sutto") == 0, "bt_plugin_find() finds the correct plugin for a given name"); - BT_PUT(plugin); + BT_OBJECT_PUT_REF_AND_RESET(plugin); comp_cls_sink = bt_plugin_find_component_class(NULL, "sink", BT_COMPONENT_CLASS_TYPE_SINK); ok(!comp_cls_sink, "bt_plugin_find_component_class() handles NULL (plugin name)"); @@ -347,8 +345,8 @@ static void test_find(const char *plugin_dir) ok(comp_cls_sink, "bt_plugin_find_component_class() succeeds with another component class name (same plugin)"); ok(strcmp(bt_component_class_get_name(comp_cls_source), "source") == 0, "bt_plugin_find_component_class() returns the appropriate component class (source)"); - BT_PUT(comp_cls_sink); - BT_PUT(comp_cls_source); + BT_OBJECT_PUT_REF_AND_RESET(comp_cls_sink); + BT_OBJECT_PUT_REF_AND_RESET(comp_cls_source); free(plugin_path); }