X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Funit%2Ftest_uuid.cpp;h=403e1f0ea22a841da69ca3aca80687f745e07f6a;hb=328c2fe7297c941aa9cbcfa4ce944fca1bd7300f;hp=2355084a51748fefd2137bb67e5745ce38f8822b;hpb=f46376a14da2eb796690cb4e718e8b213839d6ea;p=lttng-tools.git

diff --git a/tests/unit/test_uuid.cpp b/tests/unit/test_uuid.cpp
index 2355084a5..403e1f0ea 100644
--- a/tests/unit/test_uuid.cpp
+++ b/tests/unit/test_uuid.cpp
@@ -11,7 +11,7 @@
 
 #include <tap/tap.h>
 
-#include "common/uuid.h"
+#include "common/uuid.hpp"
 
 #define NR_TESTS 21
 
@@ -110,22 +110,22 @@ void run_test_lttng_uuid_is_equal(void)
 
 	lttng_uuid_from_str(valid_str_1, uuid1);
 	lttng_uuid_from_str(valid_str_1, uuid2);
-	ret = lttng_uuid_is_equal(uuid1, uuid2);
+	ret = uuid1 == uuid2;
 	ok(ret == true, "lttng_uuid_is_equal - Compare same UUID, expect success");
 
 	lttng_uuid_from_str(valid_str_2, uuid2);
-	ret = lttng_uuid_is_equal(uuid1, uuid2);
+	ret = uuid1 == uuid2;
 	ok(ret == false, "lttng_uuid_is_equal - Compare different UUID, expect failure");
 }
 
 static
 void run_test_lttng_uuid_copy(void)
 {
-	int ret;
+	bool ret;
 	lttng_uuid uuid1;
 
-	lttng_uuid_copy(uuid1, valid_uuid_1);
-	ret = lttng_uuid_is_equal(uuid1, valid_uuid_1);
+	uuid1 = valid_uuid_1;
+	ret = uuid1 == valid_uuid_1;
 
 	ok(ret == true, "lttng_uuid_copy - Compare copied UUID with source, expect success");
 }
@@ -139,7 +139,7 @@ void run_test_lttng_uuid_generate(void)
 	lttng_uuid_generate(uuid1);
 	lttng_uuid_generate(uuid2);
 
-	ok(lttng_uuid_is_equal(uuid1, uuid2) == false, "lttng_uuid_generate - Generated UUIDs are different");
+	ok(uuid1 != uuid2, "lttng_uuid_generate - Generated UUIDs are different");
 
 	/*
 	 * Set the two most significant bits (bits 6 and 7) of the