mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-03 23:39:38 +00:00
iterator: give the tests a proper hierarchy
Iterator tests were split over repo::iterator and diff::iterator, with duplication between the two. Move them to iterator::index, iterator::tree, and iterator::workdir.
This commit is contained in:
Edward Thomson
parent
df25daef9b
commit
de034cd239
File diff suppressed because it is too large
Load Diff
731
tests/iterator/index.c
Normal file
731
tests/iterator/index.c
Normal file
@ -0,0 +1,731 @@
|
||||
#include "clar_libgit2.h"
|
||||
#include "iterator.h"
|
||||
#include "repository.h"
|
||||
#include "fileops.h"
|
||||
#include "iterator_helpers.h"
|
||||
#include "../submodule/submodule_helpers.h"
|
||||
#include <stdarg.h>
|
||||
|
||||
static git_repository *g_repo;
|
||||
|
||||
void test_iterator_index__initialize(void)
|
||||
{
|
||||
}
|
||||
|
||||
void test_iterator_index__cleanup(void)
|
||||
{
|
||||
cl_git_sandbox_cleanup();
|
||||
g_repo = NULL;
|
||||
}
|
||||
|
||||
static void index_iterator_test(
|
||||
const char *sandbox,
|
||||
const char *start,
|
||||
const char *end,
|
||||
git_iterator_flag_t flags,
|
||||
int expected_count,
|
||||
const char **expected_names,
|
||||
const char **expected_oids)
|
||||
{
|
||||
git_index *index;
|
||||
git_iterator *i;
|
||||
const git_index_entry *entry;
|
||||
int error, count = 0, caps;
|
||||
git_iterator_options iter_opts = GIT_ITERATOR_OPTIONS_INIT;
|
||||
|
||||
g_repo = cl_git_sandbox_init(sandbox);
|
||||
|
||||
cl_git_pass(git_repository_index(&index, g_repo));
|
||||
caps = git_index_caps(index);
|
||||
|
||||
iter_opts.flags = flags;
|
||||
iter_opts.start = start;
|
||||
iter_opts.end = end;
|
||||
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &iter_opts));
|
||||
|
||||
while (!(error = git_iterator_advance(&entry, i))) {
|
||||
cl_assert(entry);
|
||||
|
||||
if (expected_names != NULL)
|
||||
cl_assert_equal_s(expected_names[count], entry->path);
|
||||
|
||||
if (expected_oids != NULL) {
|
||||
git_oid oid;
|
||||
cl_git_pass(git_oid_fromstr(&oid, expected_oids[count]));
|
||||
cl_assert_equal_oid(&oid, &entry->id);
|
||||
}
|
||||
|
||||
count++;
|
||||
}
|
||||
|
||||
cl_assert_equal_i(GIT_ITEROVER, error);
|
||||
cl_assert(!entry);
|
||||
cl_assert_equal_i(expected_count, count);
|
||||
|
||||
git_iterator_free(i);
|
||||
|
||||
cl_assert(caps == git_index_caps(index));
|
||||
git_index_free(index);
|
||||
}
|
||||
|
||||
static const char *expected_index_0[] = {
|
||||
"attr0",
|
||||
"attr1",
|
||||
"attr2",
|
||||
"attr3",
|
||||
"binfile",
|
||||
"gitattributes",
|
||||
"macro_bad",
|
||||
"macro_test",
|
||||
"root_test1",
|
||||
"root_test2",
|
||||
"root_test3",
|
||||
"root_test4.txt",
|
||||
"sub/abc",
|
||||
"sub/file",
|
||||
"sub/sub/file",
|
||||
"sub/sub/subsub.txt",
|
||||
"sub/subdir_test1",
|
||||
"sub/subdir_test2.txt",
|
||||
"subdir/.gitattributes",
|
||||
"subdir/abc",
|
||||
"subdir/subdir_test1",
|
||||
"subdir/subdir_test2.txt",
|
||||
"subdir2/subdir2_test1",
|
||||
};
|
||||
|
||||
static const char *expected_index_oids_0[] = {
|
||||
"556f8c827b8e4a02ad5cab77dca2bcb3e226b0b3",
|
||||
"3b74db7ab381105dc0d28f8295a77f6a82989292",
|
||||
"2c66e14f77196ea763fb1e41612c1aa2bc2d8ed2",
|
||||
"c485abe35abd4aa6fd83b076a78bbea9e2e7e06c",
|
||||
"d800886d9c86731ae5c4a62b0b77c437015e00d2",
|
||||
"2b40c5aca159b04ea8d20ffe36cdf8b09369b14a",
|
||||
"5819a185d77b03325aaf87cafc771db36f6ddca7",
|
||||
"ff69f8639ce2e6010b3f33a74160aad98b48da2b",
|
||||
"45141a79a77842c59a63229403220a4e4be74e3d",
|
||||
"4d713dc48e6b1bd75b0d61ad078ba9ca3a56745d",
|
||||
"108bb4e7fd7b16490dc33ff7d972151e73d7166e",
|
||||
"a0f7217ae99f5ac3e88534f5cea267febc5fa85b",
|
||||
"3e42ffc54a663f9401cc25843d6c0e71a33e4249",
|
||||
"45b983be36b73c0788dc9cbcb76cbb80fc7bb057",
|
||||
"45b983be36b73c0788dc9cbcb76cbb80fc7bb057",
|
||||
"9e5bdc47d6a80f2be0ea3049ad74231b94609242",
|
||||
"e563cf4758f0d646f1b14b76016aa17fa9e549a4",
|
||||
"fb5067b1aef3ac1ada4b379dbcb7d17255df7d78",
|
||||
"99eae476896f4907224978b88e5ecaa6c5bb67a9",
|
||||
"3e42ffc54a663f9401cc25843d6c0e71a33e4249",
|
||||
"e563cf4758f0d646f1b14b76016aa17fa9e549a4",
|
||||
"fb5067b1aef3ac1ada4b379dbcb7d17255df7d78",
|
||||
"dccada462d3df8ac6de596fb8c896aba9344f941"
|
||||
};
|
||||
|
||||
void test_iterator_index__0(void)
|
||||
{
|
||||
index_iterator_test(
|
||||
"attr", NULL, NULL, 0, ARRAY_SIZE(expected_index_0),
|
||||
expected_index_0, expected_index_oids_0);
|
||||
}
|
||||
|
||||
static const char *expected_index_1[] = {
|
||||
"current_file",
|
||||
"file_deleted",
|
||||
"modified_file",
|
||||
"staged_changes",
|
||||
"staged_changes_file_deleted",
|
||||
"staged_changes_modified_file",
|
||||
"staged_new_file",
|
||||
"staged_new_file_deleted_file",
|
||||
"staged_new_file_modified_file",
|
||||
"subdir.txt",
|
||||
"subdir/current_file",
|
||||
"subdir/deleted_file",
|
||||
"subdir/modified_file",
|
||||
};
|
||||
|
||||
static const char* expected_index_oids_1[] = {
|
||||
"a0de7e0ac200c489c41c59dfa910154a70264e6e",
|
||||
"5452d32f1dd538eb0405e8a83cc185f79e25e80f",
|
||||
"452e4244b5d083ddf0460acf1ecc74db9dcfa11a",
|
||||
"55d316c9ba708999f1918e9677d01dfcae69c6b9",
|
||||
"a6be623522ce87a1d862128ac42672604f7b468b",
|
||||
"906ee7711f4f4928ddcb2a5f8fbc500deba0d2a8",
|
||||
"529a16e8e762d4acb7b9636ff540a00831f9155a",
|
||||
"90b8c29d8ba39434d1c63e1b093daaa26e5bd972",
|
||||
"ed062903b8f6f3dccb2fa81117ba6590944ef9bd",
|
||||
"e8ee89e15bbe9b20137715232387b3de5b28972e",
|
||||
"53ace0d1cc1145a5f4fe4f78a186a60263190733",
|
||||
"1888c805345ba265b0ee9449b8877b6064592058",
|
||||
"a6191982709b746d5650e93c2acf34ef74e11504"
|
||||
};
|
||||
|
||||
void test_iterator_index__1(void)
|
||||
{
|
||||
index_iterator_test(
|
||||
"status", NULL, NULL, 0, ARRAY_SIZE(expected_index_1),
|
||||
expected_index_1, expected_index_oids_1);
|
||||
}
|
||||
|
||||
static const char *expected_index_range[] = {
|
||||
"root_test1",
|
||||
"root_test2",
|
||||
"root_test3",
|
||||
"root_test4.txt",
|
||||
};
|
||||
|
||||
static const char *expected_index_oids_range[] = {
|
||||
"45141a79a77842c59a63229403220a4e4be74e3d",
|
||||
"4d713dc48e6b1bd75b0d61ad078ba9ca3a56745d",
|
||||
"108bb4e7fd7b16490dc33ff7d972151e73d7166e",
|
||||
"a0f7217ae99f5ac3e88534f5cea267febc5fa85b",
|
||||
};
|
||||
|
||||
void test_iterator_index__range(void)
|
||||
{
|
||||
index_iterator_test(
|
||||
"attr", "root", "root", 0, ARRAY_SIZE(expected_index_range),
|
||||
expected_index_range, expected_index_oids_range);
|
||||
}
|
||||
|
||||
void test_iterator_index__range_empty_0(void)
|
||||
{
|
||||
index_iterator_test(
|
||||
"attr", "empty", "empty", 0, 0, NULL, NULL);
|
||||
}
|
||||
|
||||
void test_iterator_index__range_empty_1(void)
|
||||
{
|
||||
index_iterator_test(
|
||||
"attr", "z_empty_after", NULL, 0, 0, NULL, NULL);
|
||||
}
|
||||
|
||||
void test_iterator_index__range_empty_2(void)
|
||||
{
|
||||
index_iterator_test(
|
||||
"attr", NULL, ".aaa_empty_before", 0, 0, NULL, NULL);
|
||||
}
|
||||
|
||||
static void check_index_range(
|
||||
git_repository *repo,
|
||||
const char *start,
|
||||
const char *end,
|
||||
bool ignore_case,
|
||||
int expected_count)
|
||||
{
|
||||
git_index *index;
|
||||
git_iterator *i;
|
||||
git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT;
|
||||
int error, count, caps;
|
||||
bool is_ignoring_case;
|
||||
|
||||
cl_git_pass(git_repository_index(&index, repo));
|
||||
|
||||
caps = git_index_caps(index);
|
||||
is_ignoring_case = ((caps & GIT_INDEXCAP_IGNORE_CASE) != 0);
|
||||
|
||||
if (ignore_case != is_ignoring_case)
|
||||
cl_git_pass(git_index_set_caps(index, caps ^ GIT_INDEXCAP_IGNORE_CASE));
|
||||
|
||||
i_opts.flags = 0;
|
||||
i_opts.start = start;
|
||||
i_opts.end = end;
|
||||
|
||||
cl_git_pass(git_iterator_for_index(&i, repo, index, &i_opts));
|
||||
|
||||
cl_assert(git_iterator_ignore_case(i) == ignore_case);
|
||||
|
||||
for (count = 0; !(error = git_iterator_advance(NULL, i)); ++count)
|
||||
/* count em up */;
|
||||
|
||||
cl_assert_equal_i(GIT_ITEROVER, error);
|
||||
cl_assert_equal_i(expected_count, count);
|
||||
|
||||
git_iterator_free(i);
|
||||
git_index_free(index);
|
||||
}
|
||||
|
||||
void test_iterator_index__range_icase(void)
|
||||
{
|
||||
git_index *index;
|
||||
git_tree *head;
|
||||
|
||||
g_repo = cl_git_sandbox_init("testrepo");
|
||||
|
||||
/* reset index to match HEAD */
|
||||
cl_git_pass(git_repository_head_tree(&head, g_repo));
|
||||
cl_git_pass(git_repository_index(&index, g_repo));
|
||||
cl_git_pass(git_index_read_tree(index, head));
|
||||
cl_git_pass(git_index_write(index));
|
||||
git_tree_free(head);
|
||||
git_index_free(index);
|
||||
|
||||
/* do some ranged iterator checks toggling case sensitivity */
|
||||
check_index_range(g_repo, "B", "C", false, 0);
|
||||
check_index_range(g_repo, "B", "C", true, 1);
|
||||
check_index_range(g_repo, "a", "z", false, 3);
|
||||
check_index_range(g_repo, "a", "z", true, 4);
|
||||
}
|
||||
|
||||
static const char *expected_index_cs[] = {
|
||||
"B", "D", "F", "H", "J", "L/1", "L/B", "L/D", "L/a", "L/c",
|
||||
"a", "c", "e", "g", "i", "k/1", "k/B", "k/D", "k/a", "k/c",
|
||||
};
|
||||
|
||||
static const char *expected_index_ci[] = {
|
||||
"a", "B", "c", "D", "e", "F", "g", "H", "i", "J",
|
||||
"k/1", "k/a", "k/B", "k/c", "k/D", "L/1", "L/a", "L/B", "L/c", "L/D",
|
||||
};
|
||||
|
||||
void test_iterator_index__case_folding(void)
|
||||
{
|
||||
git_buf path = GIT_BUF_INIT;
|
||||
int fs_is_ci = 0;
|
||||
|
||||
cl_git_pass(git_buf_joinpath(&path, cl_fixture("icase"), ".gitted/CoNfIg"));
|
||||
fs_is_ci = git_path_exists(path.ptr);
|
||||
git_buf_free(&path);
|
||||
|
||||
index_iterator_test(
|
||||
"icase", NULL, NULL, 0, ARRAY_SIZE(expected_index_cs),
|
||||
fs_is_ci ? expected_index_ci : expected_index_cs, NULL);
|
||||
|
||||
cl_git_sandbox_cleanup();
|
||||
|
||||
index_iterator_test(
|
||||
"icase", NULL, NULL, GIT_ITERATOR_IGNORE_CASE,
|
||||
ARRAY_SIZE(expected_index_ci), expected_index_ci, NULL);
|
||||
|
||||
cl_git_sandbox_cleanup();
|
||||
|
||||
index_iterator_test(
|
||||
"icase", NULL, NULL, GIT_ITERATOR_DONT_IGNORE_CASE,
|
||||
ARRAY_SIZE(expected_index_cs), expected_index_cs, NULL);
|
||||
}
|
||||
|
||||
/* Index contents (including pseudotrees):
|
||||
*
|
||||
* 0: a 5: F 10: k/ 16: L/
|
||||
* 1: B 6: g 11: k/1 17: L/1
|
||||
* 2: c 7: H 12: k/a 18: L/a
|
||||
* 3: D 8: i 13: k/B 19: L/B
|
||||
* 4: e 9: J 14: k/c 20: L/c
|
||||
* 15: k/D 21: L/D
|
||||
*
|
||||
* 0: B 5: L/ 11: a 16: k/
|
||||
* 1: D 6: L/1 12: c 17: k/1
|
||||
* 2: F 7: L/B 13: e 18: k/B
|
||||
* 3: H 8: L/D 14: g 19: k/D
|
||||
* 4: J 9: L/a 15: i 20: k/a
|
||||
* 10: L/c 21: k/c
|
||||
*/
|
||||
|
||||
void test_iterator_index__icase_0(void)
|
||||
{
|
||||
git_iterator *i;
|
||||
git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT;
|
||||
git_index *index;
|
||||
|
||||
g_repo = cl_git_sandbox_init("icase");
|
||||
|
||||
cl_git_pass(git_repository_index(&index, g_repo));
|
||||
|
||||
/* autoexpand with no tree entries for index */
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, NULL));
|
||||
expect_iterator_items(i, 20, NULL, 20, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
/* auto expand with tree entries */
|
||||
i_opts.flags = GIT_ITERATOR_INCLUDE_TREES;
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 22, NULL, 22, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
/* no auto expand (implies trees included) */
|
||||
i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND;
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 12, NULL, 22, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
git_index_free(index);
|
||||
}
|
||||
|
||||
void test_iterator_index__icase_1(void)
|
||||
{
|
||||
git_iterator *i;
|
||||
git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT;
|
||||
git_index *index;
|
||||
int caps;
|
||||
|
||||
g_repo = cl_git_sandbox_init("icase");
|
||||
|
||||
cl_git_pass(git_repository_index(&index, g_repo));
|
||||
caps = git_index_caps(index);
|
||||
|
||||
/* force case sensitivity */
|
||||
cl_git_pass(git_index_set_caps(index, caps & ~GIT_INDEXCAP_IGNORE_CASE));
|
||||
|
||||
/* autoexpand with no tree entries over range */
|
||||
i_opts.start = "c";
|
||||
i_opts.end = "k/D";
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 7, NULL, 7, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
i_opts.start = "k";
|
||||
i_opts.end = "k/Z";
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 3, NULL, 3, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
/* auto expand with tree entries */
|
||||
i_opts.flags = GIT_ITERATOR_INCLUDE_TREES;
|
||||
|
||||
i_opts.start = "c";
|
||||
i_opts.end = "k/D";
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 8, NULL, 8, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
i_opts.start = "k";
|
||||
i_opts.end = "k/Z";
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 4, NULL, 4, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
/* no auto expand (implies trees included) */
|
||||
i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND;
|
||||
|
||||
i_opts.start = "c";
|
||||
i_opts.end = "k/D";
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 5, NULL, 8, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
i_opts.start = "k";
|
||||
i_opts.end = "k/Z";
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 1, NULL, 4, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
/* force case insensitivity */
|
||||
cl_git_pass(git_index_set_caps(index, caps | GIT_INDEXCAP_IGNORE_CASE));
|
||||
|
||||
/* autoexpand with no tree entries over range */
|
||||
i_opts.flags = 0;
|
||||
|
||||
i_opts.start = "c";
|
||||
i_opts.end = "k/D";
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 13, NULL, 13, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
i_opts.start = "k";
|
||||
i_opts.end = "k/Z";
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 5, NULL, 5, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
/* auto expand with tree entries */
|
||||
i_opts.flags = GIT_ITERATOR_INCLUDE_TREES;
|
||||
|
||||
i_opts.start = "c";
|
||||
i_opts.end = "k/D";
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 14, NULL, 14, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
i_opts.start = "k";
|
||||
i_opts.end = "k/Z";
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 6, NULL, 6, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
/* no auto expand (implies trees included) */
|
||||
i_opts.flags = GIT_ITERATOR_DONT_AUTOEXPAND;
|
||||
|
||||
i_opts.start = "c";
|
||||
i_opts.end = "k/D";
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 9, NULL, 14, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
i_opts.start = "k";
|
||||
i_opts.end = "k/Z";
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 1, NULL, 6, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
cl_git_pass(git_index_set_caps(index, caps));
|
||||
git_index_free(index);
|
||||
}
|
||||
|
||||
void test_iterator_index__pathlist(void)
|
||||
{
|
||||
git_iterator *i;
|
||||
git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT;
|
||||
git_index *index;
|
||||
git_vector filelist;
|
||||
int default_icase;
|
||||
int expect;
|
||||
|
||||
cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb));
|
||||
cl_git_pass(git_vector_insert(&filelist, "a"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "B"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "c"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "D"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "e"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "k/1"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "k/a"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "L/1"));
|
||||
|
||||
g_repo = cl_git_sandbox_init("icase");
|
||||
|
||||
cl_git_pass(git_repository_index(&index, g_repo));
|
||||
|
||||
/* In this test we DO NOT force a case setting on the index. */
|
||||
default_icase = ((git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0);
|
||||
|
||||
i_opts.pathlist.strings = (char **)filelist.contents;
|
||||
i_opts.pathlist.count = filelist.length;
|
||||
|
||||
/* All iterator tests are "autoexpand with no tree entries" */
|
||||
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 8, NULL, 8, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
i_opts.start = "c";
|
||||
i_opts.end = NULL;
|
||||
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
/* (c D e k/1 k/a L ==> 6) vs (c e k/1 k/a ==> 4) */
|
||||
expect = ((default_icase) ? 6 : 4);
|
||||
expect_iterator_items(i, expect, NULL, expect, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
i_opts.start = NULL;
|
||||
i_opts.end = "e";
|
||||
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
/* (a B c D e ==> 5) vs (B D L/1 a c e ==> 6) */
|
||||
expect = ((default_icase) ? 5 : 6);
|
||||
expect_iterator_items(i, expect, NULL, expect, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
git_index_free(index);
|
||||
git_vector_free(&filelist);
|
||||
}
|
||||
|
||||
void test_iterator_index__pathlist_1(void)
|
||||
{
|
||||
git_iterator *i;
|
||||
git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT;
|
||||
git_index *index;
|
||||
git_vector filelist = GIT_VECTOR_INIT;
|
||||
int default_icase, expect;
|
||||
|
||||
g_repo = cl_git_sandbox_init("icase");
|
||||
|
||||
cl_git_pass(git_repository_index(&index, g_repo));
|
||||
|
||||
cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb));
|
||||
cl_git_pass(git_vector_insert(&filelist, "0"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "c"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "D"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "e"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "k/1"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "k/a"));
|
||||
|
||||
/* In this test we DO NOT force a case setting on the index. */
|
||||
default_icase = ((git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0);
|
||||
|
||||
i_opts.pathlist.strings = (char **)filelist.contents;
|
||||
i_opts.pathlist.count = filelist.length;
|
||||
|
||||
i_opts.start = "b";
|
||||
i_opts.end = "k/D";
|
||||
|
||||
/* (c D e k/1 k/a ==> 5) vs (c e k/1 ==> 3) */
|
||||
expect = default_icase ? 5 : 3;
|
||||
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, expect, NULL, expect, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
git_index_free(index);
|
||||
git_vector_free(&filelist);
|
||||
}
|
||||
|
||||
void test_iterator_index__pathlist_2(void)
|
||||
{
|
||||
git_iterator *i;
|
||||
git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT;
|
||||
git_index *index;
|
||||
git_vector filelist = GIT_VECTOR_INIT;
|
||||
int default_icase, expect;
|
||||
|
||||
g_repo = cl_git_sandbox_init("icase");
|
||||
|
||||
cl_git_pass(git_repository_index(&index, g_repo));
|
||||
|
||||
cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb));
|
||||
cl_git_pass(git_vector_insert(&filelist, "0"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "c"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "D"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "e"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "k/"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "k.a"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "k.b"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "kZZZZZZZ"));
|
||||
|
||||
/* In this test we DO NOT force a case setting on the index. */
|
||||
default_icase = ((git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0);
|
||||
|
||||
i_opts.pathlist.strings = (char **)filelist.contents;
|
||||
i_opts.pathlist.count = filelist.length;
|
||||
|
||||
i_opts.start = "b";
|
||||
i_opts.end = "k/D";
|
||||
|
||||
/* (c D e k/1 k/a k/B k/c k/D) vs (c e k/1 k/B k/D) */
|
||||
expect = default_icase ? 8 : 5;
|
||||
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, expect, NULL, expect, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
git_index_free(index);
|
||||
git_vector_free(&filelist);
|
||||
}
|
||||
|
||||
void test_iterator_index__pathlist_four(void)
|
||||
{
|
||||
git_iterator *i;
|
||||
git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT;
|
||||
git_index *index;
|
||||
git_vector filelist = GIT_VECTOR_INIT;
|
||||
int default_icase, expect;
|
||||
|
||||
g_repo = cl_git_sandbox_init("icase");
|
||||
|
||||
cl_git_pass(git_repository_index(&index, g_repo));
|
||||
|
||||
cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb));
|
||||
cl_git_pass(git_vector_insert(&filelist, "0"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "c"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "D"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "e"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "k"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "k.a"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "k.b"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "kZZZZZZZ"));
|
||||
|
||||
/* In this test we DO NOT force a case setting on the index. */
|
||||
default_icase = ((git_index_caps(index) & GIT_INDEXCAP_IGNORE_CASE) != 0);
|
||||
|
||||
i_opts.pathlist.strings = (char **)filelist.contents;
|
||||
i_opts.pathlist.count = filelist.length;
|
||||
|
||||
i_opts.start = "b";
|
||||
i_opts.end = "k/D";
|
||||
|
||||
/* (c D e k/1 k/a k/B k/c k/D) vs (c e k/1 k/B k/D) */
|
||||
expect = default_icase ? 8 : 5;
|
||||
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, expect, NULL, expect, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
git_index_free(index);
|
||||
git_vector_free(&filelist);
|
||||
}
|
||||
|
||||
void test_iterator_index__pathlist_icase(void)
|
||||
{
|
||||
git_iterator *i;
|
||||
git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT;
|
||||
git_index *index;
|
||||
int caps;
|
||||
git_vector filelist;
|
||||
|
||||
cl_git_pass(git_vector_init(&filelist, 100, &git__strcmp_cb));
|
||||
cl_git_pass(git_vector_insert(&filelist, "a"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "B"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "c"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "D"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "e"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "k/1"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "k/a"));
|
||||
cl_git_pass(git_vector_insert(&filelist, "L/1"));
|
||||
|
||||
g_repo = cl_git_sandbox_init("icase");
|
||||
|
||||
cl_git_pass(git_repository_index(&index, g_repo));
|
||||
caps = git_index_caps(index);
|
||||
|
||||
/* force case sensitivity */
|
||||
cl_git_pass(git_index_set_caps(index, caps & ~GIT_INDEXCAP_IGNORE_CASE));
|
||||
|
||||
/* All indexfilelist iterator tests are "autoexpand with no tree entries" */
|
||||
|
||||
i_opts.pathlist.strings = (char **)filelist.contents;
|
||||
i_opts.pathlist.count = filelist.length;
|
||||
|
||||
i_opts.start = "c";
|
||||
i_opts.end = "k/D";
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 3, NULL, 3, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
i_opts.start = "k";
|
||||
i_opts.end = "k/Z";
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 1, NULL, 1, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
/* force case insensitivity */
|
||||
cl_git_pass(git_index_set_caps(index, caps | GIT_INDEXCAP_IGNORE_CASE));
|
||||
|
||||
i_opts.start = "c";
|
||||
i_opts.end = "k/D";
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 5, NULL, 5, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
i_opts.start = "k";
|
||||
i_opts.end = "k/Z";
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 2, NULL, 2, NULL);
|
||||
git_iterator_free(i);
|
||||
|
||||
cl_git_pass(git_index_set_caps(index, caps));
|
||||
git_index_free(index);
|
||||
git_vector_free(&filelist);
|
||||
}
|
||||
|
||||
void test_iterator_index__pathlist_with_directory(void)
|
||||
{
|
||||
git_iterator *i;
|
||||
git_iterator_options i_opts = GIT_ITERATOR_OPTIONS_INIT;
|
||||
git_vector filelist;
|
||||
git_tree *tree;
|
||||
git_index *index;
|
||||
|
||||
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.pathlist.strings = (char **)filelist.contents;
|
||||
i_opts.pathlist.count = filelist.length;
|
||||
|
||||
cl_git_pass(git_repository_index(&index, g_repo));
|
||||
cl_git_pass(git_iterator_for_index(&i, g_repo, index, &i_opts));
|
||||
expect_iterator_items(i, 4, NULL, 4, NULL);
|
||||
git_iterator_free(i);
|
||||
git_index_free(index);
|
||||
git_vector_free(&filelist);
|
||||
}
|
||||
|
||||
110
tests/iterator/iterator_helpers.c
Normal file
110
tests/iterator/iterator_helpers.c
Normal file
@ -0,0 +1,110 @@
|
||||
#include "clar_libgit2.h"
|
||||
#include "iterator.h"
|
||||
#include "repository.h"
|
||||
#include "fileops.h"
|
||||
#include "iterator_helpers.h"
|
||||
#include <stdarg.h>
|
||||
|
||||
static void assert_at_end(git_iterator *i, bool verbose)
|
||||
{
|
||||
const git_index_entry *end;
|
||||
int error = git_iterator_advance(&end, i);
|
||||
|
||||
if (verbose && error != GIT_ITEROVER)
|
||||
fprintf(stderr, "Expected end of iterator, got '%s'\n", end->path);
|
||||
|
||||
cl_git_fail_with(GIT_ITEROVER, error);
|
||||
}
|
||||
|
||||
void expect_iterator_items(
|
||||
git_iterator *i,
|
||||
int expected_flat,
|
||||
const char **expected_flat_paths,
|
||||
int expected_total,
|
||||
const char **expected_total_paths)
|
||||
{
|
||||
const git_index_entry *entry;
|
||||
int count, error;
|
||||
int no_trees = !(git_iterator_flags(i) & GIT_ITERATOR_INCLUDE_TREES);
|
||||
bool v = false;
|
||||
|
||||
if (expected_flat < 0) { v = true; expected_flat = -expected_flat; }
|
||||
if (expected_total < 0) { v = true; expected_total = -expected_total; }
|
||||
|
||||
if (v) fprintf(stderr, "== %s ==\n", no_trees ? "notrees" : "trees");
|
||||
|
||||
count = 0;
|
||||
|
||||
while (!git_iterator_advance(&entry, i)) {
|
||||
if (v) fprintf(stderr, " %s %07o\n", entry->path, (int)entry->mode);
|
||||
|
||||
if (no_trees)
|
||||
cl_assert(entry->mode != GIT_FILEMODE_TREE);
|
||||
|
||||
if (expected_flat_paths) {
|
||||
const char *expect_path = expected_flat_paths[count];
|
||||
size_t expect_len = strlen(expect_path);
|
||||
|
||||
cl_assert_equal_s(expect_path, entry->path);
|
||||
|
||||
if (expect_path[expect_len - 1] == '/')
|
||||
cl_assert_equal_i(GIT_FILEMODE_TREE, entry->mode);
|
||||
else
|
||||
cl_assert(entry->mode != GIT_FILEMODE_TREE);
|
||||
}
|
||||
|
||||
if (++count >= expected_flat)
|
||||
break;
|
||||
}
|
||||
|
||||
assert_at_end(i, v);
|
||||
cl_assert_equal_i(expected_flat, count);
|
||||
|
||||
cl_git_pass(git_iterator_reset(i));
|
||||
|
||||
count = 0;
|
||||
cl_git_pass(git_iterator_current(&entry, i));
|
||||
|
||||
if (v) fprintf(stderr, "-- %s --\n", no_trees ? "notrees" : "trees");
|
||||
|
||||
while (entry != NULL) {
|
||||
if (v) fprintf(stderr, " %s %07o\n", entry->path, (int)entry->mode);
|
||||
|
||||
if (no_trees)
|
||||
cl_assert(entry->mode != GIT_FILEMODE_TREE);
|
||||
|
||||
if (expected_total_paths) {
|
||||
const char *expect_path = expected_total_paths[count];
|
||||
size_t expect_len = strlen(expect_path);
|
||||
|
||||
cl_assert_equal_s(expect_path, entry->path);
|
||||
|
||||
if (expect_path[expect_len - 1] == '/')
|
||||
cl_assert_equal_i(GIT_FILEMODE_TREE, entry->mode);
|
||||
else
|
||||
cl_assert(entry->mode != GIT_FILEMODE_TREE);
|
||||
}
|
||||
|
||||
if (entry->mode == GIT_FILEMODE_TREE) {
|
||||
error = git_iterator_advance_into(&entry, i);
|
||||
|
||||
/* could return NOTFOUND if directory is empty */
|
||||
cl_assert(!error || error == GIT_ENOTFOUND);
|
||||
|
||||
if (error == GIT_ENOTFOUND) {
|
||||
error = git_iterator_advance(&entry, i);
|
||||
cl_assert(!error || error == GIT_ITEROVER);
|
||||
}
|
||||
} else {
|
||||
error = git_iterator_advance(&entry, i);
|
||||
cl_assert(!error || error == GIT_ITEROVER);
|
||||
}
|
||||
|
||||
if (++count >= expected_total)
|
||||
break;
|
||||
}
|
||||
|
||||
assert_at_end(i, v);
|
||||
cl_assert_equal_i(expected_total, count);
|
||||
}
|
||||
|
||||
8
tests/iterator/iterator_helpers.h
Normal file
8
tests/iterator/iterator_helpers.h
Normal file
@ -0,0 +1,8 @@
|
||||
|
||||
extern void expect_iterator_items(
|
||||
git_iterator *i,
|
||||
int expected_flat,
|
||||
const char **expected_flat_paths,
|
||||
int expected_total,
|
||||
const char **expected_total_paths);
|
||||
|
||||
1064
tests/iterator/tree.c
Normal file
1064
tests/iterator/tree.c
Normal file
File diff suppressed because it is too large
Load Diff
1462
tests/iterator/workdir.c
Normal file
1462
tests/iterator/workdir.c
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user