tests: improve nwrap_vector tests

Improves ordering and adds some additional checks.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

diff --git a/tests/test_nwrap_vector.c b/tests/test_nwrap_vector.c
index 4e9f0661d5c4141b890d5e2cd86a2001bdb5a20d..619905f8fa68ebecd0036d5d62262ff665d9792c 100644 (file)
--- a/tests/test_nwrap_vector.c
+++ b/tests/test_nwrap_vector.c
@@ -21,14 +21,16 @@ static void test_nwrap_vector_basic_add(void **state)
        nwrap_vector_add_item(&v, string);
        assert_null(v.items[1]);
        assert_int_equal(v.count, 1);
+       assert_string_equal(v.items[0], string);
        assert_int_equal(v.capacity, DEFAULT_VECTOR_CAPACITY);
 
        assert_string_equal(v.items[0], "string!");
 
        nwrap_vector_add_item(&v, string2);
+       assert_null(v.items[2]);
+       assert_int_equal(v.count, 2);
        assert_string_equal(v.items[0], string);
        assert_string_equal(v.items[1], string2);
-       assert_null(v.items[2]);
 
        free(v.items);
 }
@@ -44,24 +46,23 @@ static void test_nwrap_vector_merge(void **state)
 
        nwrap_vector_init(&v1);
        assert_non_null(v1.items);
-
-       nwrap_vector_init(&v2);
-       assert_non_null(v2.items);
-
        nwrap_vector_add_item(&v1, string);
        nwrap_vector_add_item(&v1, string2);
+       assert_int_equal(v1.count, 2);
 
+       nwrap_vector_init(&v2);
+       assert_non_null(v2.items);
        nwrap_vector_add_item(&v2, string2);
        nwrap_vector_add_item(&v2, string);
+       assert_int_equal(v2.count, 2);
 
        nwrap_vector_merge(&v1, &v2);
-
+       assert_int_equal(v1.count, 4);
        assert_string_equal(v1.items[0], string);
        assert_string_equal(v1.items[1], string2);
        assert_string_equal(v1.items[2], string2);
        assert_string_equal(v1.items[3], string);
        assert_null(v1.items[4]);
-       assert_int_equal(v1.count, 4);
 
        free(v1.items);
        free(v2.items);
@@ -80,20 +81,21 @@ static void test_nwrap_vector_merge_max(void **state)
        nwrap_vector_init(&v1);
        assert_non_null(v1.items);
 
-       nwrap_vector_init(&v2);
-       assert_non_null(v2.items);
-
        for (p = 0; p < 64; ++p) {
                nwrap_vector_add_item(&v1, string);
        }
-       nwrap_vector_merge(&v2, &v1);
+       assert_int_equal(v1.count, 64);
+
+       nwrap_vector_init(&v2);
+       assert_non_null(v2.items);
 
+       nwrap_vector_merge(&v2, &v1);
+       assert_int_equal(v2.count, 64);
        for (p = 0; p < 64; ++p) {
                assert_string_equal(v2.items[p], string);
        }
-       assert_int_equal(v2.count, 64);
-       nwrap_vector_add_item(&v2, string2);
 
+       nwrap_vector_add_item(&v2, string2);
        assert_string_equal(v2.items[64], string2);
        assert_int_equal(v2.count, 65);
        assert_null(v2.items[65]);