X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_event_rule.c;h=72c37709faab7d5346e5fe6221ea2a974b231f7b;hp=0e83850a77bc8f460ef09a21b9a0c484fb01529a;hb=10685de6af924c0ea83e451697639ed9c16586cc;hpb=a3c516531ffff69b8d5f6564c8e4d00b4f18e7da

diff --git a/tests/unit/test_event_rule.c b/tests/unit/test_event_rule.c
index 0e83850a7..72c37709f 100644
--- 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 184
 
 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,10 @@ static void test_event_rule_uprobe(void)
 
 	lttng_payload_init(&payload);
 
-	uprobe = lttng_event_rule_uprobe_create();
+	uprobe = lttng_event_rule_userspace_probe_create(probe_location);
 	ok(uprobe, "uprobe event rule object creation.");
 
-	status = lttng_event_rule_uprobe_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 +272,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 +319,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 +376,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();
 }