mem: Remove array_size dependency

[ccan] / ccan / mem / test / api.c

diff --git a/ccan/mem/test/api.c b/ccan/mem/test/api.c
index a7cfb9a11737b9048727dd12d15ba9d8d6851f3f..d0178c355e06f7c139a94151f6c03fb083811a35 100644 (file)
--- a/ccan/mem/test/api.c
+++ b/ccan/mem/test/api.c
@@ -1,4 +1,3 @@
-#include <ccan/array_size/array_size.h>
 #include <ccan/mem/mem.h>
 #include <ccan/tap/tap.h>
 
@@ -8,9 +7,11 @@ int main(void)
        char haystack2[] = "ab\0ab\0ab\0ab";
        char needle1[] = "ab";
        char needle2[] = "d\0e";
+       char scan1[] = "aaaab";
+       char scan2[] = "\0\0\0b";
 
        /* This is how many tests you plan to run */
-       plan_tests(5);
+       plan_tests(46);
 
        ok1(memmem(haystack1, sizeof(haystack1), needle1, 2) == haystack1);
        ok1(memmem(haystack1, sizeof(haystack1), needle1, 3) == NULL);
@@ -20,6 +21,60 @@ int main(void)
            == haystack2);
        ok1(memmem(haystack2, sizeof(haystack2), needle2, 3) == NULL);
 
+       ok1(memrchr(haystack1, 'a', sizeof(haystack1)) == haystack1);
+       ok1(memrchr(haystack1, 'b', sizeof(haystack1)) == haystack1 + 1);
+       ok1(memrchr(haystack1, 'c', sizeof(haystack1)) == haystack1 + 2);
+       ok1(memrchr(haystack1, 'd', sizeof(haystack1)) == haystack1 + 3);
+       ok1(memrchr(haystack1, 'e', sizeof(haystack1)) == haystack1 + 5);
+       ok1(memrchr(haystack1, 'f', sizeof(haystack1)) == haystack1 + 6);
+       ok1(memrchr(haystack1, 'g', sizeof(haystack1)) == haystack1 + 7);
+       ok1(memrchr(haystack1, 'h', sizeof(haystack1)) == haystack1 + 8);
+       ok1(memrchr(haystack1, '\0', sizeof(haystack1)) == haystack1 + 9);
+       ok1(memrchr(haystack1, 'i', sizeof(haystack1)) == NULL);
+
+       ok1(memrchr(haystack2, 'a', sizeof(haystack2)) == haystack2 + 9);
+       ok1(memrchr(haystack2, 'b', sizeof(haystack2)) == haystack2 + 10);
+       ok1(memrchr(haystack2, '\0', sizeof(haystack2)) == haystack2 + 11);
+
+       ok1(memrchr(needle1, '\0', 2) == NULL);
+
+#define S(x) (x), sizeof(x) - 1
+       ok1(mempbrkm(S(haystack1), S("\0efgh")) == haystack1 + 4);
+       ok1(mempbrkm(S(haystack1), S("jklmn")) == NULL);
+       ok1(mempbrkm(S(haystack1), S("sd\0a")) == haystack1 + 0);
+
+       ok1(mempbrk(haystack1, sizeof(haystack1), "bcd\0a") == haystack1 + 1);
+       ok1(mempbrk(haystack1, sizeof(haystack1), "\0") == NULL);
+
+       ok1(memcchr(scan1, 'a', sizeof(scan1)) == scan1 + 4);
+       ok1(memcchr(scan1, 'b', sizeof(scan1)) == scan1);
+       ok1(memcchr(scan2, '\0', sizeof(scan2)) == scan2 + 3);
+       ok1(memcchr(scan2, '\0', sizeof(scan2) - 2) == NULL);
+
+       ok1(memeq(haystack1, sizeof(haystack1), haystack1, sizeof(haystack1)));
+       ok1(!memeq(haystack1, sizeof(haystack1), haystack2, sizeof(haystack2)));
+
+       ok1(memeqstr(scan1, sizeof(scan1) - 1, scan1));
+       ok1(!memeqstr(scan1, sizeof(scan1), scan1));
+       ok1(!memeqstr(scan1, sizeof(scan1), "aaaa"));
+
+       ok1(memstarts(S("a\0bcdef"), S("a\0bc")));
+       ok1(!memstarts(S("a\0bcdef"), S("a\0bcG")));
+       ok1(!memstarts(S("a\0bcdef"), S("a\0bcdefg")));
+
+       ok1(memstarts_str(scan1, sizeof(scan1), scan1));
+       ok1(!memstarts_str(scan1, sizeof(scan1), "ab"));
+
+       ok1(memends(S("abcdef"), S("abcdef")));
+       ok1(!memends(S("abcdef"), S("abcdefg")));
+       ok1(!memends(S("a\0bcdef"), S("a\0b")));
+       ok1(memends(S("a\0bcdef"), S("ef")));
+
+       ok1(memends_str(S("abcdef"), "abcdef"));
+       ok1(!memends_str(S("abcde\0f"), "d\0f"));
+       ok1(!memends_str(S("a\0bcdef"), "a"));
+       ok1(memends_str(S("a\0bcdef"), "ef"));
+
        /* This exits depending on whether all tests passed */
        return exit_status();
 }