tests: remove unused _TestIntegerValue.test_create_neg

[babeltrace.git] / tests / lib / conds / utils.cpp

diff --git a/tests/lib/conds/utils.cpp b/tests/lib/conds/utils.cpp
index 3ea99597325b4007bc0de0f0dddcc14fc4f22318..7a70e72f4a01a372d7367a6608e700f2cf077416 100644 (file)
--- a/tests/lib/conds/utils.cpp
+++ b/tests/lib/conds/utils.cpp
@@ -4,88 +4,20 @@
  * Copyright (C) 2020 Philippe Proulx <pproulx@efficios.com>
  */
 
-#include <stdlib.h>
+#include <iostream>
+
+#include <glib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <assert.h>
+
 #include <babeltrace2/babeltrace.h>
-#include <glib.h>
 
 #include "common/assert.h"
-#include "utils.hpp"
-
-typedef void (*run_in_comp_cls_init_func)(bt_self_component *self_comp, void *user_data);
-
-struct comp_cls_init_method_data
-{
-    run_in_comp_cls_init_func func;
-    void *user_data;
-};
-
-static bt_component_class_initialize_method_status
-comp_cls_init(bt_self_component_source *self_comp, bt_self_component_source_configuration *conf,
-              const bt_value *params, void *init_method_data)
-{
-    comp_cls_init_method_data *data = static_cast<comp_cls_init_method_data *>(init_method_data);
-
-    /* Call user function which is expected to abort */
-    data->func(bt_self_component_source_as_self_component(self_comp), data->user_data);
-
-    /* Never reached! */
-    return BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_ERROR;
-}
-
-static bt_message_iterator_class_next_method_status
-msg_iter_cls_next(bt_self_message_iterator *self_msg_iter, bt_message_array_const msgs,
-                  uint64_t capacity, uint64_t *count)
-{
-    /* Not used */
-    return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR;
-}
+#include "cpp-common/vendor/nlohmann/json.hpp"
 
-static void run_in_comp_cls_init(run_in_comp_cls_init_func func, void *user_data)
-{
-    bt_message_iterator_class *msg_iter_cls;
-    bt_component_class_source *comp_cls;
-    bt_component_class_set_method_status set_method_status;
-    bt_graph *graph;
-    struct comp_cls_init_method_data init_method_data = {
-        .func = func,
-        .user_data = user_data,
-    };
-
-    /* Create component class */
-    msg_iter_cls = bt_message_iterator_class_create(msg_iter_cls_next);
-    BT_ASSERT(msg_iter_cls);
-    comp_cls = bt_component_class_source_create("yo", msg_iter_cls);
-    BT_ASSERT(comp_cls);
-    set_method_status = bt_component_class_source_set_initialize_method(comp_cls, comp_cls_init);
-    BT_ASSERT(set_method_status == BT_COMPONENT_CLASS_SET_METHOD_STATUS_OK);
-
-    /* Create graph */
-    graph = bt_graph_create(0);
-    BT_ASSERT(graph);
-
-    /*
-        * Add source component: this calls the initialization method,
-        * calling `func`.
-        */
-    (void) bt_graph_add_source_component_with_initialize_method_data(
-        graph, comp_cls, "whatever", NULL, &init_method_data, BT_LOGGING_LEVEL_NONE, NULL);
-
-    /*
-        * This point is not expected to be reached as func() is
-        * expected to abort.
-        */
-}
-
-static void run_in_comp_cls_init_defer(bt_self_component *self_comp, void *user_data)
-{
-    cond_trigger_run_in_comp_cls_init_func user_func =
-        reinterpret_cast<cond_trigger_run_in_comp_cls_init_func>(user_data);
-
-    user_func(self_comp);
-}
+#include "../utils/run-in.hpp"
+#include "utils.hpp"
 
 static void run_trigger(const struct cond_trigger *trigger)
 {
@@ -94,61 +26,39 @@ static void run_trigger(const struct cond_trigger *trigger)
         trigger->func.basic();
         break;
     case COND_TRIGGER_FUNC_TYPE_RUN_IN_COMP_CLS_INIT:
-        run_in_comp_cls_init(run_in_comp_cls_init_defer,
-                             reinterpret_cast<void *>(trigger->func.run_in_comp_cls_init));
+        runInCompClsInit(trigger->func.run_in_comp_cls_init);
         break;
     default:
         abort();
     }
 }
 
-static void escape_json_string(const char *str, GString *escaped_str)
-{
-    g_string_assign(escaped_str, "");
-
-    for (const char *ch = str; *ch; ch++) {
-        if (*ch == '\\' || *ch == '"') {
-            g_string_append_c(escaped_str, '\\');
-        }
-
-        g_string_append_c(escaped_str, *ch);
-    }
-}
-
 static void list_triggers(const struct cond_trigger triggers[], size_t trigger_count)
 {
-    GString *escaped_str = g_string_new(NULL);
-    size_t i;
-
-    BT_ASSERT(escaped_str);
-    printf("[");
+    nlohmann::json trigger_array = nlohmann::json::array();
 
-    for (i = 0; i < trigger_count; i++) {
-        const struct cond_trigger *trigger = &triggers[i];
+    for (size_t i = 0; i < trigger_count; i++) {
+        nlohmann::json trigger_obj = nlohmann::json::object();
+        const cond_trigger& trigger = triggers[i];
 
         /* Condition ID */
-        escape_json_string(trigger->cond_id, escaped_str);
-        printf("{\"cond-id\":\"%s\",", escaped_str->str);
+        trigger_obj["cond-id"] = trigger.cond_id;
 
         /* Name starts with condition ID */
-        printf("\"name\":\"%s", escaped_str->str);
+        std::string name = trigger.cond_id;
 
-        if (trigger->suffix) {
-            escape_json_string(trigger->suffix, escaped_str);
-            printf("-%s", escaped_str->str);
+        if (trigger.suffix) {
+            name += '-';
+            name += trigger.suffix;
         }
 
-        printf("\"}");
-
-        if (i < trigger_count - 1) {
-            /* Comma between objects */
-            printf(",");
-        }
+        trigger_obj["name"] = std::move(name);
+        trigger_array.push_back(std::move(trigger_obj));
     }
 
-    printf("]");
-    g_string_free(escaped_str, TRUE);
-    fflush(stdout);
+    auto str = trigger_array.dump();
+    std::cout << str;
+    std::flush(std::cout);
 }
 
 void cond_main(int argc, const char *argv[], const struct cond_trigger triggers[],