bytestring: Split bytestrings by a character delimiter

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

diff --git a/ccan/bytestring/test/run.c b/ccan/bytestring/test/run.c
index 50d288537fc77533fd103de71c1d6c876fd172d8..3b563de3466812229ecf2b3a7bede2083a43de5a 100644 (file)
--- a/ccan/bytestring/test/run.c
+++ b/ccan/bytestring/test/run.c
@@ -3,6 +3,8 @@
 #include <ccan/bytestring/bytestring.h>
 #include <ccan/tap/tap.h>
 
+#include <ccan/bytestring/bytestring.c>
+
 #define TEST_STRING    "test string"
 #define TEST_STRING_2  "abc\0def"
 
@@ -11,10 +13,11 @@ const char *str2 = TEST_STRING;
 
 int main(void)
 {
-       struct bytestring bs, bs1, bs2, bs3, bs4, bs5;
+       struct bytestring bs, bs1, bs2, bs3, bs4, bs5, bs6, bs7;
+       int n;
 
        /* This is how many tests you plan to run */
-       plan_tests(42);
+       plan_tests(89);
 
        bs = bytestring(str1, sizeof(str1) - 1);
        ok1(bs.ptr == str1);
@@ -75,6 +78,93 @@ int main(void)
        ok1(bytestring_rindex(bs2, 'f') == (bs2.ptr + 6));
        ok1(bytestring_rindex(bs2, 'q') == NULL);
 
+       bs6 = BYTESTRING("string");
+       ok1(bytestring_eq(bytestring_bytestring(bs1, bs6),
+                         bytestring(bs1.ptr + 5, 6)));
+       bs6 = BYTESTRING("c\0d");
+       ok1(bytestring_eq(bytestring_bytestring(bs2, bs6),
+                         bytestring(bs2.ptr + 2, 3)));
+       bs6 = BYTESTRING("c\0e");
+       ok1(bytestring_bytestring(bs2, bs6).ptr == NULL);
+       ok1(bytestring_eq(bytestring_bytestring(bs1, bytestring_NULL),
+                         bytestring(bs1.ptr, 0)));
+       ok1(bytestring_eq(bytestring_bytestring(bs2, bytestring_NULL),
+                         bytestring(bs2.ptr, 0)));
+
+
+       ok1(bytestring_spn(bs1, BYTESTRING("est")) == 4);
+       ok1(bytestring_cspn(bs1, BYTESTRING(" ")) == 4);
+
+       ok1(bytestring_spn(bs2, BYTESTRING("z")) == 0);
+       ok1(bytestring_cspn(bs2, BYTESTRING("\0")) == 3);
+
+       ok1(bytestring_spn(bs1, BYTESTRING("eginrst ")) == bs1.len);
+       ok1(bytestring_cspn(bs2, BYTESTRING("z")) == bs2.len);
+
+       bs7 = bytestring_splitchr_first(bs, ' ');
+       ok1(bs7.ptr == bs.ptr);
+       ok1(bytestring_eq(bs7, BYTESTRING("test")));
+       bs7 = bytestring_splitchr_next(bs, ' ', bs7);
+       ok1(bs7.ptr == bs.ptr + 5);
+       ok1(bytestring_eq(bs7, BYTESTRING("string")));
+       bs7 = bytestring_splitchr_next(bs, ' ', bs7);
+       ok1(!bs7.ptr);
+       bs7 = bytestring_splitchr_next(bs, ' ', bs7);
+       ok1(!bs7.ptr);
+
+       bs7 = bytestring_splitchr_first(bs2, '\0');
+       ok1(bs7.ptr = bs2.ptr);
+       ok1(bytestring_eq(bs7, BYTESTRING("abc")));
+       bs7 = bytestring_splitchr_next(bs2, '\0', bs7);
+       ok1(bs7.ptr == bs2.ptr + 4);
+       ok1(bytestring_eq(bs7, BYTESTRING("def")));
+       bs7 = bytestring_splitchr_next(bs2, '\0', bs7);
+       ok1(!bs7.ptr);
+       bs7 = bytestring_splitchr_next(bs2, ' ', bs7);
+       ok1(!bs7.ptr);
+
+       bs7 = bytestring_splitchr_first(bs, 's');
+       ok1(bs7.ptr == bs.ptr);
+       ok1(bytestring_eq(bs7, BYTESTRING("te")));
+       bs7 = bytestring_splitchr_next(bs, 's', bs7);
+       ok1(bs7.ptr == bs.ptr + 3);
+       ok1(bytestring_eq(bs7, BYTESTRING("t ")));
+       bs7 = bytestring_splitchr_next(bs, 's', bs7);
+       ok1(bs7.ptr == bs.ptr + 6);
+       ok1(bytestring_eq(bs7, BYTESTRING("tring")));
+       bs7 = bytestring_splitchr_next(bs, 's', bs7);
+       ok1(!bs7.ptr);
+       bs7 = bytestring_splitchr_next(bs, ' ', bs7);
+       ok1(!bs7.ptr);
+
+       bs7 = bytestring_splitchr_first(bs2, 'f');
+       ok1(bs7.ptr = bs2.ptr);
+       ok1(bytestring_eq(bs7, BYTESTRING("abc\0de")));
+       bs7 = bytestring_splitchr_next(bs2, 'f', bs7);
+       ok1(bs7.ptr == bs2.ptr + 7);
+       ok1(bs7.len == 0);
+       bs7 = bytestring_splitchr_next(bs2, 'f', bs7);
+       ok1(!bs7.ptr);
+       bs7 = bytestring_splitchr_next(bs2, 'f', bs7);
+       ok1(!bs7.ptr);
+
+       bs7 = bytestring_splitchr_first(BYTESTRING(""), 'q');
+       ok1(!bs7.ptr);
+
+       n = 0;
+       bytestring_foreach_splitchr(bs7, BYTESTRING("  "), ' ') {
+               n++;
+               ok1(bs7.ptr && !bs7.len);
+       }
+       ok1(n == 3);
+
+       n = 0;
+       bytestring_foreach_splitchr(bs7, BYTESTRING("\0\0\0"), '\0') {
+               n++;
+               ok1(bs7.ptr && !bs7.len);
+       }
+       ok1(n == 4);
+
        /* This exits depending on whether all tests passed */
        return exit_status();
 }