Commit 8152a748211f7a9c1a4ee8d28746ca20deb8928e
2016-03-22T10:27:50
iterator: more pathlist-related tests should test actual paths
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100
diff --git a/tests/iterator/tree.c b/tests/iterator/tree.c
index 8e1130a..b4d0f40 100644
--- a/tests/iterator/tree.c
+++ b/tests/iterator/tree.c
@@ -979,6 +979,13 @@ void test_iterator_tree__pathlist_with_directory(void)
git_vector filelist;
git_tree *tree;
+ const char *expected[] = { "subdir/README", "subdir/new.txt",
+ "subdir/subdir2/README", "subdir/subdir2/new.txt" };
+ size_t expected_len = 4;
+
+ const char *expected2[] = { "subdir/subdir2/README", "subdir/subdir2/new.txt" };
+ size_t expected_len2 = 2;
+
g_repo = cl_git_sandbox_init("testrepo2");
git_repository_head_tree(&tree, g_repo);
@@ -987,9 +994,10 @@ void test_iterator_tree__pathlist_with_directory(void)
i_opts.pathlist.strings = (char **)filelist.contents;
i_opts.pathlist.count = filelist.length;
+ i_opts.flags |= GIT_ITERATOR_DONT_IGNORE_CASE;
cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts));
- expect_iterator_items(i, 4, NULL, 4, NULL);
+ expect_iterator_items(i, expected_len, expected, expected_len, expected);
git_iterator_free(i);
git_vector_clear(&filelist);
@@ -999,7 +1007,7 @@ void test_iterator_tree__pathlist_with_directory(void)
i_opts.pathlist.count = filelist.length;
cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts));
- expect_iterator_items(i, 4, NULL, 4, NULL);
+ expect_iterator_items(i, expected_len, expected, expected_len, expected);
git_iterator_free(i);
git_vector_clear(&filelist);
@@ -1009,7 +1017,7 @@ void test_iterator_tree__pathlist_with_directory(void)
i_opts.pathlist.count = filelist.length;
cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts));
- expect_iterator_items(i, 2, NULL, 2, NULL);
+ expect_iterator_items(i, expected_len2, expected2, expected_len2, expected2);
git_iterator_free(i);
git_vector_free(&filelist);
@@ -1022,18 +1030,22 @@ void test_iterator_tree__pathlist_with_directory_include_tree_nodes(void)
git_vector filelist;
git_tree *tree;
+ const char *expected[] = { "subdir/", "subdir/README", "subdir/new.txt",
+ "subdir/subdir2/", "subdir/subdir2/README", "subdir/subdir2/new.txt" };
+ size_t expected_len = 6;
+
g_repo = cl_git_sandbox_init("testrepo2");
git_repository_head_tree(&tree, g_repo);
cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb));
cl_git_pass(git_vector_insert(&filelist, "subdir"));
- i_opts.flags |= GIT_ITERATOR_INCLUDE_TREES;
i_opts.pathlist.strings = (char **)filelist.contents;
i_opts.pathlist.count = filelist.length;
+ i_opts.flags |= GIT_ITERATOR_DONT_IGNORE_CASE | GIT_ITERATOR_INCLUDE_TREES;
cl_git_pass(git_iterator_for_tree(&i, tree, &i_opts));
- expect_iterator_items(i, 6, NULL, 6, NULL);
+ expect_iterator_items(i, expected_len, expected, expected_len, expected);
git_iterator_free(i);
git_vector_free(&filelist);
diff --git a/tests/iterator/workdir.c b/tests/iterator/workdir.c
index 2df8ef5..389d8a1 100644
--- a/tests/iterator/workdir.c
+++ b/tests/iterator/workdir.c
@@ -1410,6 +1410,10 @@ void test_iterator_workdir__pathlist_with_directory(void)
git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT;
git_vector filelist;
+ const char *expected[] = { "subdir/README", "subdir/new.txt",
+ "subdir/subdir2/README", "subdir/subdir2/new.txt" };
+ size_t expected_len = 4;
+
cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb));
cl_git_pass(git_vector_insert(&filelist, "subdir/"));
@@ -1417,9 +1421,10 @@ void test_iterator_workdir__pathlist_with_directory(void)
i_opts.pathlist.strings = (char **)filelist.contents;
i_opts.pathlist.count = filelist.length;
+ i_opts.flags |= GIT_ITERATOR_DONT_IGNORE_CASE;
cl_git_pass(git_iterator_for_workdir(&i, g_repo, NULL, NULL, &i_opts));
- expect_iterator_items(i, 4, NULL, 4, NULL);
+ expect_iterator_items(i, expected_len, expected, expected_len, expected);
git_iterator_free(i);
git_vector_free(&filelist);