X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_condition.c;h=6183cd744e2d5bec0f7317f898920499b2d45227;hb=695f70446965aeac8b1118bb08d572630c96114d;hp=4f48187431537191872e66337112613bd8d00e40;hpb=d602bd6a8ee25d5ca662dde4edb3db3cabf264e1;p=lttng-tools.git

diff --git a/tests/unit/test_condition.c b/tests/unit/test_condition.c
index 4f4818743..6183cd744 100644
--- a/tests/unit/test_condition.c
+++ b/tests/unit/test_condition.c
@@ -18,10 +18,12 @@
 #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/event-rule.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>
 #include <common/buffer-view.h>
 
@@ -45,34 +47,41 @@ void test_condition_event_rule(void)
 	const char *pattern="my_event_*";
 	const char *filter="msg_id == 23 && size >= 2048";
 	const char *exclusions[] = { "my_event_test1", "my_event_test2", "my_event_test3" };
+	struct lttng_log_level_rule *log_level_rule_at_least_as_severe = NULL;
 	struct lttng_payload buffer;
 
 	lttng_payload_init(&buffer);
 
-	tracepoint = lttng_event_rule_tracepoint_create(LTTNG_DOMAIN_UST);
-	ok(tracepoint, "tracepoint UST_DOMAIN");
+	/* Create log level rule. */
+	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);
 
-	status = lttng_event_rule_tracepoint_set_pattern(tracepoint, pattern);
+	tracepoint = lttng_event_rule_user_tracepoint_create();
+	ok(tracepoint, "user tracepoint");
+
+	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_range_lower_bound(
-			tracepoint, LTTNG_LOGLEVEL_WARNING);
+	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");
@@ -98,6 +107,7 @@ void test_condition_event_rule(void)
 	lttng_event_rule_destroy(tracepoint);
 	lttng_condition_destroy(condition);
 	lttng_condition_destroy(condition_from_buffer);
+	lttng_log_level_rule_destroy(log_level_rule_at_least_as_severe);
 }
 
 int main(int argc, const char *argv[])