opt: test the new embedded-\n-in-usage behaviour.

[ccan] / ccan / opt / test / run-usage.c

diff --git a/ccan/opt/test/run-usage.c b/ccan/opt/test/run-usage.c
index dd5e42e72ce4bf3911ec09b09fe2e5b641c00c27..aec8324474f2b2a547574d870968c92b476e3e3e 100644 (file)
--- a/ccan/opt/test/run-usage.c
+++ b/ccan/opt/test/run-usage.c
@@ -1,10 +1,18 @@
-#define _GNU_SOURCE
 #include <ccan/tap/tap.h>
 #include <stdarg.h>
 #include <setjmp.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include "utils.h"
+
+/* Ensure width is sane. */
+static const char *getenv_override(const char *name)
+{
+       return "100";
+}
+
+#define getenv getenv_override
+
 #include <ccan/opt/opt.c>
 #include <ccan/opt/usage.c>
 #include <ccan/opt/helpers.c>
@@ -15,23 +23,22 @@ static char *my_cb(void *p)
        return NULL;
 }
 
-static void reset_options(void)
-{
-       free(opt_table);
-       opt_table = NULL;
-       opt_count = opt_num_short = opt_num_short_arg = opt_num_long = 0;
-}
-
 /* Test helpers. */
 int main(int argc, char *argv[])
 {
        char *output;
+       char *longname = strdup("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+       char *shortname = strdup("shortname");
 
-       plan_tests(42);
+       plan_tests(51);
        opt_register_table(subtables, NULL);
        opt_register_noarg("--kkk|-k", my_cb, NULL, "magic kkk option");
        opt_register_noarg("-?", opt_usage_and_exit, "<MyArgs>...",
                           "This message");
+       opt_register_arg("--longname", opt_set_charp, opt_show_charp,
+                        &longname, "a really long option default");
+       opt_register_arg("--shortname", opt_set_charp, opt_show_charp,
+                        &shortname, "a short option default");
        output = opt_usage("my name", "ExTrA Args");
        diag("%s", output);
        ok1(strstr(output, "Usage: my name"));
@@ -77,6 +84,12 @@ int main(int argc, char *argv[])
        ok1(strstr(output, " Description of hhh\n"));
        ok1(strstr(output, "--kkk|-k"));
        ok1(strstr(output, "magic kkk option"));
+       ok1(strstr(output, "--longname"));
+       ok1(strstr(output, "a really long option default"));
+       ok1(strstr(output, "(default: \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"...)"));
+       ok1(strstr(output, "--shortname"));
+       ok1(strstr(output, "a short option default"));
+       ok1(strstr(output, "(default: \"shortname\")"));
        /* This entry is hidden. */
        ok1(!strstr(output, "--mmm|-m"));
        free(output);
@@ -95,5 +108,24 @@ int main(int argc, char *argv[])
        ok1(strstr(output, "AAAAll"));
        free(output);
 
+       reset_options();
+       /* Valgrind nails this to 100 anyway :( */
+       setenv("COLUMNS", "100", 1);
+       opt_register_noarg("--long", my_cb, NULL, "Extremely long option which requires more than one line for its full description to be shown in the usage message.");
+       opt_register_noarg("--split", my_cb, NULL, "New line in\nlong option which requires more than one line for its full description to be shown in the usage message.");
+       output = opt_usage("longarg", NULL);
+       diag("%s", output);
+       ok1(strstr(output, "Usage: longarg \n"));
+       ok1(strstr(output, "\n"
+                  "--long   Extremely long option which requires more than one line for its full description to be\n"
+                  "         shown in the usage message.\n"));
+       ok1(strstr(output, "\n"
+                  "--split  New line in\n"
+                  "         long option which requires more than one line for its full description to be shown in the\n"
+                  "         usage message.\n"));
+       free(output);
+
+       free(shortname);
+       free(longname);
        return exit_status();
 }