Commit c081f0d00dd2a2cd2aab7175cd2c65413f1cf52a
2017-12-26T17:50:59
fetch: go over FETCH_HEAD just once when counting the prefixes in test
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
diff --git a/tests/fetchhead/nonetwork.c b/tests/fetchhead/nonetwork.c
index 26e9b82..4dabb57 100644
--- a/tests/fetchhead/nonetwork.c
+++ b/tests/fetchhead/nonetwork.c
@@ -407,20 +407,28 @@ void test_fetchhead_nonetwork__create_when_refpecs_given(void)
git_buf_free(&path);
}
-static int nrefs_found;
static bool count_refs_called;
+struct prefix_count {
+ const char *prefix;
+ int count;
+ int expected;
+};
int count_refs(const char *ref_name, const char *remote_url, const git_oid *oid, unsigned int is_merge, void *payload)
{
- const char *pfix = (const char *) payload;
+ int i;
+ struct prefix_count *prefix_counts = (struct prefix_count *) payload;
GIT_UNUSED(remote_url);
GIT_UNUSED(oid);
GIT_UNUSED(is_merge);
count_refs_called = true;
- if (!git__prefixcmp(ref_name, pfix))
- nrefs_found++;
+
+ for (i = 0; prefix_counts[i].prefix; i++) {
+ if (!git__prefixcmp(ref_name, prefix_counts[i].prefix))
+ prefix_counts[i].count++;
+ }
return 0;
}
@@ -444,23 +452,20 @@ void test_fetchhead_nonetwork__create_with_multiple_refspecs(void)
cl_git_pass(git_remote_fetch(remote, NULL, NULL, NULL));
cl_assert(git_path_exists(path.ptr));
- count_refs_called = 0;
- nrefs_found = 0;
- cl_git_pass(git_repository_fetchhead_foreach(g_repo, count_refs, "refs/notes/"));
- cl_assert(count_refs_called);
- cl_assert_equal_i(1, nrefs_found);
-
- count_refs_called = 0;
- nrefs_found = 0;
- cl_git_pass(git_repository_fetchhead_foreach(g_repo, count_refs, "refs/heads/"));
- cl_assert(count_refs_called);
- cl_assert_equal_i(12, nrefs_found);
-
- count_refs_called = 0;
- nrefs_found = 0;
- cl_git_pass(git_repository_fetchhead_foreach(g_repo, count_refs, "refs/tags/"));
- cl_assert(count_refs_called);
- cl_assert_equal_i(7, nrefs_found);
+ {
+ int i;
+ struct prefix_count prefix_counts[] = {
+ {"refs/notes/", 0, 1},
+ {"refs/heads/", 0, 12},
+ {"refs/tags/", 0, 7},
+ {NULL, 0, 0},
+ };
+
+ cl_git_pass(git_repository_fetchhead_foreach(g_repo, count_refs, &prefix_counts));
+ cl_assert(count_refs_called);
+ for (i = 0; prefix_counts[i].prefix; i++)
+ cl_assert_equal_i(prefix_counts[i].expected, prefix_counts[i].count);
+ }
git_remote_free(remote);
git_buf_free(&path);