Fix: tap.h conflicts with Clang C++ headers

[lttng-tools.git] / tests / unit / test_uuid.cpp

diff --git a/tests/unit/test_uuid.cpp b/tests/unit/test_uuid.cpp
index 2355084a51748fefd2137bb67e5745ce38f8822b..3ead2a254360a95db5d2d82ff291ede82eb57e4d 100644 (file)
--- a/tests/unit/test_uuid.cpp
+++ b/tests/unit/test_uuid.cpp
@@ -9,9 +9,9 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include <tap/tap.h>
+#include "common/uuid.hpp"
 
-#include "common/uuid.h"
+#include <tap/tap.h>
 
 #define NR_TESTS 21
 
@@ -108,24 +108,27 @@ void run_test_lttng_uuid_is_equal(void)
        int ret;
        lttng_uuid uuid1, uuid2;
 
-       lttng_uuid_from_str(valid_str_1, uuid1);
-       lttng_uuid_from_str(valid_str_1, uuid2);
-       ret = lttng_uuid_is_equal(uuid1, uuid2);
+       ret = lttng_uuid_from_str(valid_str_1, uuid1);
+       assert(ret == 0);
+       ret = lttng_uuid_from_str(valid_str_1, uuid2);
+       assert(ret == 0);
+       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 = lttng_uuid_from_str(valid_str_2, uuid2);
+       assert(ret == 0);
+       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 +142,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