Merge pull request #5109 from pks-t/pks/test-mergeanalysis-variant tests: merge::analysis: use test variants to avoid duplicated test suites
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 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339
diff --git a/tests/merge/analysis.c b/tests/merge/analysis.c
index b3c7b03..1432a7d 100644
--- a/tests/merge/analysis.c
+++ b/tests/merge/analysis.c
@@ -13,8 +13,7 @@ You probably want to make changes to both files.
#include "refs.h"
#include "posix.h"
-static git_repository *repo;
-static git_index *repo_index;
+#define TEST_REPO_PATH "merge-resolve"
#define UPTODATE_BRANCH "master"
#define PREVIOUS_BRANCH "previous"
@@ -25,18 +24,27 @@ static git_index *repo_index;
#define NOFASTFORWARD_BRANCH "branch"
#define NOFASTFORWARD_ID "7cb63eed597130ba4abb87b3e544b85021905520"
+static git_repository *sandbox;
+static git_repository *repo;
+
+void test_merge_analysis__initialize_with_bare_repository(void)
+{
+ sandbox = cl_git_sandbox_init(TEST_REPO_PATH);
+ cl_git_pass(git_repository_open_ext(&repo, git_repository_path(sandbox),
+ GIT_REPOSITORY_OPEN_BARE, NULL));
+}
-/* Fixture setup and teardown */
-void testimpl_merge_analysis__initialize(git_repository *t_repo, git_index *t_repo_index)
+void test_merge_analysis__initialize_with_nonbare_repository(void)
{
- repo = t_repo;
- repo_index = t_repo_index;
+ sandbox = cl_git_sandbox_init(TEST_REPO_PATH);
+ cl_git_pass(git_repository_open_ext(&repo, git_repository_workdir(sandbox),
+ 0, NULL));
}
-void testimpl_merge_analysis__cleanup(void)
+void test_merge_analysis__cleanup(void)
{
- repo_index = NULL;
- repo = NULL;
+ git_repository_free(repo);
+ cl_git_sandbox_cleanup();
}
static void analysis_from_branch(
@@ -72,7 +80,7 @@ static void analysis_from_branch(
git_reference_free(their_ref);
}
-void testimpl_merge_analysis__fastforward(void)
+void test_merge_analysis__fastforward(void)
{
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
@@ -81,7 +89,7 @@ void testimpl_merge_analysis__fastforward(void)
cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL|GIT_MERGE_ANALYSIS_FASTFORWARD, merge_analysis);
}
-void testimpl_merge_analysis__no_fastforward(void)
+void test_merge_analysis__no_fastforward(void)
{
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
@@ -90,7 +98,7 @@ void testimpl_merge_analysis__no_fastforward(void)
cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis);
}
-void testimpl_merge_analysis__uptodate(void)
+void test_merge_analysis__uptodate(void)
{
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
@@ -99,7 +107,7 @@ void testimpl_merge_analysis__uptodate(void)
cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis);
}
-void testimpl_merge_analysis__uptodate_merging_prev_commit(void)
+void test_merge_analysis__uptodate_merging_prev_commit(void)
{
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
@@ -108,14 +116,14 @@ void testimpl_merge_analysis__uptodate_merging_prev_commit(void)
cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis);
}
-void testimpl_merge_analysis__unborn(void)
+void test_merge_analysis__unborn(void)
{
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
git_buf master = GIT_BUF_INIT;
cl_git_pass(git_buf_joinpath(&master, git_repository_path(repo), "refs/heads/master"));
- p_unlink(git_buf_cstr(&master));
+ cl_must_pass(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);
@@ -123,7 +131,7 @@ void testimpl_merge_analysis__unborn(void)
git_buf_dispose(&master);
}
-void testimpl_merge_analysis__fastforward_with_config_noff(void)
+void test_merge_analysis__fastforward_with_config_noff(void)
{
git_config *config;
git_merge_analysis_t merge_analysis;
@@ -140,7 +148,7 @@ void testimpl_merge_analysis__fastforward_with_config_noff(void)
git_config_free(config);
}
-void testimpl_merge_analysis__no_fastforward_with_config_ffonly(void)
+void test_merge_analysis__no_fastforward_with_config_ffonly(void)
{
git_config *config;
git_merge_analysis_t merge_analysis;
@@ -157,7 +165,7 @@ void testimpl_merge_analysis__no_fastforward_with_config_ffonly(void)
git_config_free(config);
}
-void testimpl_merge_analysis__between_uptodate_refs(void)
+void test_merge_analysis__between_uptodate_refs(void)
{
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
@@ -166,7 +174,7 @@ void testimpl_merge_analysis__between_uptodate_refs(void)
cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis);
}
-void testimpl_merge_analysis__between_noff_refs(void)
+void test_merge_analysis__between_noff_refs(void)
{
git_merge_analysis_t merge_analysis;
git_merge_preference_t merge_pref;
diff --git a/tests/merge/analysis.h b/tests/merge/analysis.h
deleted file mode 100644
index f97e73e..0000000
--- a/tests/merge/analysis.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef INCLUDE_cl_merge_analysis_h__
-#define INCLUDE_cl_merge_analysis_h__
-
-void testimpl_merge_analysis__initialize(git_repository *t_repo, git_index *t_repo_index);
-void testimpl_merge_analysis__cleanup(void);
-void testimpl_merge_analysis__fastforward(void);
-void testimpl_merge_analysis__no_fastforward(void);
-void testimpl_merge_analysis__uptodate(void);
-void testimpl_merge_analysis__uptodate_merging_prev_commit(void);
-void testimpl_merge_analysis__unborn(void);
-void testimpl_merge_analysis__fastforward_with_config_noff(void);
-void testimpl_merge_analysis__no_fastforward_with_config_ffonly(void);
-void testimpl_merge_analysis__between_uptodate_refs(void);
-void testimpl_merge_analysis__between_noff_refs(void);
-
-#endif
diff --git a/tests/merge/trees/analysis.c b/tests/merge/trees/analysis.c
deleted file mode 100644
index ce61085..0000000
--- a/tests/merge/trees/analysis.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-NOTE: this is essentially duplicated from tests/merge/workdir/analysis.c
-You probably want to make changes to both files.
-*/
-
-#include "clar_libgit2.h"
-#include "git2/repository.h"
-#include "../analysis.h"
-
-static git_repository *repo;
-static git_repository *bare_repo;
-static git_index *repo_index;
-
-#define TEST_REPO_PATH "merge-resolve"
-#define TEST_INDEX_PATH TEST_REPO_PATH "/index"
-
-
-/* Fixture setup and teardown */
-void test_merge_trees_analysis__initialize(void)
-{
- repo = cl_git_sandbox_init(TEST_REPO_PATH);
-
- cl_git_pass(git_repository_open_ext(&bare_repo, TEST_REPO_PATH "/.git", GIT_REPOSITORY_OPEN_BARE, NULL));
-
- git_repository_index(&repo_index, bare_repo);
-
- testimpl_merge_analysis__initialize(bare_repo, repo_index);
-}
-
-void test_merge_trees_analysis__cleanup(void)
-{
- testimpl_merge_analysis__cleanup();
-
- git_index_free(repo_index);
- repo_index = NULL;
-
- git_repository_free(bare_repo);
- bare_repo = NULL;
-
- cl_git_sandbox_cleanup();
- repo = NULL;
-}
-
-void test_merge_trees_analysis__fastforward(void)
-{
- testimpl_merge_analysis__fastforward();
-}
-
-void test_merge_trees_analysis__no_fastforward(void)
-{
- testimpl_merge_analysis__no_fastforward();
-}
-
-void test_merge_trees_analysis__uptodate(void)
-{
- testimpl_merge_analysis__uptodate();
-}
-
-void test_merge_trees_analysis__uptodate_merging_prev_commit(void)
-{
- testimpl_merge_analysis__uptodate_merging_prev_commit();
-}
-
-void test_merge_trees_analysis__unborn(void)
-{
- testimpl_merge_analysis__unborn();
-}
-
-void test_merge_trees_analysis__fastforward_with_config_noff(void)
-{
- testimpl_merge_analysis__fastforward_with_config_noff();
-}
-
-void test_merge_trees_analysis__no_fastforward_with_config_ffonly(void)
-{
- testimpl_merge_analysis__no_fastforward_with_config_ffonly();
-}
-
-void test_merge_trees_analysis__between_uptodate_refs(void)
-{
- testimpl_merge_analysis__between_uptodate_refs();
-}
-
-void test_merge_trees_analysis__between_noff_refs(void)
-{
- testimpl_merge_analysis__between_noff_refs();
-}
diff --git a/tests/merge/workdir/analysis.c b/tests/merge/workdir/analysis.c
deleted file mode 100644
index 08158f8..0000000
--- a/tests/merge/workdir/analysis.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-NOTE: this is essentially duplicated with tests/merge/trees/analysis.c
-You probably want to make changes to both files.
-*/
-
-#include "clar_libgit2.h"
-#include "git2/repository.h"
-#include "../analysis.h"
-
-static git_repository *repo;
-static git_index *repo_index;
-
-#define TEST_REPO_PATH "merge-resolve"
-#define TEST_INDEX_PATH TEST_REPO_PATH "/.git/index"
-
-
-/* Fixture setup and teardown */
-void test_merge_workdir_analysis__initialize(void)
-{
- repo = cl_git_sandbox_init(TEST_REPO_PATH);
- git_repository_index(&repo_index, repo);
-
- testimpl_merge_analysis__initialize(repo, repo_index);
-}
-
-void test_merge_workdir_analysis__cleanup(void)
-{
- testimpl_merge_analysis__cleanup();
-
- git_index_free(repo_index);
- repo_index = NULL;
-
- cl_git_sandbox_cleanup();
- repo = NULL;
-}
-
-void test_merge_workdir_analysis__fastforward(void)
-{
- testimpl_merge_analysis__fastforward();
-}
-
-void test_merge_workdir_analysis__no_fastforward(void)
-{
- testimpl_merge_analysis__no_fastforward();
-}
-
-void test_merge_workdir_analysis__uptodate(void)
-{
- testimpl_merge_analysis__uptodate();
-}
-
-void test_merge_workdir_analysis__uptodate_merging_prev_commit(void)
-{
- testimpl_merge_analysis__uptodate_merging_prev_commit();
-}
-
-void test_merge_workdir_analysis__unborn(void)
-{
- testimpl_merge_analysis__unborn();
-}
-
-void test_merge_workdir_analysis__fastforward_with_config_noff(void)
-{
- testimpl_merge_analysis__fastforward_with_config_noff();
-}
-
-void test_merge_workdir_analysis__no_fastforward_with_config_ffonly(void)
-{
- testimpl_merge_analysis__no_fastforward_with_config_ffonly();
-}
-
-void test_merge_workdir_analysis__between_uptodate_refs(void)
-{
- testimpl_merge_analysis__between_uptodate_refs();
-}
-
-void test_merge_workdir_analysis__between_noff_refs(void)
-{
- testimpl_merge_analysis__between_noff_refs();
-}