event-rule: userspace probe: rename get/set_name to get/set_event_name

[lttng-tools.git] / tests / unit / test_event_rule.c

diff --git a/tests/unit/test_event_rule.c b/tests/unit/test_event_rule.c
index 0e83850a77bc8f460ef09a21b9a0c484fb01529a..b92a10aac0b6e1a23814b742b2f8ca3490f11c7e 100644 (file)
--- a/tests/unit/test_event_rule.c
+++ b/tests/unit/test_event_rule.c
@@ -24,8 +24,8 @@
 #include <lttng/event-rule/syscall.h>
 #include <lttng/event-rule/tracepoint-internal.h>
 #include <lttng/event-rule/tracepoint.h>
-#include <lttng/event-rule/uprobe-internal.h>
-#include <lttng/event-rule/uprobe.h>
+#include <lttng/event-rule/userspace-probe-internal.h>
+#include <lttng/event-rule/userspace-probe.h>
 #include <lttng/event.h>
 #include <lttng/kernel-probe-internal.h>
 #include <lttng/kernel-probe.h>
@@ -37,7 +37,7 @@ int lttng_opt_quiet = 1;
 int lttng_opt_verbose;
 int lttng_opt_mi;
 
-#define NUM_TESTS 187
+#define NUM_TESTS 185
 
 struct tracepoint_test {
        enum lttng_domain_type type;
@@ -225,7 +225,7 @@ static void test_event_rule_syscall(void)
        lttng_event_rule_destroy(syscall_from_buffer);
 }
 
-static void test_event_rule_uprobe(void)
+static void test_event_rule_userspace_probe(void)
 {
        struct lttng_event_rule *uprobe = NULL;
        struct lttng_event_rule *uprobe_from_buffer = NULL;
@@ -261,14 +261,14 @@ static void test_event_rule_uprobe(void)
 
        lttng_payload_init(&payload);
 
-       uprobe = lttng_event_rule_uprobe_create();
+       uprobe = lttng_event_rule_userspace_probe_create();
        ok(uprobe, "uprobe event rule object creation.");
 
-       status = lttng_event_rule_uprobe_set_location(uprobe, probe_location);
+       status = lttng_event_rule_userspace_probe_set_location(uprobe, probe_location);
        ok(status == LTTNG_EVENT_RULE_STATUS_OK,
                        "Setting uprobe event rule location.");
 
-       status = lttng_event_rule_uprobe_get_location(
+       status = lttng_event_rule_userspace_probe_get_location(
                        uprobe, &probe_location_tmp);
        ok(status == LTTNG_EVENT_RULE_STATUS_OK,
                        "Getting uprobe event rule location.");
@@ -276,10 +276,10 @@ static void test_event_rule_uprobe(void)
                           probe_location, probe_location_tmp),
                        "Location is equal.");
 
-       status = lttng_event_rule_uprobe_set_name(uprobe, probe_name);
+       status = lttng_event_rule_userspace_probe_set_event_name(uprobe, probe_name);
        ok(status == LTTNG_EVENT_RULE_STATUS_OK,
                        "Setting uprobe event rule name: %s.", probe_name);
-       status = lttng_event_rule_uprobe_get_name(uprobe, &tmp);
+       status = lttng_event_rule_userspace_probe_get_event_name(uprobe, &tmp);
        ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting uprobe name.");
        ok(!strcmp(probe_name, tmp), "Uprobe name are equal.");
 
@@ -323,21 +323,18 @@ static void test_event_rule_kernel_probe_by_location(
 
        lttng_payload_init(&payload);
 
-       kprobe = lttng_event_rule_kernel_probe_create();
+       kprobe = lttng_event_rule_kernel_probe_create(location);
        ok(kprobe, "kprobe event rule object creation.");
 
-       status = lttng_event_rule_kernel_probe_set_location(kprobe, location);
-       ok(status == LTTNG_EVENT_RULE_STATUS_OK,
-                       "Setting kprobe event rule location.");
        status = lttng_event_rule_kernel_probe_get_location(kprobe, &_location);
        ok(status == LTTNG_EVENT_RULE_STATUS_OK,
                        "Getting kprobe event rule location.");
        ok(lttng_kernel_probe_location_is_equal(location, _location), "Locations are equal.");
 
-       status = lttng_event_rule_kernel_probe_set_name(kprobe, probe_name);
+       status = lttng_event_rule_kernel_probe_set_event_name(kprobe, probe_name);
        ok(status == LTTNG_EVENT_RULE_STATUS_OK,
                        "Setting kprobe event rule name: %s.", probe_name);
-       status = lttng_event_rule_kernel_probe_get_name(kprobe, &tmp);
+       status = lttng_event_rule_kernel_probe_get_event_name(kprobe, &tmp);
        ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Getting kprobe name.");
        ok(!strcmp(probe_name, tmp), "kprobe name are equal.");
 
@@ -383,7 +380,7 @@ int main(int argc, const char *argv[])
        plan_tests(NUM_TESTS);
        test_event_rule_tracepoint();
        test_event_rule_syscall();
-       test_event_rule_uprobe();
+       test_event_rule_userspace_probe();
        test_event_rule_kernel_probe();
        return exit_status();
 }