ccanlint: enhance and streamline "output" testing lines.

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

diff --git a/ccan/tal/str/test/run-strreg.c b/ccan/tal/str/test/run-strreg.c
index 47671efd9270ec4a65d2ec7253fb65db5f31a257..fa8a86c66e6127872b1313644e343dc1d05860c2 100644 (file)
--- a/ccan/tal/str/test/run-strreg.c
+++ b/ccan/tal/str/test/run-strreg.c
@@ -1,6 +1,7 @@
 #include <ccan/tal/str/str.h>
 #include <ccan/tal/str/str.c>
 #include <ccan/tap/tap.h>
+#include "helper.h"
 
 static bool find_parent(tal_t *child, tal_t *parent)
 {
@@ -20,7 +21,7 @@ int main(int argc, char *argv[])
        /* If it accesses this, it will crash. */
        char **invalid = (char **)1L;
 
-       plan_tests(40);
+       plan_tests(41);
        /* Simple matching. */
        ok1(tal_strreg(ctx, "hello world!", "hello") == true);
        ok1(tal_strreg(ctx, "hello world!", "hi") == false);
@@ -77,7 +78,7 @@ int main(int argc, char *argv[])
        tal_free(a);
 
        /* No leaks! */
-       ok1(!tal_first(ctx));
+       ok1(no_children(ctx));
 
        /* NULL arg with take means always fail. */
        ok1(tal_strreg(ctx, take(NULL), "((hello|goodbye) world)",
@@ -89,7 +90,7 @@ int main(int argc, char *argv[])
        ok1(streq(b, "hello"));
        ok1(tal_parent(b) == ctx);
        tal_free(b);
-       ok1(tal_first(ctx) == NULL);
+       ok1(no_children(ctx));
 
        /* Take regex. */
        a = tal_strdup(ctx, "([a-z]+)");
@@ -97,7 +98,7 @@ int main(int argc, char *argv[])
        ok1(streq(b, "hello"));
        ok1(tal_parent(b) == ctx);
        tal_free(b);
-       ok1(tal_first(ctx) == NULL);
+       ok1(no_children(ctx));
 
        /* Take both. */
        a = tal_strdup(ctx, "([a-z]+)");
@@ -106,14 +107,18 @@ int main(int argc, char *argv[])
        ok1(streq(b, "hello"));
        ok1(tal_parent(b) == ctx);
        tal_free(b);
-       ok1(tal_first(ctx) == NULL);
+       ok1(no_children(ctx));
 
        /* ... even if we fail to match. */
        a = tal_strdup(ctx, "([a-z]+)");
        ok1(tal_strreg(ctx, take(tal_strdup(ctx, "HELLO WORLD!")),
                       take(a), &b, invalid) == false);
-       ok1(tal_first(ctx) == NULL);
+       ok1(no_children(ctx));
        tal_free(ctx);
 
+       /* Don't get fooled by \(! */
+       ok1(tal_strreg(ctx, "(hello) (world)!", "\\([a-z]*\\) \\([a-z]+\\)",
+                      invalid) == true);
+
        return exit_status();
 }