rbuf: adapt to work on ccan/membuf.

[ccan] / ccan / darray / test / run.c

diff --git a/ccan/darray/test/run.c b/ccan/darray/test/run.c
index 7212c573d6575203662018ca4a4679f98358d4f1..5888af60e339afab68f9a5251d58f39af6c06ad9 100644 (file)
--- a/ccan/darray/test/run.c
+++ b/ccan/darray/test/run.c
@@ -38,7 +38,7 @@ int main(void) {
        trace("Generating amalgams (internal)");
        generateAmalgams();
        
-       plan_tests(41);
+       plan_tests(47);
        
        testLits();
        
@@ -70,7 +70,25 @@ int main(void) {
                ok1(darray_size(arr) == 0);
        }
        reset(arr);
-       
+
+       testing(darray_insert);
+       {
+               size_t middle_i;
+
+               for (i=0; i < ARRAY_SIZE(lotsOfNumbers); i++)
+                       darray_insert(arr, i, lotsOfNumbers[i]);
+               ok1(darray_size(arr) == ARRAY_SIZE(lotsOfNumbers));
+               ok1(darray_alloc(arr) >= darray_size(arr));
+               ok1(!memcmp(arr.item, lotsOfNumbers, sizeof(lotsOfNumbers)));
+
+               middle_i = ARRAY_SIZE(lotsOfNumbers) / 2;
+               darray_insert(arr, middle_i, 42);
+               ok1(darray_size(arr) == ARRAY_SIZE(lotsOfNumbers) + 1);
+               ok1(arr.item[middle_i] == 42);
+               ok1(arr.item[middle_i + 1] == lotsOfNumbers[middle_i]);
+       }
+       reset(arr);
+
        testing(darray_from_c, darray_foreach, darray_foreach_reverse);
        {
                long   *i;
@@ -238,11 +256,20 @@ int main(void) {
        {
                darray(const char*) arr = darray_new();
                const char *n[9] = {"zero", "one", "two", "three", "four", "five", "six", "seven", "eight"};
-               
+
+#if HAVE_TYPEOF                
                darray_appends(arr, n[5], n[6], n[7], n[8]);
+#else
+               darray_appends_t(arr, const char *, n[5], n[6], n[7], n[8]);
+#endif
                ok1(darray_size(arr)==4 && darray_alloc(arr)>=4);
-               
+
+#if HAVE_TYPEOF                
                darray_prepends(arr, n[0], n[1], n[2], n[3], n[4]);
+#else
+               darray_prepends_t(arr, const char *, n[0], n[1], n[2], n[3], n[4]);
+#endif
+
                ok1(darray_size(arr)==9 && darray_alloc(arr)>=9);
                
                ok1(arr.item[0]==n[0] &&