Commit 865e2dd4440596d7cd874556a694eea30336c69b
2013-04-17T23:58:37
tests: Cleanup commit parse testing code
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-clar/commit/parse.c b/tests-clar/commit/parse.c
index ad2c746..8de4401 100644
--- a/tests-clar/commit/parse.c
+++ b/tests-clar/commit/parse.c
@@ -264,37 +264,40 @@ gpgsig -----BEGIN PGP SIGNATURE-----\n\
a simple commit which works\n",
};
+static int parse_commit(git_commit **out, const char *buffer)
+{
+ git_commit *commit;
+ git_odb_object fake_odb_object;
+ int error;
+
+ commit = (git_commit*)git__malloc(sizeof(git_commit));
+ memset(commit, 0x0, sizeof(git_commit));
+ commit->object.repo = g_repo;
+
+ memset(&fake_odb_object, 0x0, sizeof(git_odb_object));
+ fake_odb_object.buffer = (char *)buffer;
+ fake_odb_object.cached.size = strlen(fake_odb_object.buffer);
+
+ error = git_commit__parse(commit, &fake_odb_object);
+
+ *out = commit;
+ return error;
+}
+
void test_commit_parse__entire_commit(void)
{
const int failing_commit_count = ARRAY_SIZE(failing_commit_cases);
const int passing_commit_count = ARRAY_SIZE(passing_commit_cases);
int i;
git_commit *commit;
- git_odb_object fake_odb_object;
- memset(&fake_odb_object, 0, sizeof(fake_odb_object));
for (i = 0; i < failing_commit_count; ++i) {
- commit = (git_commit*)git__malloc(sizeof(git_commit));
- memset(commit, 0x0, sizeof(git_commit));
- commit->object.repo = g_repo;
-
- fake_odb_object.buffer = failing_commit_cases[i];
- fake_odb_object.cached.size = strlen(fake_odb_object.buffer);
-
- cl_git_fail(git_commit__parse(commit, &fake_odb_object));
-
+ cl_git_fail(parse_commit(&commit, failing_commit_cases[i]));
git_commit__free(commit);
}
for (i = 0; i < passing_commit_count; ++i) {
- commit = (git_commit*)git__malloc(sizeof(git_commit));
- memset(commit, 0x0, sizeof(git_commit));
- commit->object.repo = g_repo;
-
- fake_odb_object.buffer = passing_commit_cases[i];
- fake_odb_object.cached.size = strlen(fake_odb_object.buffer);
-
- cl_git_pass(git_commit__parse(commit, &fake_odb_object));
+ cl_git_pass(parse_commit(&commit, passing_commit_cases[i]));
if (!i)
cl_assert_equal_s("", git_commit_message(commit));
@@ -387,9 +390,7 @@ This commit has a few LF at the start of the commit message";
memset(commit, 0x0, sizeof(git_commit));
commit->object.repo = g_repo;
- cl_git_pass(git_commit__parse_buffer(commit, buffer, strlen(buffer)));
-
+ cl_git_pass(parse_commit(&commit, buffer));
cl_assert_equal_s(message, git_commit_message(commit));
-
git_commit__free(commit);
}