mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
dir-iterator: add tests for dir-iterator API
Create t/helper/test-dir-iterator.c, which prints relevant information about a directory tree iterated over with dir-iterator. Create t/t0066-dir-iterator.sh, which tests that dir-iterator does iterate through a whole directory tree as expected. Signed-off-by: Daniel Ferreira <bnmvco@gmail.com> [matheus.bernardino: update to use test-tool and some minor aesthetics] Helped-by: Matheus Tavares <matheus.bernardino@usp.br> Signed-off-by: Matheus Tavares <matheus.bernardino@usp.br> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
36596fd2df
commit
150791adbf
1
Makefile
1
Makefile
|
@ -710,6 +710,7 @@ TEST_BUILTINS_OBJS += test-config.o
|
|||
TEST_BUILTINS_OBJS += test-ctype.o
|
||||
TEST_BUILTINS_OBJS += test-date.o
|
||||
TEST_BUILTINS_OBJS += test-delta.o
|
||||
TEST_BUILTINS_OBJS += test-dir-iterator.o
|
||||
TEST_BUILTINS_OBJS += test-drop-caches.o
|
||||
TEST_BUILTINS_OBJS += test-dump-cache-tree.o
|
||||
TEST_BUILTINS_OBJS += test-dump-fsmonitor.o
|
||||
|
|
33
t/helper/test-dir-iterator.c
Normal file
33
t/helper/test-dir-iterator.c
Normal file
|
@ -0,0 +1,33 @@
|
|||
#include "test-tool.h"
|
||||
#include "git-compat-util.h"
|
||||
#include "strbuf.h"
|
||||
#include "iterator.h"
|
||||
#include "dir-iterator.h"
|
||||
|
||||
/* Argument is a directory path to iterate over */
|
||||
int cmd__dir_iterator(int argc, const char **argv)
|
||||
{
|
||||
struct strbuf path = STRBUF_INIT;
|
||||
struct dir_iterator *diter;
|
||||
|
||||
if (argc < 2)
|
||||
die("BUG: test-dir-iterator needs one argument");
|
||||
|
||||
strbuf_add(&path, argv[1], strlen(argv[1]));
|
||||
|
||||
diter = dir_iterator_begin(path.buf);
|
||||
|
||||
while (dir_iterator_advance(diter) == ITER_OK) {
|
||||
if (S_ISDIR(diter->st.st_mode))
|
||||
printf("[d] ");
|
||||
else if (S_ISREG(diter->st.st_mode))
|
||||
printf("[f] ");
|
||||
else
|
||||
printf("[?] ");
|
||||
|
||||
printf("(%s) [%s] %s\n", diter->relative_path, diter->basename,
|
||||
diter->path.buf);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
|
@ -19,6 +19,7 @@ static struct test_cmd cmds[] = {
|
|||
{ "ctype", cmd__ctype },
|
||||
{ "date", cmd__date },
|
||||
{ "delta", cmd__delta },
|
||||
{ "dir-iterator", cmd__dir_iterator },
|
||||
{ "drop-caches", cmd__drop_caches },
|
||||
{ "dump-cache-tree", cmd__dump_cache_tree },
|
||||
{ "dump-fsmonitor", cmd__dump_fsmonitor },
|
||||
|
|
|
@ -9,6 +9,7 @@ int cmd__config(int argc, const char **argv);
|
|||
int cmd__ctype(int argc, const char **argv);
|
||||
int cmd__date(int argc, const char **argv);
|
||||
int cmd__delta(int argc, const char **argv);
|
||||
int cmd__dir_iterator(int argc, const char **argv);
|
||||
int cmd__drop_caches(int argc, const char **argv);
|
||||
int cmd__dump_cache_tree(int argc, const char **argv);
|
||||
int cmd__dump_fsmonitor(int argc, const char **argv);
|
||||
|
|
55
t/t0066-dir-iterator.sh
Executable file
55
t/t0066-dir-iterator.sh
Executable file
|
@ -0,0 +1,55 @@
|
|||
#!/bin/sh
|
||||
|
||||
test_description='Test the dir-iterator functionality'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success 'setup' '
|
||||
mkdir -p dir &&
|
||||
mkdir -p dir/a/b/c/ &&
|
||||
>dir/b &&
|
||||
>dir/c &&
|
||||
mkdir -p dir/d/e/d/ &&
|
||||
>dir/a/b/c/d &&
|
||||
>dir/a/e &&
|
||||
>dir/d/e/d/a &&
|
||||
|
||||
mkdir -p dir2/a/b/c/ &&
|
||||
>dir2/a/b/c/d
|
||||
'
|
||||
|
||||
test_expect_success 'dir-iterator should iterate through all files' '
|
||||
cat >expected-iteration-sorted-output <<-EOF &&
|
||||
[d] (a) [a] ./dir/a
|
||||
[d] (a/b) [b] ./dir/a/b
|
||||
[d] (a/b/c) [c] ./dir/a/b/c
|
||||
[d] (d) [d] ./dir/d
|
||||
[d] (d/e) [e] ./dir/d/e
|
||||
[d] (d/e/d) [d] ./dir/d/e/d
|
||||
[f] (a/b/c/d) [d] ./dir/a/b/c/d
|
||||
[f] (a/e) [e] ./dir/a/e
|
||||
[f] (b) [b] ./dir/b
|
||||
[f] (c) [c] ./dir/c
|
||||
[f] (d/e/d/a) [a] ./dir/d/e/d/a
|
||||
EOF
|
||||
|
||||
test-tool dir-iterator ./dir >out &&
|
||||
sort out >./actual-iteration-sorted-output &&
|
||||
|
||||
test_cmp expected-iteration-sorted-output actual-iteration-sorted-output
|
||||
'
|
||||
|
||||
test_expect_success 'dir-iterator should list files in the correct order' '
|
||||
cat >expected-pre-order-output <<-EOF &&
|
||||
[d] (a) [a] ./dir2/a
|
||||
[d] (a/b) [b] ./dir2/a/b
|
||||
[d] (a/b/c) [c] ./dir2/a/b/c
|
||||
[f] (a/b/c/d) [d] ./dir2/a/b/c/d
|
||||
EOF
|
||||
|
||||
test-tool dir-iterator ./dir2 >actual-pre-order-output &&
|
||||
|
||||
test_cmp expected-pre-order-output actual-pre-order-output
|
||||
'
|
||||
|
||||
test_done
|
Loading…
Reference in a new issue