X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fsprintf_test.c;h=1bcedfd35175f289618f6494422d83f27d0019b4;hb=8ceb6ba0e3d44b47960b6e01554f624e2dbbb45e;hp=5e68e79fff77ecfb92e5ead6e78e87bb2522dc41;hpb=79a235ffd4713d62d952c1dbff8ce53721aae6d2;p=bertos.git

diff --git a/mware/sprintf_test.c b/mware/sprintf_test.c
old mode 100755
new mode 100644
index 5e68e79f..1bcedfd3
--- a/mware/sprintf_test.c
+++ b/mware/sprintf_test.c
@@ -1,5 +1,47 @@
+/**
+ * \file
+ * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2004, 2005 Develer S.r.l. (http://www.develer.com/)
+ *
+ * -->
+ *
+ * \brief sprintf() implementation based on _formatted_write()
+ *
+ * \version $Id$
+ * \author Bernardo Innocenti <bernie@develer.com>
+ */
+
 #include "sprintf.c"
 #include "formatwr.c"
+#include "hex.c"
+#include <cfg/compiler.h>
+#include <mware/pgm.h>
+#include <stdio.h>
 
 #include <assert.h> /* assert() */
 #include <string.h> /* strcmp() */
@@ -17,14 +59,28 @@ int main(UNUSED_ARG(int, argc), UNUSED_ARG(char **,argv))
 	snprintf(buf, sizeof buf, "%S", test_string_pgm);
 	assert(strcmp(buf, test_string_pgm) == 0);
 
-	snprintf(buf, sizeof buf, "%d", 12345);
-	assert(strcmp(buf, "12345") == 0);
+#define TEST(FMT, VALUE, EXPECT) do { \
+		snprintf(buf, sizeof buf, FMT, VALUE); \
+		assert(strcmp(buf, EXPECT) == 0); \
+	} while (0)
+
+	TEST("%d",       12345,        "12345");
+	TEST("%ld",  123456789L,   "123456789");
+	TEST("%ld",  -12345678L,   "-12345678");
+	TEST("%lu", 4294967295UL, "4294967295");
+	TEST("%hd",     -12345,       "-12345");
+	TEST("%hu",      65535U,       "65535");
 
-	snprintf(buf, sizeof buf, "%ld", 123456789L);
-	assert(strcmp(buf, "123456789") == 0);
+	TEST("%8d",      123,       "     123");
+	TEST("%8d",     -123,       "    -123");
+	TEST("%-8d",     -123,      "-123    ");
+	TEST("%08d",     -123,      "-0000123");
 
-	snprintf(buf, sizeof buf, "%lu", 4294967295UL);
-	assert(strcmp(buf, "4294967295") == 0);
+	TEST("%8.2f",  -123.456,    " -123.46");
+	TEST("%-8.2f", -123.456,    "-123.46 ");
+	TEST("%8.0f",  -123.456,    "    -123");
+
+#undef TEST
 
 	/*
 	 * Stress tests.
@@ -37,3 +93,4 @@ int main(UNUSED_ARG(int, argc), UNUSED_ARG(char **,argv))
 
 	return 0;
 }
+