X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Fstr_talloc%2Ftest%2Frun.c;h=6b7fe14ed1d71fd7fabe8e41cae8cc488a1b90aa;hb=082d651ffd87f78f20d56aa477c3c75d7361c1e1;hp=6da48bd0bc98f2c5fceb776012e08c5c1372b8b1;hpb=9965fc25fcc92dc76d1cd4cf9595dc3dc9ebc586;p=ccan

diff --git a/ccan/str_talloc/test/run.c b/ccan/str_talloc/test/run.c
index 6da48bd0..6b7fe14e 100644
--- a/ccan/str_talloc/test/run.c
+++ b/ccan/str_talloc/test/run.c
@@ -1,50 +1,46 @@
-#include "str_talloc/str_talloc.h"
+#include <ccan/str_talloc/str_talloc.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "str_talloc/str_talloc.c"
-#include "tap/tap.h"
+#include <ccan/str_talloc/str_talloc.c>
+#include <ccan/tap/tap.h>
 
-/* FIXME: ccanize */
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof(arr[0]))
 
+static char *substrings[] = { "far", "bar", "baz", "b", "ba", "z", "ar", NULL };
+
 int main(int argc, char *argv[])
 {
-	unsigned int i, j, n;
-
-	plan_tests(19);
-	split = strsplit(NULL, "hello  world", " ", &n);
-	ok1(n == 3);
-	ok1(streq(split[0], "hello"));
-	ok1(streq(split[1], ""));
-	ok1(streq(split[2], "world"));
-	ok1(split[3] == NULL);
-	talloc_free(split);
-
-	split = strsplit(NULL, "hello  world", " ", NULL);
-	ok1(streq(split[0], "hello"));
-	ok1(streq(split[1], ""));
-	ok1(streq(split[2], "world"));
+	char **split, *str;
+	void *ctx;
+
+	plan_tests(16);
+	split = strsplit(NULL, "hello  world", " ");
+	ok1(talloc_array_length(split) == 4);
+	ok1(!strcmp(split[0], "hello"));
+	ok1(!strcmp(split[1], ""));
+	ok1(!strcmp(split[2], "world"));
 	ok1(split[3] == NULL);
 	talloc_free(split);
 
-	split = strsplit(NULL, "hello  world", "o ", NULL);
-	ok1(streq(split[0], "hell"));
-	ok1(streq(split[1], ""));
-	ok1(streq(split[2], ""));
-	ok1(streq(split[3], "w"));
-	ok1(streq(split[4], "rld"));
+	split = strsplit(NULL, "hello  world", "o ");
+	ok1(talloc_array_length(split) == 6);
+	ok1(!strcmp(split[0], "hell"));
+	ok1(!strcmp(split[1], ""));
+	ok1(!strcmp(split[2], ""));
+	ok1(!strcmp(split[3], "w"));
+	ok1(!strcmp(split[4], "rld"));
 	ok1(split[5] == NULL);
 
 	ctx = split;
-	split = strsplit(ctx, "hello  world", "o ", NULL);
+	split = strsplit(ctx, "hello  world", "o ");
 	ok1(talloc_parent(split) == ctx);
 	talloc_free(ctx);
 
 	str = strjoin(NULL, substrings, ", ");
-	ok1(streq(str, "far, bar, baz, b, ba, z, ar, "));
+	ok1(!strcmp(str, "far, bar, baz, b, ba, z, ar, "));
 	ctx = str;
 	str = strjoin(ctx, substrings, "");
-	ok1(streq(str, "farbarbazbbazar"));
+	ok1(!strcmp(str, "farbarbazbbazar"));
 	ok1(talloc_parent(str) == ctx);
 	talloc_free(ctx);