test-parse-options: --expect=<string> option to simplify tests

Existing tests in t0040 follow a rather verbose pattern:

        cat >expect <<\EOF
        boolean: 0
        integer: 0
        magnitude: 0
        timestamp: 0
        string: (not set)
        abbrev: 7
        verbose: 0
        quiet: 3
        dry run: no
        file: (not set)
        EOF

        test_expect_success 'multiple quiet levels' '
                test-parse-options -q -q -q >output 2>output.err &&
                test_must_be_empty output.err &&
                test_cmp expect output
        '

But the only thing this test cares about is if "quiet: 3" is in the
output.  We should be able to write the above 18 lines with just
four lines, like this:

	test_expect_success 'multiple quiet levels' '
		test-parse-options --expect="quiet: 3" -q -q -q
	'

Teach the new --expect=<string> option to test-parse-options helper.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index dbaee5526a54c357ab74dfd64ed022dd88cf7eda..d678fbf1b781c2d9920a54ef45013e321883dc97 100755 (executable)
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -45,6 +45,7 @@ Standard options
     -v, --verbose         be verbose
     -n, --dry-run         dry run
     -q, --quiet           be quiet
+    --expect <string>     expected output in the variable dump
 
 EOF
 

diff --git a/test-parse-options.c b/test-parse-options.c
index b5f4e900baf90717feb6da37f3ca66a179315654..8a1235d03e2daab4b9e90d31c5da6708e5c712f2 100644 (file)
--- a/test-parse-options.c
+++ b/test-parse-options.c
@@ -39,6 +39,61 @@ static int number_callback(const struct option *opt, const char *arg, int unset)
        return 0;
 }
 
+static int collect_expect(const struct option *opt, const char *arg, int unset)
+{
+       struct string_list *expect;
+       struct string_list_item *item;
+       struct strbuf label = STRBUF_INIT;
+       const char *colon;
+
+       if (!arg || unset)
+               die("malformed --expect option");
+
+       expect = (struct string_list *)opt->value;
+       colon = strchr(arg, ':');
+       if (!colon)
+               die("malformed --expect option, lacking a colon");
+       strbuf_add(&label, arg, colon - arg);
+       item = string_list_insert(expect, strbuf_detach(&label, NULL));
+       if (item->util)
+               die("malformed --expect option, duplicate %s", label.buf);
+       item->util = (void *)arg;
+       return 0;
+}
+
+__attribute__((format (printf,3,4)))
+static void show(struct string_list *expect, int *status, const char *fmt, ...)
+{
+       struct string_list_item *item;
+       struct strbuf buf = STRBUF_INIT;
+       va_list args;
+
+       va_start(args, fmt);
+       strbuf_vaddf(&buf, fmt, args);
+       va_end(args);
+
+       if (!expect->nr)
+               printf("%s\n", buf.buf);
+       else {
+               char *colon = strchr(buf.buf, ':');
+               if (!colon)
+                       die("malformed output format, output lacking colon: %s", fmt);
+               *colon = '\0';
+               item = string_list_lookup(expect, buf.buf);
+               *colon = ':';
+               if (!item)
+                       ; /* not among entries being checked */
+               else {
+                       if (strcmp((const char *)item->util, buf.buf)) {
+                               printf("-%s\n", (char *)item->util);
+                               printf("+%s\n", buf.buf);
+                               *status = 1;
+                       }
+               }
+       }
+       strbuf_release(&buf);
+}
+
 int main(int argc, char **argv)
 {
        const char *prefix = "prefix/";
@@ -46,6 +101,7 @@ int main(int argc, char **argv)
                "test-parse-options <options>",
                NULL
        };
+       struct string_list expect = STRING_LIST_INIT_NODUP;
        struct option options[] = {
                OPT_BOOL(0, "yes", &boolean, "get a boolean"),
                OPT_BOOL('D', "no-doubt", &boolean, "begins with 'no-'"),
@@ -86,34 +142,38 @@ int main(int argc, char **argv)
                OPT__VERBOSE(&verbose, "be verbose"),
                OPT__DRY_RUN(&dry_run, "dry run"),
                OPT__QUIET(&quiet, "be quiet"),
+               OPT_CALLBACK(0, "expect", &expect, "string",
+                            "expected output in the variable dump",
+                            collect_expect),
                OPT_END(),
        };
        int i;
+       int ret = 0;
 
        argc = parse_options(argc, (const char **)argv, prefix, options, usage, 0);
 
        if (length_cb.called) {
                const char *arg = length_cb.arg;
                int unset = length_cb.unset;
-               printf("Callback: \"%s\", %d\n",
-                      (arg ? arg : "not set"), unset);
+               show(&expect, &ret, "Callback: \"%s\", %d",
+                    (arg ? arg : "not set"), unset);
        }
-       printf("boolean: %d\n", boolean);
-       printf("integer: %d\n", integer);
-       printf("magnitude: %lu\n", magnitude);
-       printf("timestamp: %lu\n", timestamp);
-       printf("string: %s\n", string ? string : "(not set)");
-       printf("abbrev: %d\n", abbrev);
-       printf("verbose: %d\n", verbose);
-       printf("quiet: %d\n", quiet);
-       printf("dry run: %s\n", dry_run ? "yes" : "no");
-       printf("file: %s\n", file ? file : "(not set)");
+       show(&expect, &ret, "boolean: %d", boolean);
+       show(&expect, &ret, "integer: %d", integer);
+       show(&expect, &ret, "magnitude: %lu", magnitude);
+       show(&expect, &ret, "timestamp: %lu", timestamp);
+       show(&expect, &ret, "string: %s", string ? string : "(not set)");
+       show(&expect, &ret, "abbrev: %d", abbrev);
+       show(&expect, &ret, "verbose: %d", verbose);
+       show(&expect, &ret, "quiet: %d", quiet);
+       show(&expect, &ret, "dry run: %s", dry_run ? "yes" : "no");
+       show(&expect, &ret, "file: %s", file ? file : "(not set)");
 
        for (i = 0; i < list.nr; i++)
-               printf("list: %s\n", list.items[i].string);
+               show(&expect, &ret, "list: %s", list.items[i].string);
 
        for (i = 0; i < argc; i++)
-               printf("arg %02d: %s\n", i, argv[i]);
+               show(&expect, &ret, "arg %02d: %s", i, argv[i]);
 
-       return 0;
+       return ret;
 }