From 26587adae4f5ec61d03fd7075805a24b29107fe3 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Thu, 25 Feb 2021 18:34:00 +0100
Subject: Small testing suite improvements

---
 apps/test.c | 62 ++++++++++++++++++++++++++-----------------------------------
 1 file changed, 26 insertions(+), 36 deletions(-)

(limited to 'apps')

diff --git a/apps/test.c b/apps/test.c
index a44451c..6e4abde 100644
--- a/apps/test.c
+++ b/apps/test.c
@@ -12,10 +12,11 @@
 #define a_mag 0x55
 #define b_mag 0x42
 
-#define check(exp) pass_or_fail(__FILE__, __LINE__, __func__, #exp, "1", exp);
-#define equals(first, second)                                                                      \
+#define TEST(name) static void test_##name(void)
+#define CHECK(exp) pass_or_fail(__FILE__, __LINE__, __func__, #exp, "1", exp);
+#define EQUALS(first, second)                                                                      \
 	pass_or_fail(__FILE__, __LINE__, __func__, #first, #second, (first) == (second));
-#define equals_str(first, second)                                                                  \
+#define EQUALS_STR(first, second)                                                                  \
 	pass_or_fail(__FILE__, __LINE__, __func__, #first, #second, strcmp((first), (second)) == 0);
 
 static u32 failed;
@@ -28,66 +29,55 @@ static void pass_or_fail(const char *file_name, int line_num, const char *func,
 	    line_num, func, first, second);
 }
 
-static void test_malloc()
+TEST(math)
 {
-	// TODO: More tests!
-	/* u32 *a = malloc(a_mag); */
-	/* u32 *b = malloc(b_mag); */
-	/* equals(a[-1], a_mag); */
-	/* equals(a[a_mag], b_mag); */
-	/* equals(b[-1], b_mag); */
+	EQUALS(pow(2, 3), 8);
+	EQUALS(pow(0, 3), 0);
+	EQUALS(pow(0, 0), 1);
 }
 
-static void test_math()
-{
-	equals(pow(2, 3), 8);
-	equals(pow(0, 3), 0);
-	equals(pow(0, 0), 1);
-}
-
-static void test_conv()
+TEST(conv)
 {
 	char buf1[1] = { 0 };
 	char buf2[7] = { 0 };
 	char buf3[5] = { 0 };
 	char buf4[3] = { 0 };
-	equals(atoi("42"), 42);
-	equals_str(htoa(0x42), "42");
-	equals(htoi("42"), 0x42);
-	equals_str(itoa(42), "42");
-	equals_str(conv_base(42, buf1, 0, 0), "");
-	equals_str(conv_base(42, buf2, 2, 0), "101010");
-	equals_str(conv_base(424242, buf3, 36, 0), "93ci");
-	equals_str(conv_base(0xffffffff, buf4, 10, 1), "-1");
+	EQUALS(atoi("42"), 42);
+	EQUALS_STR(htoa(0x42), "42");
+	EQUALS(htoi("42"), 0x42);
+	EQUALS_STR(itoa(42), "42");
+	EQUALS_STR(conv_base(42, buf1, 0, 0), "");
+	EQUALS_STR(conv_base(42, buf2, 2, 0), "101010");
+	EQUALS_STR(conv_base(424242, buf3, 36, 0), "93ci");
+	EQUALS_STR(conv_base(0xffffffff, buf4, 10, 1), "-1");
 }
 
-static void test_mem()
+TEST(mem)
 {
 	const char *str0 = "";
 	const char *str1 = "";
 	const char *str2 = "12345";
 	const char *str3 = "12345";
 	const char *str4 = "12354";
-	equals(memcmp(str4, str2, strlen(str2)), 1);
-	equals(memcmp(str2, str4, strlen(str2)), -1);
-	equals(memcmp(str2, str3, strlen(str2)), 0);
-	equals(memcmp(str0, str1, strlen(str0)), 0);
-	equals(memcmp(NULL, NULL, 0), 0);
+	EQUALS(memcmp(str4, str2, strlen(str2)), 1);
+	EQUALS(memcmp(str2, str4, strlen(str2)), -1);
+	EQUALS(memcmp(str2, str3, strlen(str2)), 0);
+	EQUALS(memcmp(str0, str1, strlen(str0)), 0);
+	EQUALS(memcmp(NULL, NULL, 0), 0);
 
 	char buf[6] = { 0 };
-	equals_str(memcpy(buf, "hallo", 6), "hallo");
+	EQUALS_STR(memcpy(buf, "hallo", 6), "hallo");
 
 	char buf2[6] = { 0 };
-	equals_str(memset(buf2, 'x', 5), "xxxxx");
+	EQUALS_STR(memset(buf2, 'x', 5), "xxxxx");
 }
 
-int main()
+int main(void)
 {
 	// Serial connection
 	serial_install();
 	serial_print("\nConnected testing.\n");
 
-	test_malloc();
 	test_math();
 	test_conv();
 	test_mem();
-- 
cgit v1.2.3