Util+Test: Separate formatting and printing into different files

test/unit/testutilformat.cpp

@@ -22,44 +22,44 @@ TEST_CASE(FormatBasicTypes)
 {
 	std::string result;
 
-	strln(result, "");
+	result = Util::format("");
 	EXPECT_EQ(result, "");
 
-	strln(result, "{}", nullptr);
+	result = Util::format("{}", nullptr);
 	EXPECT_EQ(result, "(nil)");
 
 	int* number = new int(3);
-	strln(result, "{}", number);
+	result = Util::format("{}", number);
 	EXPECT_EQ(result.substr(0, 2), "0x");
 
-	strln(result, "{}", true);
+	result = Util::format("{}", true);
 	EXPECT_EQ(result, "true");
 
-	strln(result, "{}", false);
+	result = Util::format("{}", false);
 	EXPECT_EQ(result, "false");
 
-	strln(result, "{}", 'c');
+	result = Util::format("{}", 'c');
 	EXPECT_EQ(result, "c");
 
 	const char* cString = "C string";
-	strln(result, "{}", cString);
+	result = Util::format("{}", cString);
 	EXPECT_EQ(result, "C string");
 
 	std::string string = "string";
-	strln(result, "{}", string);
+	result = Util::format("{}", string);
 	EXPECT_EQ(result, "string");
 
 	std::string_view stringView = "string_view";
-	strln(result, "{}", stringView);
+	result = Util::format("{}", stringView);
 	EXPECT_EQ(result, "string_view");
 
-	strln(result, "{} {}", "Hello", "World");
+	result = Util::format("{} {}", "Hello", "World");
 	EXPECT_EQ(result, "Hello World");
 
-	strln(result, "{{escaped braces}}");
+	result = Util::format("{{escaped braces}}");
 	EXPECT_EQ(result, "{escaped braces}");
 
-	strln(result, "{{braces{}}}", "Something");
+	result = Util::format("{{braces{}}}", "Something");
 	EXPECT_EQ(result, "{bracesSomething}");
 }
 
@@ -68,35 +68,35 @@ TEST_CASE(FormatNumbers)
 	std::string result;
 
 	int32_t i32 = 68766;
-	strln(result, "{}", i32); // int
+	result = Util::format("{}", i32); // int
 	EXPECT_EQ(result, "68766");
 
 	uint32_t u32 = 123841; // unsigned int
-	strln(result, "{}", u32);
+	result = Util::format("{}", u32);
 	EXPECT_EQ(result, "123841");
 
 	int64_t i64 = 237942768427; // long int
-	strln(result, "{}", i64);
+	result = Util::format("{}", i64);
 	EXPECT_EQ(result, "237942768427");
 
 	size_t u64 = 1337; // long unsigned int
-	strln(result, "{}", u64);
+	result = Util::format("{}", u64);
 	EXPECT_EQ(result, "1337");
 
 	float f32R = 245789.70000;
-	strln(result, "{}", f32R);
+	result = Util::format("{}", f32R);
 	EXPECT_EQ(result, "245789.7");
 
 	float f32 = 45645.3233;
-	strln(result, "{}", f32);
+	result = Util::format("{}", f32);
 	EXPECT_EQ(result, "45645.324219");
 
 	double f64 = 87522.300000000;
-	strln(result, "{}", f64);
+	result = Util::format("{}", f64);
 	EXPECT_EQ(result, "87522.3");
 
 	double pi = 3.14159265359;
-	strln(result, "{:.15}", pi);
+	result = Util::format("{:.15}", pi);
 	EXPECT_EQ(result, "3.14159265359");
 }
 
@@ -105,7 +105,7 @@ TEST_CASE(FormatContainers)
 	std::string result;
 
 	std::vector<std::string> vector { "thing1", "thing2", "thing3" };
-	strln(result, "{}", vector);
+	result = Util::format("{}", vector);
 	EXPECT_EQ(result, R"({
     thing1,
     thing2,
@@ -113,7 +113,7 @@ TEST_CASE(FormatContainers)
 })");
 
 	std::map<std::string, int> map { { "thing3", 3 }, { "thing2", 2 }, { "thing1", 1 } };
-	strln(result, "{}", map);
+	result = Util::format("{}", map);
 	EXPECT_EQ(result, R"({
     "thing1": 1,
     "thing2": 2,
@@ -126,7 +126,7 @@ TEST_CASE(FormatContainers)
 		{ "thing1", "thing2", "thing3" },
 		{ "thing1", "thing2", "thing3" }
 	};
-	strln(result, "{}", twoDimensionalVector);
+	result = Util::format("{}", twoDimensionalVector);
 	EXPECT_EQ(result, R"({
     {
     thing1,