X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fbytestring%2Ftest%2Frun.c;h=8b8e7ecdb8dfec0b92d262460640d7f997d8b830;hb=05b15e51d1312f0b2970061b6497325d43f2be02;hp=ef149c56ba7c27a1a370ddc101e0833cd102e52b;hpb=f1e31c66572ef5997e08a1ecadf2e45b2fb04532;p=ccan

diff --git a/ccan/bytestring/test/run.c b/ccan/bytestring/test/run.c
index ef149c56..8b8e7ecd 100644
--- 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, bs6;
+	struct bytestring bs, bs1, bs2, bs3, bs4, bs5, bs6, bs7;
+	int n;
 
 	/* This is how many tests you plan to run */
-	plan_tests(47);
+	plan_tests(126);
 
 	bs = bytestring(str1, sizeof(str1) - 1);
 	ok1(bs.ptr == str1);
@@ -88,6 +91,146 @@ int main(void)
 	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);
+
+	bs7 = bytestring_splitchrs_first(bs, BYTESTRING(" \0"));
+	ok1(bs7.ptr == bs.ptr);
+	ok1(bytestring_eq(bs7, BYTESTRING("test")));
+	bs7 = bytestring_splitchrs_next(bs, BYTESTRING(" \0"), bs7);
+	ok1(bs7.ptr == bs.ptr + 5);
+	ok1(bytestring_eq(bs7, BYTESTRING("string")));
+	bs7 = bytestring_splitchrs_next(bs, BYTESTRING(" \0"), bs7);
+	ok1(!bs7.ptr);
+	bs7 = bytestring_splitchrs_next(bs, BYTESTRING(" \0"), bs7);
+	ok1(!bs7.ptr);
+
+	bs7 = bytestring_splitchrs_first(bs2, BYTESTRING(" \0"));
+	ok1(bs7.ptr == bs2.ptr);
+	ok1(bytestring_eq(bs7, BYTESTRING("abc")));
+	bs7 = bytestring_splitchrs_next(bs2, BYTESTRING(" \0"), bs7);
+	ok1(bs7.ptr == bs2.ptr + 4);
+	ok1(bytestring_eq(bs7, BYTESTRING("def")));
+	bs7 = bytestring_splitchrs_next(bs2, BYTESTRING(" \0"), bs7);
+	ok1(!bs7.ptr);
+	bs7 = bytestring_splitchrs_next(bs2, BYTESTRING(" \0"), bs7);
+	ok1(!bs7.ptr);
+
+	bs7 = bytestring_splitchrs_first(BYTESTRING(""), BYTESTRING(" \0"));
+	ok1(!bs7.ptr);
+
+	n = 0;
+	bytestring_foreach_splitchrs(bs7, BYTESTRING(" \0 \0 "),
+				     BYTESTRING("\0 ")) {
+		n++;
+		ok1(bs7.ptr && !bs7.len);
+	}
+	ok1(n == 6);
+
+	bs7 = bytestring_splitstr_first(bs, BYTESTRING("t "));
+	ok1(bs7.ptr == bs.ptr);
+	ok1(bytestring_eq(bs7, BYTESTRING("tes")));
+	bs7 = bytestring_splitstr_next(bs, BYTESTRING("t "), bs7);
+	ok1(bs7.ptr == bs.ptr + 5);
+	ok1(bytestring_eq(bs7, BYTESTRING("string")));
+	bs7 = bytestring_splitstr_next(bs, BYTESTRING("t "), bs7);
+	ok1(!bs7.ptr);
+	bs7 = bytestring_splitstr_next(bs, BYTESTRING("t "), bs7);
+	ok1(!bs7.ptr);
+
+	bs7 = bytestring_splitstr_first(bs2, BYTESTRING("abc"));
+	ok1(bs7.ptr == bs2.ptr);
+	ok1(bs7.len == 0);
+	bs7 = bytestring_splitstr_next(bs2, BYTESTRING("abc"), bs7);
+	ok1(bs7.ptr == bs2.ptr + 3);
+	ok1(bytestring_eq(bs7, BYTESTRING("\0def")));
+	bs7 = bytestring_splitstr_next(bs2, BYTESTRING("t "), bs7);
+	ok1(!bs7.ptr);
+	bs7 = bytestring_splitstr_next(bs2, BYTESTRING("t "), bs7);
+	ok1(!bs7.ptr);
+
+	bs7 = bytestring_splitstr_first(BYTESTRING(""), BYTESTRING(""));
+	ok1(!bs7.ptr);
+
+	n = 0;
+	bytestring_foreach_splitstr(bs7, BYTESTRING("foofoo"),
+				     BYTESTRING("foo")) {
+		n++;
+		ok1(bs7.ptr && !bs7.len);
+	}
+	ok1(n == 3);
+	
 	/* This exits depending on whether all tests passed */
 	return exit_status();
 }