t: directly test parse_pathspec_file()

Previously, `parse_pathspec_file()` was tested indirectly by invoking
git commands with properly crafted inputs. As demonstrated by the
previous bugfix, testing complicated black boxes indirectly can lead to
tests that silently test the wrong thing.

Introduce direct tests for `parse_pathspec_file()`.

Signed-off-by: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index 09f98b777cae1dc9226f13c182011adacfd8b2fc..0061f96e8a82e3ba088eb04d61d4cd181d3d9d00 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -721,6 +721,7 @@ TEST_BUILTINS_OBJS += test-mktemp.o
 TEST_BUILTINS_OBJS += test-oidmap.o
 TEST_BUILTINS_OBJS += test-online-cpus.o
 TEST_BUILTINS_OBJS += test-parse-options.o
+TEST_BUILTINS_OBJS += test-parse-pathspec-file.o
 TEST_BUILTINS_OBJS += test-path-utils.o
 TEST_BUILTINS_OBJS += test-pkt-line.o
 TEST_BUILTINS_OBJS += test-prio-queue.o

diff --git a/t/helper/test-parse-pathspec-file.c b/t/helper/test-parse-pathspec-file.c
new file mode 100644 (file)
index 0000000..02f4ccf
--- /dev/null
+++ b/t/helper/test-parse-pathspec-file.c
@@ -0,0 +1,33 @@
+#include "test-tool.h"
+#include "parse-options.h"
+#include "pathspec.h"
+#include "gettext.h"
+
+int cmd__parse_pathspec_file(int argc, const char **argv)
+{
+       struct pathspec pathspec;
+       const char *pathspec_from_file = 0;
+       int pathspec_file_nul = 0, i;
+
+       static const char *const usage[] = {
+               "test-tool parse-pathspec-file --pathspec-from-file [--pathspec-file-nul]",
+               NULL
+       };
+
+       struct option options[] = {
+               OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
+               OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
+               OPT_END()
+       };
+
+       parse_options(argc, argv, 0, options, usage, 0);
+
+       parse_pathspec_file(&pathspec, 0, 0, 0, pathspec_from_file,
+                           pathspec_file_nul);
+
+       for (i = 0; i < pathspec.nr; i++)
+               printf("%s\n", pathspec.items[i].original);
+
+       clear_pathspec(&pathspec);
+       return 0;
+}

diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
index f20989d4497b596685abfb72bad1f048e41b212c..c9a232d23897b70b051bfd76488ca0e971830b83 100644 (file)
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -39,6 +39,7 @@ static struct test_cmd cmds[] = {
        { "oidmap", cmd__oidmap },
        { "online-cpus", cmd__online_cpus },
        { "parse-options", cmd__parse_options },
+       { "parse-pathspec-file", cmd__parse_pathspec_file },
        { "path-utils", cmd__path_utils },
        { "pkt-line", cmd__pkt_line },
        { "prio-queue", cmd__prio_queue },

diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
index 8ed2af71d1b2382def4215862a6b5585876a62cc..c8549fd87f23b6372a41b2ad5d7ba28df3e258c7 100644 (file)
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -29,6 +29,7 @@ int cmd__mktemp(int argc, const char **argv);
 int cmd__oidmap(int argc, const char **argv);
 int cmd__online_cpus(int argc, const char **argv);
 int cmd__parse_options(int argc, const char **argv);
+int cmd__parse_pathspec_file(int argc, const char** argv);
 int cmd__path_utils(int argc, const char **argv);
 int cmd__pkt_line(int argc, const char **argv);
 int cmd__prio_queue(int argc, const char **argv);

diff --git a/t/t0067-parse_pathspec_file.sh b/t/t0067-parse_pathspec_file.sh
new file mode 100755 (executable)
index 0000000..7bab49f
--- /dev/null
+++ b/t/t0067-parse_pathspec_file.sh
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+test_description='Test parse_pathspec_file()'
+
+. ./test-lib.sh
+
+test_expect_success 'one item from stdin' '
+       cat >expect <<-\EOF &&
+       fileA.t
+       EOF
+
+       echo fileA.t |
+       test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+       test_cmp expect actual
+'
+
+test_expect_success 'one item from file' '
+       cat >expect <<-\EOF &&
+       fileA.t
+       EOF
+
+       echo fileA.t >list &&
+       test-tool parse-pathspec-file --pathspec-from-file=list >actual &&
+
+       test_cmp expect actual
+'
+
+test_expect_success 'NUL delimiters' '
+       cat >expect <<-\EOF &&
+       fileA.t
+       fileB.t
+       EOF
+
+       printf "fileA.t\0fileB.t\0" |
+       test-tool parse-pathspec-file --pathspec-from-file=- --pathspec-file-nul >actual &&
+
+       test_cmp expect actual
+'
+
+test_expect_success 'LF delimiters' '
+       cat >expect <<-\EOF &&
+       fileA.t
+       fileB.t
+       EOF
+
+       printf "fileA.t\nfileB.t\n" |
+       test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+       test_cmp expect actual
+'
+
+test_expect_success 'no trailing delimiter' '
+       cat >expect <<-\EOF &&
+       fileA.t
+       fileB.t
+       EOF
+
+       printf "fileA.t\nfileB.t" |
+       test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+       test_cmp expect actual
+'
+
+test_expect_success 'CRLF delimiters' '
+       cat >expect <<-\EOF &&
+       fileA.t
+       fileB.t
+       EOF
+
+       printf "fileA.t\r\nfileB.t\r\n" |
+       test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+       test_cmp expect actual
+'
+
+test_expect_success 'quotes' '
+       cat >expect <<-\EOF &&
+       fileA.t
+       EOF
+
+       cat >list <<-\EOF &&
+       "file\101.t"
+       EOF
+
+       test-tool parse-pathspec-file --pathspec-from-file=list >actual &&
+
+       test_cmp expect actual
+'
+
+test_expect_success '--pathspec-file-nul takes quotes literally' '
+       # Note: there is an extra newline because --pathspec-file-nul takes
+       # input \n literally, too
+       cat >expect <<-\EOF &&
+       "file\101.t"
+
+       EOF
+
+       cat >list <<-\EOF &&
+       "file\101.t"
+       EOF
+
+       test-tool parse-pathspec-file --pathspec-from-file=list --pathspec-file-nul >actual &&
+
+       test_cmp expect actual
+'
+
+test_done