Commit 14a9a4f34638cb4b1c56b0e229692b0869f3514b
2018-11-21T11:18:46
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".
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 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287
diff --git a/tests/apply/apply_helpers.c b/tests/apply/apply_helpers.c
new file mode 100644
index 0000000..c182e05
--- /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 8156335..364daf4 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);