tal/str: accept take() for arguments.

[ccan] / ccan / tal / str / test / run.c

diff --git a/ccan/tal/str/test/run.c b/ccan/tal/str/test/run.c
index 755bceaf3755b08b9807642eab80fb5becf56bae..70ebbc92fd2041acc5df1ffbfd7dad4e79b1dd13 100644 (file)
--- a/ccan/tal/str/test/run.c
+++ b/ccan/tal/str/test/run.c
@@ -14,7 +14,7 @@ int main(int argc, char *argv[])
        char **split, *str;
        void *ctx;
 
        char **split, *str;
        void *ctx;
 

-       plan_tests(24);
+       plan_tests(65);

        split = strsplit(NULL, "hello  world", " ", STR_EMPTY_OK);
        ok1(!strcmp(split[0], "hello"));
        ok1(!strcmp(split[1], ""));
        split = strsplit(NULL, "hello  world", " ", STR_EMPTY_OK);
        ok1(!strcmp(split[0], "hello"));
        ok1(!strcmp(split[1], ""));


@@ -61,5 +61,93 @@ int main(int argc, char *argv[])
        ok1(tal_parent(str) == ctx);
        tal_free(ctx);
 
        ok1(tal_parent(str) == ctx);
        tal_free(ctx);
 

+       ctx = tal_strdup(NULL, "context");
+       /* Pass through NULLs from take. */
+       ok1(strsplit(NULL, take(NULL), " ", STR_EMPTY_OK) == NULL);
+       ok1(strsplit(NULL, "foo", take(NULL), STR_EMPTY_OK) == NULL);
+
+       /* strsplit take string.  It reallocs it to same size, but
+        * that sometimes causes a move, so we can't directly check
+        * that split[0] == str. */
+       str = tal_strdup(ctx, "hello world");
+       ok1(tal_check(ctx, NULL));
+       ok1(tal_check(str, NULL));
+       split = strsplit(ctx, take(str), " ", STR_EMPTY_OK);
+       ok1(tal_parent(split) == ctx);
+       ok1(!strcmp(split[0], "hello"));
+       ok1(!strcmp(split[1], "world"));
+       ok1(split[2] == NULL);
+       ok1(tal_check(split, NULL));
+       ok1(tal_check(ctx, NULL));
+       tal_free(split);
+       /* Previous free should get rid of str */
+       ok1(!tal_first(ctx));
+
+       /* strsplit take delims */
+       str = tal_strdup(ctx, " ");
+       split = strsplit(ctx, "hello world", take(str), STR_EMPTY_OK);
+       ok1(tal_parent(split) == ctx);
+       ok1(!strcmp(split[0], "hello"));
+       ok1(!strcmp(split[1], "world"));
+       ok1(split[2] == NULL);
+       ok1(tal_check(split, NULL));
+       ok1(tal_check(ctx, NULL));
+       tal_free(split);
+       /* str is gone... */
+       ok1(!tal_first(ctx));
+
+       /* strsplit takes both. */
+       split = strsplit(ctx, take(tal_strdup(NULL, "hello world")),
+                        take(tal_strdup(NULL, " ")), STR_EMPTY_OK);
+       ok1(tal_parent(split) == ctx);
+       ok1(!strcmp(split[0], "hello"));
+       ok1(!strcmp(split[1], "world"));
+       ok1(split[2] == NULL);
+       ok1(tal_check(split, NULL));
+       ok1(tal_check(ctx, NULL));
+       tal_free(split);
+       /* temp allocs are gone... */
+       ok1(!tal_first(ctx));
+
+       /* strjoin passthrough taken NULLs OK. */
+       ok1(strjoin(ctx, take(NULL), "", STR_TRAIL) == NULL);
+       ok1(strjoin(ctx, take(NULL), "", STR_NO_TRAIL) == NULL);
+       ok1(strjoin(ctx, split, take(NULL), STR_TRAIL) == NULL);
+       ok1(strjoin(ctx, split, take(NULL), STR_NO_TRAIL) == NULL);
+
+       /* strjoin take strings[] */
+       split = strsplit(ctx, "hello world", " ", STR_EMPTY_OK);
+       str = strjoin(ctx, take(split), " there ", STR_NO_TRAIL);
+       ok1(!strcmp(str, "hello there world"));
+       ok1(tal_parent(str) == ctx);
+       /* split is gone... */
+       ok1(tal_first(ctx) == str && !tal_next(ctx, str));
+       tal_free(str);
+       ok1(!tal_first(ctx));
+
+       /* strjoin take delim */
+       split = strsplit(ctx, "hello world", " ", STR_EMPTY_OK);
+       str = strjoin(ctx, split, take(tal_strdup(ctx, " there ")),
+                     STR_NO_TRAIL);
+       ok1(!strcmp(str, "hello there world"));
+       ok1(tal_parent(str) == ctx);
+       tal_free(split);
+       /* tmp alloc is gone, str is only remainder. */
+       ok1(tal_first(ctx) == str && !tal_next(ctx, str));
+       tal_free(str);
+       ok1(!tal_first(ctx));
+
+       /* strjoin take both. */
+       str = strjoin(ctx, take(strsplit(ctx, "hello world", " ",
+                                          STR_EMPTY_OK)),
+                     take(tal_strdup(ctx, " there ")), STR_NO_TRAIL);
+       ok1(!strcmp(str, "hello there world"));
+       ok1(tal_parent(str) == ctx);
+       /* tmp allocs are gone, str is only remainder. */
+       ok1(tal_first(ctx) == str && !tal_next(ctx, str));
+       tal_free(str);
+       ok1(!tal_first(ctx));
+       tal_free(ctx);
+

        return exit_status();
 }
        return exit_status();
 }