X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_plugin.c;h=c367b90d7b8e139a604442f8417d1a7a38b21861;hb=0b5139375eb31822909dc178ee5cbd7fe8982471;hp=f3f229f55f3193fd56cab595181f0e9ef20b36f5;hpb=c3c69044787d7c84ff3d66c661357ac6bb9e17dd;p=babeltrace.git

diff --git a/tests/lib/test_plugin.c b/tests/lib/test_plugin.c
index f3f229f5..c367b90d 100644
--- a/tests/lib/test_plugin.c
+++ b/tests/lib/test_plugin.c
@@ -24,6 +24,7 @@
 #include <babeltrace/values.h>
 #include <babeltrace/graph/component.h>
 #include <babeltrace/graph/graph.h>
+#include <babeltrace/graph/query-executor.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
@@ -56,13 +57,17 @@ static void reset_test_plugin_env_vars(void)
 static char *get_test_plugin_path(const char *plugin_dir,
 		const char *plugin_name)
 {
-	GString *path = g_string_new(plugin_dir);
 	char *ret;
+	char *plugin_file_name;
+
+	if (asprintf(&plugin_file_name, "plugin-%s." G_MODULE_SUFFIX,
+			plugin_name) == -1) {
+		abort();
+	}
+
+	ret = g_build_filename(plugin_dir, plugin_file_name, NULL);
+	free(plugin_file_name);
 
-	assert(path);
-	g_string_append_printf(path, "/plugin-%s.so", plugin_name);
-	ret = path->str;
-	g_string_free(path, FALSE);
 	return ret;
 }
 
@@ -70,6 +75,8 @@ static void test_invalid(const char *plugin_dir)
 {
 	struct bt_plugin_set *plugin_set;
 
+	diag("invalid plugin test below");
+
 	plugin_set = bt_plugin_create_all_from_file(NON_EXISTING_PATH);
 	ok(!plugin_set, "bt_plugin_create_all_from_file() fails with a non-existing file");
 
@@ -162,7 +169,10 @@ static void test_sfs(const char *plugin_dir)
 	const char *object_str;
 	enum bt_value_status value_ret;
 	enum bt_graph_status graph_ret;
+	struct bt_query_executor *query_exec = bt_query_executor_create();
+	int ret;
 
+	assert(query_exec);
 	assert(sfs_path);
 	diag("sfs plugin test below");
 
@@ -208,15 +218,18 @@ static void test_sfs(const char *plugin_dir)
 		"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);
-	ok (!bt_component_class_query(NULL, "get-something", params),
-		"bt_component_class_query() handles NULL (component class)");
-	ok (!bt_component_class_query(filter_comp_class, NULL, params),
-		"bt_component_class_query() handles NULL (object)");
-	ok (!bt_component_class_query(filter_comp_class, "get-something", NULL),
-		"bt_component_class_query() handles NULL (parameters)");
-	results = bt_component_class_query(filter_comp_class,
-		"get-something", params);
-	ok(results, "bt_component_class_query() succeeds");
+	ret = bt_query_executor_query(NULL, filter_comp_class, "object",
+		params, &results);
+	ok (ret, "bt_query_executor_query() handles NULL (query executor)");
+	ret = bt_query_executor_query(query_exec, NULL, "object",
+		params, &results);
+	ok (ret, "bt_query_executor_query() handles NULL (component class)");
+	ret = bt_query_executor_query(query_exec, filter_comp_class, NULL,
+		params, &results);
+	ok (ret, "bt_query_executor_query() handles NULL (object)");
+	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));
@@ -264,6 +277,7 @@ static void test_sfs(const char *plugin_dir)
 	bt_put(res_params);
 	bt_put(results);
 	bt_put(params);
+	bt_put(query_exec);
 }
 
 static void test_create_all_from_dir(const char *plugin_dir)
@@ -299,7 +313,12 @@ static void test_find(const char *plugin_dir)
 		"bt_plugin_find() handles NULL");
 	ok(!bt_plugin_find(NON_EXISTING_PATH),
 		"bt_plugin_find() returns NULL with an unknown plugin name");
-	ret = asprintf(&plugin_path, "%s:/ec1d09e5-696c-442e-b1c3-f9c6cf7f5958:::%s:8db46494-a398-466a-9649-c765ae077629:",
+	ret = asprintf(&plugin_path, "%s" G_SEARCHPATH_SEPARATOR_S
+			G_DIR_SEPARATOR_S "ec1d09e5-696c-442e-b1c3-f9c6cf7f5958"
+			G_SEARCHPATH_SEPARATOR_S G_SEARCHPATH_SEPARATOR_S
+			G_SEARCHPATH_SEPARATOR_S "%s" G_SEARCHPATH_SEPARATOR_S
+			"8db46494-a398-466a-9649-c765ae077629"
+			G_SEARCHPATH_SEPARATOR_S,
 		NON_EXISTING_PATH, plugin_dir);
 	assert(ret > 0 && plugin_path);
 	g_setenv("BABELTRACE_PLUGIN_PATH", plugin_path, 1);