From 5ecc1dc9a8d3ba726539fdd67e1be6a99f7dacf2 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 14 Feb 2024 12:16:16 -0500 Subject: [PATCH] tests/lib: create and manipulate query executor using C++ bindings in `tests/run-in.cpp` Change-Id: Ice0533691242cc584de24d60a212c740747c4a56 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/11809 Reviewed-by: Philippe Proulx --- tests/lib/utils/run-in.cpp | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/tests/lib/utils/run-in.cpp b/tests/lib/utils/run-in.cpp index bb7e4d91..e1b9dee1 100644 --- a/tests/lib/utils/run-in.cpp +++ b/tests/lib/utils/run-in.cpp @@ -10,6 +10,7 @@ #include "cpp-common/bt2/component-class-dev.hpp" #include "cpp-common/bt2/component-class.hpp" #include "cpp-common/bt2/graph.hpp" +#include "cpp-common/bt2/query-executor.hpp" #include "run-in.hpp" @@ -113,20 +114,7 @@ void runIn(RunInCompClsQueryFunc compClsCtxFunc, RunInCompClsInitFunc compCtxFun const auto srcCompCls = bt2::SourceComponentClass::create(); /* Execute a query (executes `compClsCtxFunc`) */ - { - const auto queryExec = bt_query_executor_create_with_method_data( - bt_component_class_source_as_component_class(srcCompCls->libObjPtr()), "", nullptr, - &data); - - BT_ASSERT(queryExec); - - const bt_value *queryRes; - const auto status = bt_query_executor_query(queryExec, &queryRes); - - BT_ASSERT(status == BT_QUERY_EXECUTOR_QUERY_STATUS_OK); - bt_value_put_ref(queryRes); - bt_query_executor_put_ref(queryExec); - } + bt2::QueryExecutor::create(*srcCompCls, "object-name", data)->query(); /* Create graph */ const auto graph = bt2::Graph::create(0); -- 2.34.1