X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_notification.c;h=a44c8ef6718b9ba4808e1387565617eb060c48d6;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=07aee734a2f56fd6d1e7d6a192bdb41e594f65e2;hpb=572cb877ebbbf616ac01a383f2dedd53d1a2ca02;p=lttng-tools.git

diff --git a/tests/unit/test_notification.c b/tests/unit/test_notification.c
index 07aee734a..a44c8ef67 100644
--- a/tests/unit/test_notification.c
+++ b/tests/unit/test_notification.c
@@ -5,26 +5,10 @@
  *
  * Copyright (C) 2017 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
  *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
-#include <assert.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <string.h>
@@ -40,14 +24,17 @@
 #include <lttng/notification/notification.h>
 #include <lttng/trigger/trigger.h>
 
+#include <common/macros.h>
+
 /* For error.h */
 int lttng_opt_quiet = 1;
 int lttng_opt_verbose;
 int lttng_opt_mi;
 
-#define NUM_TESTS 182
+#define NUM_TESTS 180
 
-void test_condition_buffer_usage(struct lttng_condition *buffer_usage_condition)
+static void test_condition_buffer_usage(
+		struct lttng_condition *buffer_usage_condition)
 {
 	enum lttng_condition_status status = LTTNG_CONDITION_STATUS_OK;
 	const char *session_name = NULL;
@@ -57,7 +44,7 @@ void test_condition_buffer_usage(struct lttng_condition *buffer_usage_condition)
 	double threshold_ratio;
 	uint64_t threshold_bytes;
 
-	assert(buffer_usage_condition);
+	LTTNG_ASSERT(buffer_usage_condition);
 
 	diag("Validating initialization");
 	status = lttng_condition_buffer_usage_get_threshold_ratio(buffer_usage_condition, &threshold_ratio);
@@ -261,8 +248,7 @@ void test_condition_buffer_usage(struct lttng_condition *buffer_usage_condition)
 	ok(domain_type == LTTNG_DOMAIN_UST, "Domain type is LTTNG_DOMAIN_UST");
 }
 
-
-void test_condition_buffer_usage_low(void)
+static void test_condition_buffer_usage_low(void)
 {
 	struct lttng_condition *buffer_usage_low = NULL;
 
@@ -277,7 +263,7 @@ void test_condition_buffer_usage_low(void)
 	lttng_condition_destroy(buffer_usage_low);
 }
 
-void test_condition_buffer_usage_high(void)
+static void test_condition_buffer_usage_high(void)
 {
 	struct lttng_condition *buffer_usage_high = NULL;
 
@@ -292,17 +278,7 @@ void test_condition_buffer_usage_high(void)
 	lttng_condition_destroy(buffer_usage_high);
 }
 
-void test_action(void)
-{
-	struct lttng_action *notify_action = NULL;
-
-	notify_action = lttng_action_notify_create();
-	ok(notify_action, "Create notify action");
-	ok(lttng_action_get_type(notify_action) == LTTNG_ACTION_TYPE_NOTIFY, "Action has type LTTNG_ACTION_TYPE_NOTIFY");
-	lttng_action_destroy(notify_action);
-}
-
-void test_trigger(void)
+static void test_trigger(void)
 {
 	struct lttng_action *notify_action = NULL;
 	struct lttng_condition *buffer_usage_high = NULL;
@@ -332,7 +308,6 @@ int main(int argc, const char *argv[])
 	plan_tests(NUM_TESTS);
 	test_condition_buffer_usage_low();
 	test_condition_buffer_usage_high();
-	test_action();
 	test_trigger();
 	return exit_status();
 }