diff options
author | Robert Coup <robert@coup.net.nz> | 2019-06-06 16:32:09 +0100 |
---|---|---|
committer | Robert Coup <robert@coup.net.nz> | 2019-06-10 11:22:02 +0100 |
commit | 7b27b6cf716429080fbc968d8f573977996ee112 (patch) | |
tree | ecba96301a4d62376a849a98aea28b2d8327cd9b /tests/merge/trees/analysis.c | |
parent | 5427461fb47d22760c0a5a80b6a5f33561e48820 (diff) | |
download | libgit2-7b27b6cf716429080fbc968d8f573977996ee112.tar.gz |
Refactor testing:
- move duplication between merge/trees/ and merge/workdir/ into merge/analysis{.c,.h}
- remove merge-resolve.git resource, open the existing merge-resolve as a bare repo instead.
Diffstat (limited to 'tests/merge/trees/analysis.c')
-rw-r--r-- | tests/merge/trees/analysis.c | 138 |
1 files changed, 24 insertions, 114 deletions
diff --git a/tests/merge/trees/analysis.c b/tests/merge/trees/analysis.c index c744f1a24..a905e34ed 100644 --- a/tests/merge/trees/analysis.c +++ b/tests/merge/trees/analysis.c @@ -3,171 +3,81 @@ #include "clar_libgit2.h" #include "git2/repository.h" -#include "git2/merge.h" -#include "git2/annotated_commit.h" -#include "git2/sys/index.h" -#include "merge.h" -#include "../merge_helpers.h" -#include "refs.h" -#include "posix.h" +#include "../analysis.h" +static git_repository *base_repo; static git_repository *repo; static git_index *repo_index; -#define TEST_REPO_PATH "merge-resolve.git" +#define TEST_REPO_PATH "merge-resolve" #define TEST_INDEX_PATH TEST_REPO_PATH "/index" -#define UPTODATE_BRANCH "master" -#define PREVIOUS_BRANCH "previous" - -#define FASTFORWARD_BRANCH "ff_branch" -#define FASTFORWARD_ID "fd89f8cffb663ac89095a0f9764902e93ceaca6a" - -#define NOFASTFORWARD_BRANCH "branch" -#define NOFASTFORWARD_ID "7cb63eed597130ba4abb87b3e544b85021905520" - /* Fixture setup and teardown */ void test_merge_trees_analysis__initialize(void) { - repo = cl_git_sandbox_init(TEST_REPO_PATH); + base_repo = cl_git_sandbox_init(TEST_REPO_PATH); + + cl_git_pass(git_repository_open_ext(&repo, TEST_REPO_PATH "/.git", GIT_REPOSITORY_OPEN_BARE, NULL)); + git_repository_index(&repo_index, repo); + + testimpl_merge_analysis__initialize(repo, repo_index); } void test_merge_trees_analysis__cleanup(void) { + testimpl_merge_analysis__cleanup(); + git_index_free(repo_index); - cl_git_sandbox_cleanup(); -} -static void analysis_from_branch( - git_merge_analysis_t *merge_analysis, - git_merge_preference_t *merge_pref, - const char *our_branchname, - const char *their_branchname) -{ - git_buf our_refname = GIT_BUF_INIT; - git_buf their_refname = GIT_BUF_INIT; - git_reference *our_ref; - git_reference *their_ref; - git_annotated_commit *their_head; - - if (our_branchname != NULL) { - cl_git_pass(git_buf_printf(&our_refname, "%s%s", GIT_REFS_HEADS_DIR, our_branchname)); - cl_git_pass(git_reference_lookup(&our_ref, repo, git_buf_cstr(&our_refname))); - } else { - cl_git_pass(git_reference_lookup(&our_ref, repo, GIT_HEAD_FILE)); - } - - cl_git_pass(git_buf_printf(&their_refname, "%s%s", GIT_REFS_HEADS_DIR, their_branchname)); - - cl_git_pass(git_reference_lookup(&their_ref, repo, git_buf_cstr(&their_refname))); - cl_git_pass(git_annotated_commit_from_ref(&their_head, repo, their_ref)); - - cl_git_pass(git_merge_analysis_for_ref(merge_analysis, merge_pref, repo, our_ref, (const git_annotated_commit **)&their_head, 1)); - - git_buf_dispose(&our_refname); - git_buf_dispose(&their_refname); - git_annotated_commit_free(their_head); - git_reference_free(our_ref); - git_reference_free(their_ref); + git_repository_free(repo); + repo = NULL; + + cl_git_sandbox_cleanup(); } void test_merge_trees_analysis__fastforward(void) { - git_merge_analysis_t merge_analysis; - git_merge_preference_t merge_pref; - - analysis_from_branch(&merge_analysis, &merge_pref, NULL, FASTFORWARD_BRANCH); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL|GIT_MERGE_ANALYSIS_FASTFORWARD, merge_analysis); + testimpl_merge_analysis__fastforward(); } void test_merge_trees_analysis__no_fastforward(void) { - git_merge_analysis_t merge_analysis; - git_merge_preference_t merge_pref; - - analysis_from_branch(&merge_analysis, &merge_pref, NULL, NOFASTFORWARD_BRANCH); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis); + testimpl_merge_analysis__no_fastforward(); } void test_merge_trees_analysis__uptodate(void) { - git_merge_analysis_t merge_analysis; - git_merge_preference_t merge_pref; - - analysis_from_branch(&merge_analysis, &merge_pref, NULL, UPTODATE_BRANCH); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis); + testimpl_merge_analysis__uptodate(); } void test_merge_trees_analysis__uptodate_merging_prev_commit(void) { - git_merge_analysis_t merge_analysis; - git_merge_preference_t merge_pref; - - analysis_from_branch(&merge_analysis, &merge_pref, NULL, PREVIOUS_BRANCH); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis); + testimpl_merge_analysis__uptodate_merging_prev_commit(); } void test_merge_trees_analysis__unborn(void) { - git_merge_analysis_t merge_analysis; - git_merge_preference_t merge_pref; - git_buf master = GIT_BUF_INIT; - - git_buf_joinpath(&master, git_repository_path(repo), "refs/heads/master"); - p_unlink(git_buf_cstr(&master)); - - analysis_from_branch(&merge_analysis, &merge_pref, NULL, NOFASTFORWARD_BRANCH); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD|GIT_MERGE_ANALYSIS_UNBORN, merge_analysis); - - git_buf_dispose(&master); + testimpl_merge_analysis__unborn(); } void test_merge_trees_analysis__fastforward_with_config_noff(void) { - git_config *config; - git_merge_analysis_t merge_analysis; - git_merge_preference_t merge_pref; - - git_repository_config(&config, repo); - git_config_set_string(config, "merge.ff", "false"); - - analysis_from_branch(&merge_analysis, &merge_pref, NULL, FASTFORWARD_BRANCH); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL|GIT_MERGE_ANALYSIS_FASTFORWARD, merge_analysis); - - cl_assert_equal_i(GIT_MERGE_PREFERENCE_NO_FASTFORWARD, (merge_pref & GIT_MERGE_PREFERENCE_NO_FASTFORWARD)); + testimpl_merge_analysis__fastforward_with_config_noff(); } void test_merge_trees_analysis__no_fastforward_with_config_ffonly(void) { - git_config *config; - git_merge_analysis_t merge_analysis; - git_merge_preference_t merge_pref; - - git_repository_config(&config, repo); - git_config_set_string(config, "merge.ff", "only"); - - analysis_from_branch(&merge_analysis, &merge_pref, NULL, NOFASTFORWARD_BRANCH); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis); - - cl_assert_equal_i(GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY, (merge_pref & GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY)); + testimpl_merge_analysis__no_fastforward_with_config_ffonly(); } void test_merge_trees_analysis__between_uptodate_refs(void) { - git_merge_analysis_t merge_analysis; - git_merge_preference_t merge_pref; - - analysis_from_branch(&merge_analysis, &merge_pref, NOFASTFORWARD_BRANCH, PREVIOUS_BRANCH); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis); + testimpl_merge_analysis__between_uptodate_refs(); } void test_merge_trees_analysis__between_noff_refs(void) { - git_merge_analysis_t merge_analysis; - git_merge_preference_t merge_pref; - - analysis_from_branch(&merge_analysis, &merge_pref, "branch", FASTFORWARD_BRANCH); - cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis); + testimpl_merge_analysis__between_noff_refs(); } |