[tor-commits] [tor/master] Improve tor_snprintf tests

[nickm at torproject.org]

commit 14177f03a944da7d2a542ea8e66d040315c8fc14
Author: Esteban Manchado Velázquez <emanchado at demiurgo.org>
Date:   Sun Feb 5 17:53:01 2012 +0100

    Improve tor_snprintf tests
---
 src/test/test_util.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/test/test_util.c b/src/test/test_util.c
index f5f2038..2a315cb 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -591,14 +591,21 @@ test_util_strmisc(void)
   test_eq(-10.0, d);
   }
 
-  /* Test failing snprintf cases */
+  /* Test tor_snprintf */
+  /* Returning -1 when there's not enough room in the output buffer */
   test_eq(-1, tor_snprintf(buf, 0, "Foo"));
   test_eq(-1, tor_snprintf(buf, 2, "Foo"));
-
-  /* Test printf with uint64 */
+  test_eq(-1, tor_snprintf(buf, 3, "Foo"));
+  test_neq(-1, tor_snprintf(buf, 4, "Foo"));
+  /* Always NUL-terminate the output */
+  tor_snprintf(buf, 5, "abcdef");
+  test_eq(0, buf[4]);
+  tor_snprintf(buf, 10, "abcdef");
+  test_eq(0, buf[6]);
+  /* uint64 */
   tor_snprintf(buf, sizeof(buf), "x!"U64_FORMAT"!x",
                U64_PRINTF_ARG(U64_LITERAL(12345678901)));
-  test_streq(buf, "x!12345678901!x");
+  test_streq("x!12345678901!x", buf);
 
   /* Test str{,case}cmpstart */
   test_assert(strcmpstart("abcdef", "abcdef")==0);