X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_uri.cpp;h=d2ad04b0ce7a98a4b734ac3d83380f70ca7ed60e;hp=e89396e34ed28ebd7fa047221177d5492e953cb4;hb=HEAD;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f

diff --git a/tests/unit/test_uri.cpp b/tests/unit/test_uri.cpp
index e89396e34..41c74203d 100644
--- a/tests/unit/test_uri.cpp
+++ b/tests/unit/test_uri.cpp
@@ -5,12 +5,11 @@
  *
  */
 
-#include <string.h>
+#include <common/uri.hpp>
 
+#include <string.h>
 #include <tap/tap.h>
 
-#include <common/uri.hpp>
-
 /* For error.h */
 int lttng_opt_quiet = 1;
 int lttng_opt_verbose = 3;
@@ -19,160 +18,119 @@ int lttng_opt_mi;
 /* Number of TAP tests in this file */
 #define NUM_TESTS 11
 
-static void test_uri_parsing(void)
+static void test_uri_parsing()
 {
 	ssize_t size;
 	const char *s_uri1;
-	struct lttng_uri *uri = NULL;
+	struct lttng_uri *uri = nullptr;
 
 	s_uri1 = "net://localhost";
 
 	size = uri_parse(s_uri1, &uri);
 
-	ok(size == 2 &&
-	   uri[0].dtype == LTTNG_DST_IPV4 &&
-	   uri[0].utype == LTTNG_URI_DST &&
-	   uri[0].stype == 0 &&
-	   uri[0].port == 0 &&
-	   strlen(uri[0].subdir) == 0 &&
-	   strcmp(uri[0].dst.ipv4, "127.0.0.1") == 0 &&
-	   uri[1].dtype == LTTNG_DST_IPV4 &&
-	   uri[1].utype == LTTNG_URI_DST &&
-	   uri[1].stype == 0 &&
-	   uri[1].port == 0 &&
-	   strlen(uri[1].subdir) == 0 &&
-	   strcmp(uri[1].dst.ipv4, "127.0.0.1") == 0,
+	ok(size == 2 && uri[0].dtype == LTTNG_DST_IPV4 && uri[0].utype == LTTNG_URI_DST &&
+		   uri[0].stype == 0 && uri[0].port == 0 && strlen(uri[0].subdir) == 0 &&
+		   strcmp(uri[0].dst.ipv4, "127.0.0.1") == 0 && uri[1].dtype == LTTNG_DST_IPV4 &&
+		   uri[1].utype == LTTNG_URI_DST && uri[1].stype == 0 && uri[1].port == 0 &&
+		   strlen(uri[1].subdir) == 0 && strcmp(uri[1].dst.ipv4, "127.0.0.1") == 0,
 	   "URI set to net://localhost");
 
 	if (uri) {
 		uri_free(uri);
-		uri = NULL;
+		uri = nullptr;
 	}
 
 	s_uri1 = "net://localhost:8989:4242/my/test/path";
 
 	size = uri_parse(s_uri1, &uri);
 
-	ok(size == 2 &&
-	   uri[0].dtype == LTTNG_DST_IPV4 &&
-	   uri[0].utype == LTTNG_URI_DST &&
-	   uri[0].stype == 0 &&
-	   uri[0].port == 8989 &&
-	   strcmp(uri[0].subdir, "my/test/path") == 0 &&
-	   strcmp(uri[0].dst.ipv4, "127.0.0.1") == 0 &&
-	   uri[1].dtype == LTTNG_DST_IPV4 &&
-	   uri[1].utype == LTTNG_URI_DST &&
-	   uri[1].stype == 0 &&
-	   uri[1].port == 4242 &&
-	   strlen(uri[1].subdir) == 0 &&
-	   strcmp(uri[1].dst.ipv4, "127.0.0.1") == 0,
+	ok(size == 2 && uri[0].dtype == LTTNG_DST_IPV4 && uri[0].utype == LTTNG_URI_DST &&
+		   uri[0].stype == 0 && uri[0].port == 8989 &&
+		   strcmp(uri[0].subdir, "my/test/path") == 0 &&
+		   strcmp(uri[0].dst.ipv4, "127.0.0.1") == 0 && uri[1].dtype == LTTNG_DST_IPV4 &&
+		   uri[1].utype == LTTNG_URI_DST && uri[1].stype == 0 && uri[1].port == 4242 &&
+		   strlen(uri[1].subdir) == 0 && strcmp(uri[1].dst.ipv4, "127.0.0.1") == 0,
 	   "URI set to net://localhost:8989:4242/my/test/path");
 
 	if (uri) {
 		uri_free(uri);
-		uri = NULL;
+		uri = nullptr;
 	}
 
 	s_uri1 = "net://localhost:8989:4242";
 
 	size = uri_parse(s_uri1, &uri);
 
-	ok(size == 2 &&
-	   uri[0].dtype == LTTNG_DST_IPV4 &&
-	   uri[0].utype == LTTNG_URI_DST &&
-	   uri[0].stype == 0 &&
-	   uri[0].port == 8989 &&
-	   strlen(uri[0].subdir) == 0 &&
-	   strcmp(uri[0].dst.ipv4, "127.0.0.1") == 0 &&
-	   uri[1].dtype == LTTNG_DST_IPV4 &&
-	   uri[1].utype == LTTNG_URI_DST &&
-	   uri[1].stype == 0 &&
-	   uri[1].port == 4242 &&
-	   strlen(uri[1].subdir) == 0 &&
-	   strcmp(uri[1].dst.ipv4, "127.0.0.1") == 0,
+	ok(size == 2 && uri[0].dtype == LTTNG_DST_IPV4 && uri[0].utype == LTTNG_URI_DST &&
+		   uri[0].stype == 0 && uri[0].port == 8989 && strlen(uri[0].subdir) == 0 &&
+		   strcmp(uri[0].dst.ipv4, "127.0.0.1") == 0 && uri[1].dtype == LTTNG_DST_IPV4 &&
+		   uri[1].utype == LTTNG_URI_DST && uri[1].stype == 0 && uri[1].port == 4242 &&
+		   strlen(uri[1].subdir) == 0 && strcmp(uri[1].dst.ipv4, "127.0.0.1") == 0,
 	   "URI set to net://localhost:8989:4242");
 
 	if (uri) {
 		uri_free(uri);
-		uri = NULL;
+		uri = nullptr;
 	}
 
 	s_uri1 = "net6://[::1]:8989";
 
 	size = uri_parse(s_uri1, &uri);
 
-	ok(size == 2 &&
-	   uri[0].dtype == LTTNG_DST_IPV6 &&
-	   uri[0].utype == LTTNG_URI_DST &&
-	   uri[0].stype == 0 &&
-	   uri[0].port == 8989 &&
-	   strlen(uri[0].subdir) == 0 &&
-	   strcmp(uri[0].dst.ipv6, "::1") == 0 &&
-	   uri[1].dtype == LTTNG_DST_IPV6 &&
-	   uri[1].utype == LTTNG_URI_DST &&
-	   uri[1].stype == 0 &&
-	   uri[1].port == 0 &&
-	   strlen(uri[1].subdir) == 0 &&
-	   strcmp(uri[1].dst.ipv6, "::1") == 0,
+	ok(size == 2 && uri[0].dtype == LTTNG_DST_IPV6 && uri[0].utype == LTTNG_URI_DST &&
+		   uri[0].stype == 0 && uri[0].port == 8989 && strlen(uri[0].subdir) == 0 &&
+		   strcmp(uri[0].dst.ipv6, "::1") == 0 && uri[1].dtype == LTTNG_DST_IPV6 &&
+		   uri[1].utype == LTTNG_URI_DST && uri[1].stype == 0 && uri[1].port == 0 &&
+		   strlen(uri[1].subdir) == 0 && strcmp(uri[1].dst.ipv6, "::1") == 0,
 	   "URI set to net6://[::1]:8989");
 
 	if (uri) {
 		uri_free(uri);
-		uri = NULL;
+		uri = nullptr;
 	}
 
 	s_uri1 = "tcp://42.42.42.42/my/test/path";
 
 	size = uri_parse(s_uri1, &uri);
 
-	ok(size == 1 &&
-	   uri[0].dtype == LTTNG_DST_IPV4 &&
-	   uri[0].utype == LTTNG_URI_DST &&
-	   uri[0].stype == 0 &&
-	   uri[0].port == 0 &&
-	   strcmp(uri[0].subdir, "my/test/path") == 0 &&
-	   strcmp(uri[0].dst.ipv4, "42.42.42.42") == 0,
+	ok(size == 1 && uri[0].dtype == LTTNG_DST_IPV4 && uri[0].utype == LTTNG_URI_DST &&
+		   uri[0].stype == 0 && uri[0].port == 0 &&
+		   strcmp(uri[0].subdir, "my/test/path") == 0 &&
+		   strcmp(uri[0].dst.ipv4, "42.42.42.42") == 0,
 	   "URI set to tcp://42.42.42.42/my/test/path");
 
 	if (uri) {
 		uri_free(uri);
-		uri = NULL;
+		uri = nullptr;
 	}
 
 	s_uri1 = "tcp6://[fe80::f66d:4ff:fe53:d220]/my/test/path";
 
 	size = uri_parse(s_uri1, &uri);
 
-	ok(size == 1 &&
-	   uri[0].dtype == LTTNG_DST_IPV6 &&
-	   uri[0].utype == LTTNG_URI_DST &&
-	   uri[0].stype == 0 &&
-	   uri[0].port == 0 &&
-	   strcmp(uri[0].subdir, "my/test/path") == 0 &&
-	   strcmp(uri[0].dst.ipv6, "fe80::f66d:4ff:fe53:d220") == 0,
+	ok(size == 1 && uri[0].dtype == LTTNG_DST_IPV6 && uri[0].utype == LTTNG_URI_DST &&
+		   uri[0].stype == 0 && uri[0].port == 0 &&
+		   strcmp(uri[0].subdir, "my/test/path") == 0 &&
+		   strcmp(uri[0].dst.ipv6, "fe80::f66d:4ff:fe53:d220") == 0,
 	   "URI set to tcp6://[fe80::f66d:4ff:fe53:d220]/my/test/path");
 
 	if (uri) {
 		uri_free(uri);
-		uri = NULL;
+		uri = nullptr;
 	}
 
 	s_uri1 = "file:///my/test/path";
 
 	size = uri_parse(s_uri1, &uri);
 
-	ok(size == 1 &&
-	   uri[0].dtype == LTTNG_DST_PATH &&
-	   uri[0].utype == LTTNG_URI_DST &&
-	   uri[0].stype == 0 &&
-	   uri[0].port == 0 &&
-	   strlen(uri[0].subdir) == 0 &&
-	   strcmp(uri[0].dst.path, "/my/test/path") == 0,
+	ok(size == 1 && uri[0].dtype == LTTNG_DST_PATH && uri[0].utype == LTTNG_URI_DST &&
+		   uri[0].stype == 0 && uri[0].port == 0 && strlen(uri[0].subdir) == 0 &&
+		   strcmp(uri[0].dst.path, "/my/test/path") == 0,
 	   "URI set to file:///my/test/path");
 
 	if (uri) {
 		uri_free(uri);
-		uri = NULL;
+		uri = nullptr;
 	}
 
 	/* FIXME: Noisy on stdout */
@@ -187,7 +145,7 @@ static void test_uri_parsing(void)
 	LTTNG_ASSERT(!uri);
 }
 
-static void test_uri_cmp(void)
+static void test_uri_cmp()
 {
 	struct lttng_uri *uri1, *uri2;
 	const char *s_uri1 = "net://localhost";
@@ -230,19 +188,17 @@ static void test_uri_cmp(void)
 
 	res = uri_compare(uri1, uri1);
 
-	ok(res == 0,
-	   "URI compare net://localhost == net://localhost");
+	ok(res == 0, "URI compare net://localhost == net://localhost");
 
 	res = uri_compare(uri1, uri2);
 
-	ok(res != 0,
-	   "URI compare net://localhost != net://localhost:8989:4242");
+	ok(res != 0, "URI compare net://localhost != net://localhost:8989:4242");
 
 	uri_free(uri1);
 	uri_free(uri2);
 }
 
-int main(void)
+int main()
 {
 	plan_tests(NUM_TESTS);