X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fbytestring%2Ftest%2Frun.c;fp=ccan%2Fbytestring%2Ftest%2Frun.c;h=f1f68d6620b96f2b7be01ba03ebd10e72a7c16ac;hp=3b563de3466812229ecf2b3a7bede2083a43de5a;hb=309577c4747b9a74b6e55d4a9b760ede84b68b4e;hpb=cb2d540f764b225a068a3cdd1396df4fc8dc6824

diff --git a/ccan/bytestring/test/run.c b/ccan/bytestring/test/run.c
index 3b563de3..f1f68d66 100644
--- a/ccan/bytestring/test/run.c
+++ b/ccan/bytestring/test/run.c
@@ -17,7 +17,7 @@ int main(void)
 	int n;
 
 	/* This is how many tests you plan to run */
-	plan_tests(89);
+	plan_tests(109);
 
 	bs = bytestring(str1, sizeof(str1) - 1);
 	ok1(bs.ptr == str1);
@@ -165,6 +165,39 @@ int main(void)
 	}
 	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);
+
 	/* This exits depending on whether all tests passed */
 	return exit_status();
 }