diff options
author | Patrick Steinhardt <ps@pks.im> | 2018-11-21 11:18:46 +0100 |
---|---|---|
committer | Patrick Steinhardt <ps@pks.im> | 2018-11-28 15:22:27 +0100 |
commit | 14a9a4f34638cb4b1c56b0e229692b0869f3514b (patch) | |
tree | 59d19ee9830c41a373bce13edc9b0aa0250a265a | |
parent | c3b427bac4b64aa93920f60a2ee61e7c6a670799 (diff) | |
download | libgit2-14a9a4f34638cb4b1c56b0e229692b0869f3514b.tar.gz |
tests: move apply_helpers functions into own compilation unit
Currently, the "apply_helper" functions used for testing the apply logic are all
statically defined in the "apply_helpers.h" header file. This may lead to
warnings from the compiler in case where this header file is included, but not
all functions it brings along are used in the compilation unit where it has been
included into.
Fix these potential warnings by moving the implementation into its own
compilation unit "apply_helpers.c".
-rw-r--r-- | tests/apply/apply_helpers.c | 135 | ||||
-rw-r--r-- | tests/apply/apply_helpers.h | 132 |
2 files changed, 141 insertions, 126 deletions
diff --git a/tests/apply/apply_helpers.c b/tests/apply/apply_helpers.c new file mode 100644 index 000000000..c182e0582 --- /dev/null +++ b/tests/apply/apply_helpers.c @@ -0,0 +1,135 @@ +#include "clar_libgit2.h" +#include "apply_helpers.h" + +struct iterator_compare_data { + struct merge_index_entry *expected; + size_t cnt; + size_t idx; +}; + +static int iterator_compare(const git_index_entry *entry, void *_data) +{ + git_oid expected_id; + + struct iterator_compare_data *data = (struct iterator_compare_data *)_data; + + cl_assert_equal_i(GIT_IDXENTRY_STAGE(entry), data->expected[data->idx].stage); + cl_git_pass(git_oid_fromstr(&expected_id, data->expected[data->idx].oid_str)); + cl_assert_equal_oid(&entry->id, &expected_id); + cl_assert_equal_i(entry->mode, data->expected[data->idx].mode); + cl_assert_equal_s(entry->path, data->expected[data->idx].path); + + if (data->idx >= data->cnt) + return -1; + + data->idx++; + + return 0; +} + +void validate_apply_workdir( + git_repository *repo, + struct merge_index_entry *workdir_entries, + size_t workdir_cnt) +{ + git_index *index; + git_iterator *iterator; + git_iterator_options opts = GIT_ITERATOR_OPTIONS_INIT; + struct iterator_compare_data data = { workdir_entries, workdir_cnt }; + + opts.flags |= GIT_ITERATOR_INCLUDE_HASH; + + cl_git_pass(git_repository_index(&index, repo)); + cl_git_pass(git_iterator_for_workdir(&iterator, repo, index, NULL, &opts)); + + cl_git_pass(git_iterator_foreach(iterator, iterator_compare, &data)); + cl_assert_equal_i(data.idx, data.cnt); + + git_iterator_free(iterator); + git_index_free(index); +} + +void validate_apply_index( + git_repository *repo, + struct merge_index_entry *index_entries, + size_t index_cnt) +{ + git_index *index; + git_iterator *iterator; + struct iterator_compare_data data = { index_entries, index_cnt }; + + cl_git_pass(git_repository_index(&index, repo)); + cl_git_pass(git_iterator_for_index(&iterator, repo, index, NULL)); + + cl_git_pass(git_iterator_foreach(iterator, iterator_compare, &data)); + cl_assert_equal_i(data.idx, data.cnt); + + git_iterator_free(iterator); + git_index_free(index); +} + +static int iterator_eq(const git_index_entry **entry, void *_data) +{ + GIT_UNUSED(_data); + + if (!entry[0] || !entry[1]) + return -1; + + cl_assert_equal_i(GIT_IDXENTRY_STAGE(entry[0]), GIT_IDXENTRY_STAGE(entry[1])); + cl_assert_equal_oid(&entry[0]->id, &entry[1]->id); + cl_assert_equal_i(entry[0]->mode, entry[1]->mode); + cl_assert_equal_s(entry[0]->path, entry[1]->path); + + return 0; +} + +void validate_index_unchanged(git_repository *repo) +{ + git_tree *head; + git_index *index; + git_iterator *head_iterator, *index_iterator, *iterators[2]; + + cl_git_pass(git_repository_head_tree(&head, repo)); + cl_git_pass(git_repository_index(&index, repo)); + + cl_git_pass(git_iterator_for_tree(&head_iterator, head, NULL)); + cl_git_pass(git_iterator_for_index(&index_iterator, repo, index, NULL)); + + iterators[0] = head_iterator; + iterators[1] = index_iterator; + + cl_git_pass(git_iterator_walk(iterators, 2, iterator_eq, NULL)); + + git_iterator_free(head_iterator); + git_iterator_free(index_iterator); + + git_tree_free(head); + git_index_free(index); +} + +void validate_workdir_unchanged(git_repository *repo) +{ + git_tree *head; + git_index *index; + git_iterator *head_iterator, *workdir_iterator, *iterators[2]; + git_iterator_options workdir_opts = GIT_ITERATOR_OPTIONS_INIT; + + cl_git_pass(git_repository_head_tree(&head, repo)); + cl_git_pass(git_repository_index(&index, repo)); + + workdir_opts.flags |= GIT_ITERATOR_INCLUDE_HASH; + + cl_git_pass(git_iterator_for_tree(&head_iterator, head, NULL)); + cl_git_pass(git_iterator_for_workdir(&workdir_iterator, repo, index, NULL, &workdir_opts)); + + iterators[0] = head_iterator; + iterators[1] = workdir_iterator; + + cl_git_pass(git_iterator_walk(iterators, 2, iterator_eq, NULL)); + + git_iterator_free(head_iterator); + git_iterator_free(workdir_iterator); + + git_tree_free(head); + git_index_free(index); +} diff --git a/tests/apply/apply_helpers.h b/tests/apply/apply_helpers.h index 81563351e..364daf49d 100644 --- a/tests/apply/apply_helpers.h +++ b/tests/apply/apply_helpers.h @@ -453,135 +453,15 @@ "-asparagus which had been laid by, boil it until these last articles are\n" \ "-sufficiently done, thicken with flour, butter and milk, and serve it up.\n" -struct iterator_compare_data { - struct merge_index_entry *expected; - size_t cnt; - size_t idx; -}; - -static int iterator_compare(const git_index_entry *entry, void *_data) -{ - git_oid expected_id; - - struct iterator_compare_data *data = (struct iterator_compare_data *)_data; - - cl_assert_equal_i(GIT_IDXENTRY_STAGE(entry), data->expected[data->idx].stage); - cl_git_pass(git_oid_fromstr(&expected_id, data->expected[data->idx].oid_str)); - cl_assert_equal_oid(&entry->id, &expected_id); - cl_assert_equal_i(entry->mode, data->expected[data->idx].mode); - cl_assert_equal_s(entry->path, data->expected[data->idx].path); - - if (data->idx >= data->cnt) - return -1; - - data->idx++; - - return 0; -} - -static void validate_apply_workdir( +void validate_apply_workdir( git_repository *repo, struct merge_index_entry *workdir_entries, - size_t workdir_cnt) -{ - git_index *index; - git_iterator *iterator; - git_iterator_options opts = GIT_ITERATOR_OPTIONS_INIT; - struct iterator_compare_data data = { workdir_entries, workdir_cnt }; - - opts.flags |= GIT_ITERATOR_INCLUDE_HASH; + size_t workdir_cnt); - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_iterator_for_workdir(&iterator, repo, index, NULL, &opts)); - - cl_git_pass(git_iterator_foreach(iterator, iterator_compare, &data)); - cl_assert_equal_i(data.idx, data.cnt); - - git_iterator_free(iterator); - git_index_free(index); -} - -static void validate_apply_index( +void validate_apply_index( git_repository *repo, struct merge_index_entry *index_entries, - size_t index_cnt) -{ - git_index *index; - git_iterator *iterator; - struct iterator_compare_data data = { index_entries, index_cnt }; - - cl_git_pass(git_repository_index(&index, repo)); - cl_git_pass(git_iterator_for_index(&iterator, repo, index, NULL)); - - cl_git_pass(git_iterator_foreach(iterator, iterator_compare, &data)); - cl_assert_equal_i(data.idx, data.cnt); - - git_iterator_free(iterator); - git_index_free(index); -} - -static int iterator_eq(const git_index_entry **entry, void *_data) -{ - GIT_UNUSED(_data); - - if (!entry[0] || !entry[1]) - return -1; - - cl_assert_equal_i(GIT_IDXENTRY_STAGE(entry[0]), GIT_IDXENTRY_STAGE(entry[1])); - cl_assert_equal_oid(&entry[0]->id, &entry[1]->id); - cl_assert_equal_i(entry[0]->mode, entry[1]->mode); - cl_assert_equal_s(entry[0]->path, entry[1]->path); - - return 0; -} - -static void validate_index_unchanged(git_repository *repo) -{ - git_tree *head; - git_index *index; - git_iterator *head_iterator, *index_iterator, *iterators[2]; - - cl_git_pass(git_repository_head_tree(&head, repo)); - cl_git_pass(git_repository_index(&index, repo)); - - cl_git_pass(git_iterator_for_tree(&head_iterator, head, NULL)); - cl_git_pass(git_iterator_for_index(&index_iterator, repo, index, NULL)); - - iterators[0] = head_iterator; - iterators[1] = index_iterator; - - cl_git_pass(git_iterator_walk(iterators, 2, iterator_eq, NULL)); - - git_iterator_free(head_iterator); - git_iterator_free(index_iterator); - - git_tree_free(head); - git_index_free(index); -} - -static void validate_workdir_unchanged(git_repository *repo) -{ - git_tree *head; - git_index *index; - git_iterator *head_iterator, *workdir_iterator, *iterators[2]; - git_iterator_options workdir_opts = GIT_ITERATOR_OPTIONS_INIT; - - cl_git_pass(git_repository_head_tree(&head, repo)); - cl_git_pass(git_repository_index(&index, repo)); - - workdir_opts.flags |= GIT_ITERATOR_INCLUDE_HASH; - - cl_git_pass(git_iterator_for_tree(&head_iterator, head, NULL)); - cl_git_pass(git_iterator_for_workdir(&workdir_iterator, repo, index, NULL, &workdir_opts)); - - iterators[0] = head_iterator; - iterators[1] = workdir_iterator; - - cl_git_pass(git_iterator_walk(iterators, 2, iterator_eq, NULL)); - - git_iterator_free(head_iterator); - git_iterator_free(workdir_iterator); + size_t index_cnt); - git_tree_free(head); - git_index_free(index); -} +void validate_index_unchanged(git_repository *repo); +void validate_workdir_unchanged(git_repository *repo); |