X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fmware%2Fsprintf_test.c;h=6aaeef91c34c0225e0ae95832127a0454f15729b;hb=72c5f5cde2bc9ffe5427d65bb8f798bf8c4a0cce;hp=60958fc5308d4df93b308ce5e31171d47f9c78db;hpb=760437314c9e9af5fad596121de78c332129d2f5;p=bertos.git

diff --git a/bertos/mware/sprintf_test.c b/bertos/mware/sprintf_test.c
index 60958fc5..6aaeef91 100644
--- a/bertos/mware/sprintf_test.c
+++ b/bertos/mware/sprintf_test.c
@@ -36,7 +36,7 @@
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
 
-
+#include "formatwr.h"
 #include <cfg/compiler.h>
 #include <cfg/test.h>
 #include <cfg/debug.h>
@@ -47,28 +47,31 @@
 
 #include <string.h> /* strcmp() */
 
-#warning FIXME:Review and refactor this test..
 
-#if UNIT_TEST
-#include "sprintf.c"
-#include "formatwr.c"
-#include "hex.c"
+int sprintf_testSetup(void)
+{
+	kdbg_init();
+	return 0;
+}
 
-int main(void)
+int sprintf_testRun(void)
 {
 	char buf[256];
 	static const char test_string[] = "Hello, world!\n";
 	static const pgm_char test_string_pgm[] = "Hello, world!\n";
 
 	snprintf(buf, sizeof buf, "%s", test_string);
-	assert(strcmp(buf, test_string) == 0);
+	if (strcmp(buf, test_string) != 0)
+		return 1;
 
-	snprintf(buf, sizeof buf, "%S", test_string_pgm);
-	assert(strcmp(buf, test_string_pgm) == 0);
+	snprintf(buf, sizeof buf, "%S", (wchar_t *)test_string_pgm);
+	if (strcmp(buf, test_string_pgm) != 0)
+		return 2;
 
-#define TEST(FMT, VALUE, EXPECT) do { \
+	#define TEST(FMT, VALUE, EXPECT) do { \
 		snprintf(buf, sizeof buf, FMT, VALUE); \
-		assert(strcmp(buf, EXPECT) == 0); \
+		if (strcmp(buf, EXPECT) != 0) \
+			return -1; \
 	} while (0)
 
 	TEST("%d",       12345,        "12345");
@@ -91,14 +94,23 @@ int main(void)
 	/*
 	 * Stress tests.
 	 */
-	snprintf(buf, sizeof buf, "%s", NULL);
-	assert(strcmp(buf, "<NULL>") == 0);
+	snprintf(buf, sizeof buf, "%s", (char *)(NULL));
+	if (strcmp(buf, "<NULL>") != 0)
+		return 3;
 	snprintf(buf, sizeof buf, "%k");
-	assert(strcmp(buf, "???") == 0);
+	if (strcmp(buf, "???") != 0)
+		return 4;
 	sprintf(NULL, test_string); /* must not crash */
 
 	return 0;
 }
 
-#endif /* _TEST */
+int sprintf_testTearDown(void)
+{
+	return 0;
+}
+
+#if UNIT_TEST
+	TEST_MAIN(sprintf);
+#endif /* UNIT_TEST */