X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_condition.c;h=1ed14fa6c3f502a02ba5e960cdbdbbc187ef0d8f;hb=02c3d2c2e3b27ab0bad1207c70465f84b649c816;hp=864c6a840eff692080df098c4186061576189903;hpb=85b053182c4e300c717483ad231f5c04cbf5e4b7;p=lttng-tools.git

diff --git a/tests/unit/test_condition.c b/tests/unit/test_condition.c
index 864c6a840..1ed14fa6c 100644
--- a/tests/unit/test_condition.c
+++ b/tests/unit/test_condition.c
@@ -9,7 +9,6 @@
  *
  */
 
-#include <assert.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <string.h>
@@ -18,9 +17,10 @@
 #include <tap/tap.h>
 
 #include <lttng/event.h>
-#include <lttng/event-rule/tracepoint.h>
+#include <lttng/event-rule/user-tracepoint.h>
 #include <lttng/condition/condition-internal.h>
-#include <lttng/condition/on-event.h>
+#include <lttng/condition/event-rule-matches.h>
+#include <lttng/condition/event-rule-matches-internal.h>
 #include <lttng/domain.h>
 #include <lttng/log-level-rule.h>
 #include <common/dynamic-buffer.h>
@@ -55,32 +55,32 @@ void test_condition_event_rule(void)
 	log_level_rule_at_least_as_severe =
 			lttng_log_level_rule_at_least_as_severe_as_create(
 					LTTNG_LOGLEVEL_WARNING);
-	assert(log_level_rule_at_least_as_severe);
+	LTTNG_ASSERT(log_level_rule_at_least_as_severe);
 
-	tracepoint = lttng_event_rule_tracepoint_create(LTTNG_DOMAIN_UST);
-	ok(tracepoint, "tracepoint UST_DOMAIN");
+	tracepoint = lttng_event_rule_user_tracepoint_create();
+	ok(tracepoint, "user tracepoint");
 
-	status = lttng_event_rule_tracepoint_set_pattern(tracepoint, pattern);
+	status = lttng_event_rule_user_tracepoint_set_name_pattern(tracepoint, pattern);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Setting pattern");
 
-	status = lttng_event_rule_tracepoint_set_filter(tracepoint, filter);
+	status = lttng_event_rule_user_tracepoint_set_filter(tracepoint, filter);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Setting filter");
 
-	status = lttng_event_rule_tracepoint_set_log_level_rule(
+	status = lttng_event_rule_user_tracepoint_set_log_level_rule(
 			tracepoint, log_level_rule_at_least_as_severe);
 	ok(status == LTTNG_EVENT_RULE_STATUS_OK, "Setting log level range");
 
 	for (i = 0; i < 3; i++) {
-		status = lttng_event_rule_tracepoint_add_exclusion(
+		status = lttng_event_rule_user_tracepoint_add_name_pattern_exclusion(
 				tracepoint, exclusions[i]);
 		ok(status == LTTNG_EVENT_RULE_STATUS_OK,
 				"Setting exclusion pattern");
 	}
 
-	condition = lttng_condition_on_event_create(tracepoint);
+	condition = lttng_condition_event_rule_matches_create(tracepoint);
 	ok(condition, "Created condition");
 
-	condition_status = lttng_condition_on_event_get_rule(
+	condition_status = lttng_condition_event_rule_matches_get_rule(
 			condition, &tracepoint_tmp);
 	ok(condition_status == LTTNG_CONDITION_STATUS_OK,
 			"Getting event rule from event rule condition");