lib/util: Add tests for strv_addn()

Also some other minor test cleanups.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Mon Feb 29 15:18:17 CET 2016 on sn-devel-144

diff --git a/lib/util/tests/strv.c b/lib/util/tests/strv.c
index 4030c44467c3f8dd9501fa9b8643433822b0d2a7..c79ed5c33f26c83878401d3639cceda372dffadf 100644 (file)
--- a/lib/util/tests/strv.c
+++ b/lib/util/tests/strv.c
@@ -85,11 +85,11 @@ static bool test_strv_single(struct torture_context *tctx)
 
 static bool test_strv_multi(struct torture_context *tctx)
 {
-       const char *data[5] = { "foo", "bar", "", "samba", "x"};
+       const char *data[] = { "foo", "bar", "", "samba", "x"};
        char *strv = NULL;
        char *t;
        int i, ret;
-       const int num = sizeof(data) / sizeof(data[0]);
+       const int num = ARRAY_SIZE(data);
 
        /* Add items */
        for (i = 0; i < num; i++) {
@@ -157,6 +157,37 @@ static bool test_strv_multi(struct torture_context *tctx)
        return true;
 }
 
+/* Similar to above but only add/check first 2 chars of each string */
+static bool test_strv_addn(struct torture_context *tctx)
+{
+       const char *data[] = { "foo", "bar", "samba" };
+       char *strv = NULL;
+       char *t;
+       int i, ret;
+       const int num = ARRAY_SIZE(data);
+
+       /* Add first 2 chars of each item */
+       for (i = 0; i < num; i++) {
+               ret = strv_addn(tctx, &strv, data[i], 2);
+               torture_assert(tctx, ret == 0, "strv_add() failed");
+       }
+
+       torture_assert_int_equal(tctx,
+                                strv_count(strv), num,
+                                "strv_count() failed");
+
+       /* Check that strv_next() finds the expected values */
+       t = NULL;
+       for (i = 0; i < num; i++) {
+               t = strv_next(strv, t);
+               torture_assert(tctx,
+                              strncmp(t, data[i], 2) == 0,
+                              "strv_next() failed");
+       }
+
+       return true;
+}
+
 struct torture_suite *torture_local_util_strv(TALLOC_CTX *mem_ctx)
 {
        struct torture_suite *suite = torture_suite_create(mem_ctx, "strv");
@@ -164,6 +195,7 @@ struct torture_suite *torture_local_util_strv(TALLOC_CTX *mem_ctx)
        torture_suite_add_simple_test(suite, "strv_empty",  test_strv_empty);
        torture_suite_add_simple_test(suite, "strv_single", test_strv_single);
        torture_suite_add_simple_test(suite, "strv_multi",  test_strv_multi);
+       torture_suite_add_simple_test(suite, "strv_addn",   test_strv_addn);
 
        return suite;
 }