Nicer test output

Author: heimskr

include/test/Testing.h

@@ -23,8 +23,18 @@ namespace Game3 {
 			bool report(std::string_view, bool passed);
 
 			template <typename T, typename U>
-			bool expectEqual(T &&actual, U &&expected) {
-				std::string name = std::format("actual \"{}\" == expected \"{}\"", actual, expected);
+			bool expectEqual(const T &actual, const U &expected) {
+				if (actual == expected) {
+					pass(std::format("expect \"{}\"", expected));
+					return true;
+				} else {
+					fail(std::format("expect actual \"{}\" == expected \"{}\"", actual, expected));
+					return false;
+				}
+			}
+
+			template <typename T, typename U>
+			bool expectEqual(std::string_view name, T &&actual, U &&expected) {
 				return report(name, std::forward<T>(actual) == std::forward<U>(expected));
 			}
 

src/test/Testing.cpp

@@ -55,9 +55,17 @@ namespace Game3 {
 		if (good == 0 && bad == 0) {
 			WARN("No tests were run.");
 		} else if (good > 0 && bad == 0) {
-			SUCCESS("Summary: passed {} {}.", good, plural(good));
+			if (good == 1) {
+				SUCCESS("Summary: passed 1 test.");
+			} else {
+				SUCCESS("Summary: passed all {} tests.", good);
+			}
 		} else if (bad > 0 && good == 0) {
-			ERR("Summary: failed \e[31m{}\e[39m {}.", bad, plural(bad));
+			if (bad == 1) {
+				ERR("Summary: failed \e[31m1\e[39m test.");
+			} else {
+				ERR("Summary: failed all \e[31m{}\e[39m tests.", bad);
+			}
 		} else {
 			WARN("Summary: passed \e[32m{}\e[39m {} and failed \e[31m{}\e[39m {}.", good, plural(good), bad, plural(bad));
 		}

src/test/UString.cpp

@@ -53,13 +53,13 @@ namespace Game3 {
 				{
 					UString string = "Gangblanc, Gangblanc, give me your answer, do\nI'm half forswonk all for the code of you\nIt won't be a stylish shader\nI can't code up a trader\nBut you'll look cool without the tools\nOf a game engine built for three";
 					UString wrapped = string.wrap(renderer, 538, 0.5);
-					context.expectEqual(wrapped, "Gangblanc, Gangblanc, \ngive me your answer, \ndo\nI'm half forswonk all \nfor the code of you\nIt won't be a stylish \nshader\nI can't code up a tra-\nder\nBut you'll look cool \nwithout the tools\nOf a game engine bu-\nilt for three");
+					context.expectEqual("word wrapping", wrapped, "Gangblanc, Gangblanc, \ngive me your answer, \ndo\nI'm half forswonk all \nfor the code of you\nIt won't be a stylish \nshader\nI can't code up a tra-\nder\nBut you'll look cool \nwithout the tools\nOf a game engine bu-\nilt for three");
 				}
 
 				{
 					UString string = "\n\nGangblanc, Gangblanc, give me your answer, do\nI'm half forswonk all for the code of you\nIt won't be a stylish shader\nI can't code up a trader\nBut you'll look cool without the tools\nOf a game engine built for three\n \n";
 					UString wrapped = string.wrap(renderer, 538, 0.5);
-					context.expectEqual(wrapped, "\n\nGangblanc, Gangblanc, \ngive me your answer, \ndo\nI'm half forswonk all \nfor the code of you\nIt won't be a stylish \nshader\nI can't code up a tra-\nder\nBut you'll look cool \nwithout the tools\nOf a game engine bu-\nilt for three\n \n");
+					context.expectEqual("word wrapping with extra newlines", wrapped, "\n\nGangblanc, Gangblanc, \ngive me your answer, \ndo\nI'm half forswonk all \nfor the code of you\nIt won't be a stylish \nshader\nI can't code up a tra-\nder\nBut you'll look cool \nwithout the tools\nOf a game engine bu-\nilt for three\n \n");
 				}
 			}
 	};