From 667f5ea409a8f3950aedd60e85d23bddeb8ad9b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Esteban=20Manchado=20Vel=C3=A1zquez?= Date: Wed, 8 Feb 2012 23:28:21 +0100 Subject: [PATCH] Improve/extend strtok_r unit tests * Add several failing tests (embedded in an "#if 0" block) for behaviour that doesn't match strtok_r * Add another, passing, more interesting test * Use test_eq_ptr(NULL, ...) instead of test_assert(NULL == ...) --- src/test/test_util.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/test/test_util.c b/src/test/test_util.c index f0603f765f..732712b8e5 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -1478,8 +1478,28 @@ test_util_strtok(void) test_streq("perfect", S2()); test_streq("descent", S1()); test_streq("monument", S2()); - test_assert(NULL == S1()); - test_assert(NULL == S2()); + test_eq_ptr(NULL, S1()); + test_eq_ptr(NULL, S2()); + +#if 0 + buf[0] = 0; + test_eq_ptr(NULL, tor_strtok_r_impl(buf, " ", &cp1)); + test_eq_ptr(NULL, tor_strtok_r_impl(buf, "!", &cp1)); + + strlcpy(buf, "Howdy!", sizeof(buf)); + test_streq("Howdy", tor_strtok_r_impl(buf, "!", &cp1)); + test_eq_ptr(NULL, tor_strtok_r_impl(NULL, "!", &cp1)); + + strlcpy(buf, " ", sizeof(buf)); + test_eq_ptr(NULL, tor_strtok_r_impl(buf, " ", &cp1)); + strlcpy(buf, " ", sizeof(buf)); + test_eq_ptr(NULL, tor_strtok_r_impl(buf, " ", &cp1)); +#endif + + strlcpy(buf, "something ", sizeof(buf)); + test_streq("something", tor_strtok_r_impl(buf, " ", &cp1)); + test_streq(" ", tor_strtok_r_impl(NULL, ";", &cp1)); + test_eq_ptr(NULL, tor_strtok_r_impl(NULL, " ", &cp1)); done: ; }