From cd1ef82253b5f4242ed9aed5e9abf7bceb33ec04 Mon Sep 17 00:00:00 2001 From: nulltoken Date: Sat, 20 Oct 2012 12:07:53 +0200 Subject: test: extract make_head_orphaned() logic --- tests-clar/checkout/head.c | 6 ++---- tests-clar/refs/branches/delete.c | 6 ++---- tests-clar/refs/branches/ishead.c | 11 ++--------- tests-clar/repo/head.c | 15 ++++----------- tests-clar/repo/repo_helpers.c | 11 +++++++++++ tests-clar/repo/repo_helpers.h | 5 +++++ 6 files changed, 26 insertions(+), 28 deletions(-) create mode 100644 tests-clar/repo/repo_helpers.c create mode 100644 tests-clar/repo/repo_helpers.h diff --git a/tests-clar/checkout/head.c b/tests-clar/checkout/head.c index f2f81e5e2..d36034c52 100644 --- a/tests-clar/checkout/head.c +++ b/tests-clar/checkout/head.c @@ -1,5 +1,6 @@ #include "clar_libgit2.h" #include "refs.h" +#include "repo/repo_helpers.h" static git_repository *g_repo; @@ -15,10 +16,7 @@ void test_checkout_head__cleanup(void) void test_checkout_head__checking_out_an_orphaned_head_returns_GIT_EORPHANEDHEAD(void) { - git_reference *head; - - cl_git_pass(git_reference_create_symbolic(&head, g_repo, GIT_HEAD_FILE, "refs/heads/hide/and/seek", 1)); - git_reference_free(head); + make_head_orphaned(g_repo, NON_EXISTING_HEAD); cl_assert_equal_i(GIT_EORPHANEDHEAD, git_checkout_head(g_repo, NULL, NULL)); } diff --git a/tests-clar/refs/branches/delete.c b/tests-clar/refs/branches/delete.c index 656a6188d..4e9c70904 100644 --- a/tests-clar/refs/branches/delete.c +++ b/tests-clar/refs/branches/delete.c @@ -1,5 +1,6 @@ #include "clar_libgit2.h" #include "refs.h" +#include "repo/repo_helpers.h" static git_repository *repo; static git_reference *fake_remote; @@ -52,11 +53,9 @@ void test_refs_branches_delete__can_delete_a_branch_even_if_HEAD_is_missing(void void test_refs_branches_delete__can_delete_a_branch_when_HEAD_is_orphaned(void) { - git_reference *head; git_reference *branch; - cl_git_pass(git_reference_create_symbolic(&head, repo, GIT_HEAD_FILE, "refs/heads/hide/and/seek", 1)); - git_reference_free(head); + make_head_orphaned(repo, NON_EXISTING_HEAD); cl_git_pass(git_branch_lookup(&branch, repo, "br2", GIT_BRANCH_LOCAL)); cl_git_pass(git_branch_delete(branch)); @@ -91,4 +90,3 @@ void test_refs_branches_delete__can_delete_a_remote_branch(void) cl_git_pass(git_branch_lookup(&branch, repo, "nulltoken/master", GIT_BRANCH_REMOTE)); cl_git_pass(git_branch_delete(branch)); } - diff --git a/tests-clar/refs/branches/ishead.c b/tests-clar/refs/branches/ishead.c index 0d57f00a3..ab17482b8 100644 --- a/tests-clar/refs/branches/ishead.c +++ b/tests-clar/refs/branches/ishead.c @@ -1,5 +1,6 @@ #include "clar_libgit2.h" #include "refs.h" +#include "repo/repo_helpers.h" static git_repository *repo; static git_reference *branch; @@ -22,21 +23,13 @@ void test_refs_branches_ishead__can_tell_if_a_branch_is_pointed_at_by_HEAD(void) cl_assert_equal_i(true, git_branch_is_head(branch)); } -static void make_head_orphaned(void) -{ - git_reference *head; - - cl_git_pass(git_reference_create_symbolic(&head, repo, GIT_HEAD_FILE, "refs/heads/hide/and/seek", 1)); - git_reference_free(head); -} - void test_refs_branches_ishead__can_properly_handle_orphaned_HEAD(void) { git_repository_free(repo); repo = cl_git_sandbox_init("testrepo.git"); - make_head_orphaned(); + make_head_orphaned(repo, NON_EXISTING_HEAD); cl_git_pass(git_reference_lookup(&branch, repo, "refs/heads/master")); diff --git a/tests-clar/repo/head.c b/tests-clar/repo/head.c index 34f3f8951..30377dc15 100644 --- a/tests-clar/repo/head.c +++ b/tests-clar/repo/head.c @@ -1,5 +1,6 @@ #include "clar_libgit2.h" #include "refs.h" +#include "repo_helpers.h" git_repository *repo; @@ -30,21 +31,13 @@ void test_repo_head__head_detached(void) cl_assert_equal_i(false, git_repository_head_detached(repo)); } -static void make_head_orphaned(void) -{ - git_reference *head; - - cl_git_pass(git_reference_create_symbolic(&head, repo, GIT_HEAD_FILE, "refs/heads/hide/and/seek", 1)); - git_reference_free(head); -} - void test_repo_head__head_orphan(void) { git_reference *ref; cl_assert(git_repository_head_orphan(repo) == 0); - make_head_orphaned(); + make_head_orphaned(repo, NON_EXISTING_HEAD); cl_assert(git_repository_head_orphan(repo) == 1); @@ -171,7 +164,7 @@ void test_repo_head__detach_head_Fails_if_HEAD_and_point_to_a_non_commitish(void void test_repo_head__detaching_an_orphaned_head_returns_GIT_EORPHANEDHEAD(void) { - make_head_orphaned(); + make_head_orphaned(repo, NON_EXISTING_HEAD); cl_assert_equal_i(GIT_EORPHANEDHEAD, git_repository_detach_head(repo)); } @@ -180,7 +173,7 @@ void test_repo_head__retrieving_an_orphaned_head_returns_GIT_EORPHANEDHEAD(void) { git_reference *head; - make_head_orphaned(); + make_head_orphaned(repo, NON_EXISTING_HEAD); cl_assert_equal_i(GIT_EORPHANEDHEAD, git_repository_head(&head, repo)); } diff --git a/tests-clar/repo/repo_helpers.c b/tests-clar/repo/repo_helpers.c new file mode 100644 index 000000000..35271feaa --- /dev/null +++ b/tests-clar/repo/repo_helpers.c @@ -0,0 +1,11 @@ +#include "clar_libgit2.h" +#include "refs.h" +#include "repo_helpers.h" + +void make_head_orphaned(git_repository* repo, const char *target) +{ + git_reference *head; + + cl_git_pass(git_reference_create_symbolic(&head, repo, GIT_HEAD_FILE, target, 1)); + git_reference_free(head); +} diff --git a/tests-clar/repo/repo_helpers.h b/tests-clar/repo/repo_helpers.h new file mode 100644 index 000000000..e6aeb4873 --- /dev/null +++ b/tests-clar/repo/repo_helpers.h @@ -0,0 +1,5 @@ +#include "common.h" + +#define NON_EXISTING_HEAD "refs/heads/hide/and/seek" + +extern void make_head_orphaned(git_repository* repo, const char *target); -- cgit v1.2.1