X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_utils_parse_time_suffix.cpp;h=765c96fb5d01bb96c7509d1c0f167a3803c4cb8f;hp=89fab12eb1ed72e3d7235543fa83acb6fbfe8bf6;hb=HEAD;hpb=9f4a25d35d037cbb5d8aeb50f9e8fa10748a4d14

diff --git a/tests/unit/test_utils_parse_time_suffix.cpp b/tests/unit/test_utils_parse_time_suffix.cpp
index 89fab12eb..12185830f 100644
--- a/tests/unit/test_utils_parse_time_suffix.cpp
+++ b/tests/unit/test_utils_parse_time_suffix.cpp
@@ -1,95 +1,77 @@
 /*
- * Copyright (C) 2015 Simon Marchi <simon.marchi@polymtl.ca>
+ * Copyright (C) 2015 EfficiOS Inc.
  *
  * SPDX-License-Identifier: GPL-2.0-only
  *
  */
 
-#include <string.h>
-#include <stdio.h>
-#include <inttypes.h>
+#include <common/utils.hpp>
 
+#include <inttypes.h>
+#include <stdio.h>
+#include <string.h>
 #include <tap/tap.h>
 
-#include <common/utils.h>
-
 /* For error.h */
 int lttng_opt_quiet = 1;
 int lttng_opt_verbose = 3;
 int lttng_opt_mi;
 
+namespace {
 struct valid_test_input {
 	const char *input;
 	uint64_t expected_result;
 };
 
 /* Valid test cases */
-static struct valid_test_input valid_tests_inputs[] = {
-		{ "0", 0 },
-		{ "1234", 1234 },
-		{ "1234us", 1234 },
-		{ "16ms", 16000 },
-		{ "128ms", 128000 },
-		{ "32s", 32000000 },
-		{ "1m", 60000000 },
-		{ "20m", 1200000000 },
-		{ "1h", 3600000000 },
-		{ "5h", 18000000000 },
-		{ "00", 0 },
-		{ "0us", 0 },
-		{ "0ms", 0 },
-		{ "0s", 0 },
-		{ "0m", 0 },
-		{ "0h", 0 },
-		{ "00us", 0 },
-		{ "00ms", 0 },
-		{ "00s", 0 },
-		{ "00m", 0 },
-		{ "00h", 0 },
-		{ "12ms", 12000 },
-		{ "3597us", 3597 },
-		{ "+5", 5 },
-		{ "08", 8 },
-		{ "0145us", 145 },
+struct valid_test_input valid_tests_inputs[] = {
+	{ "0", 0 },	      { "1234", 1234 },	     { "1234us", 1234 }, { "16ms", 16000 },
+	{ "128ms", 128000 },  { "32s", 32000000 },   { "1m", 60000000 }, { "20m", 1200000000 },
+	{ "1h", 3600000000 }, { "5h", 18000000000 }, { "00", 0 },	 { "0us", 0 },
+	{ "0ms", 0 },	      { "0s", 0 },	     { "0m", 0 },	 { "0h", 0 },
+	{ "00us", 0 },	      { "00ms", 0 },	     { "00s", 0 },	 { "00m", 0 },
+	{ "00h", 0 },	      { "12ms", 12000 },     { "3597us", 3597 }, { "+5", 5 },
+	{ "08", 8 },	      { "0145us", 145 },
 };
-static const int num_valid_tests = sizeof(valid_tests_inputs) / sizeof(valid_tests_inputs[0]);
+const int num_valid_tests = sizeof(valid_tests_inputs) / sizeof(valid_tests_inputs[0]);
 
 /* Invalid test cases */
-static const char *invalid_tests_inputs[] = {
-		"",
-		" ",
-		"-1",
-		"m",
-		"4611686018427387904s",
-		"0x40M",
-		"0x",
-		"x0",
-		"0xx0",
-		"07mm",
-		"0xm",
-		"0Xs",
-		"0x0ss",
-		"0a",
-		"0B",
-		"0x3 s",
-		"0xbs ",
-		"14ns",
-		"0xbs",
-		"14ns",
-		"14ms garbage after value",
-		"0x14s",
-		"0u",
-		"5mS",
-		"5Ms",
-		"12ussr",
-		"67msrp",
-		"14si",
-		"12mo",
-		"53hi",
+const char *invalid_tests_inputs[] = {
+	"",
+	" ",
+	"-1",
+	"m",
+	"4611686018427387904s",
+	"0x40M",
+	"0x",
+	"x0",
+	"0xx0",
+	"07mm",
+	"0xm",
+	"0Xs",
+	"0x0ss",
+	"0a",
+	"0B",
+	"0x3 s",
+	"0xbs ",
+	"14ns",
+	"0xbs",
+	"14ns",
+	"14ms garbage after value",
+	"0x14s",
+	"0u",
+	"5mS",
+	"5Ms",
+	"12ussr",
+	"67msrp",
+	"14si",
+	"12mo",
+	"53hi",
 };
-static const int num_invalid_tests = sizeof(invalid_tests_inputs) / sizeof(invalid_tests_inputs[0]);
+const int num_invalid_tests = sizeof(invalid_tests_inputs) / sizeof(invalid_tests_inputs[0]);
+} /* namespace */
 
-static void test_utils_parse_time_suffix(void)
+static void test_utils_parse_time_suffix()
 {
 	uint64_t result;
 	int ret;
@@ -100,7 +82,10 @@ static void test_utils_parse_time_suffix(void)
 		char name[256];
 
 		ret = utils_parse_time_suffix(valid_tests_inputs[i].input, &result);
-		sprintf(name, "valid test case: %s expected %" PRIu64, valid_tests_inputs[i].input, result);
+		sprintf(name,
+			"valid test case: %s expected %" PRIu64,
+			valid_tests_inputs[i].input,
+			result);
 		ok(ret == 0 && result == valid_tests_inputs[i].expected_result, "%s", name);
 	}
 
@@ -115,7 +100,7 @@ static void test_utils_parse_time_suffix(void)
 	}
 }
 
-int main(int argc, char **argv)
+int main()
 {
 	plan_tests(num_valid_tests + num_invalid_tests);