tests: worktree: unify init/cleanup in submodule tests

This commit is contained in:
Patrick Steinhardt 2017-03-15 12:28:05 +01:00
parent aa593a65df
commit 548e5bdf1e

View File

@ -5,65 +5,55 @@
#define WORKTREE_PARENT "submodules-worktree-parent" #define WORKTREE_PARENT "submodules-worktree-parent"
#define WORKTREE_CHILD "submodules-worktree-child" #define WORKTREE_CHILD "submodules-worktree-child"
static worktree_fixture parent
= WORKTREE_FIXTURE_INIT("submodules", WORKTREE_PARENT);
static worktree_fixture child
= WORKTREE_FIXTURE_INIT(NULL, WORKTREE_CHILD);
void test_worktree_submodule__initialize(void)
{
setup_fixture_worktree(&parent);
cl_git_pass(p_rename(
"submodules/testrepo/.gitted",
"submodules/testrepo/.git"));
setup_fixture_worktree(&child);
}
void test_worktree_submodule__cleanup(void)
{
cleanup_fixture_worktree(&child);
cleanup_fixture_worktree(&parent);
}
void test_worktree_submodule__submodule_worktree_parent(void) void test_worktree_submodule__submodule_worktree_parent(void)
{ {
worktree_fixture fixture = cl_assert(git_repository_path(parent.worktree) != NULL);
WORKTREE_FIXTURE_INIT("submodules", WORKTREE_PARENT); cl_assert(git_repository_workdir(parent.worktree) != NULL);
setup_fixture_worktree(&fixture);
cl_assert(git_repository_path(fixture.worktree) != NULL); cl_assert(!parent.repo->is_worktree);
cl_assert(git_repository_workdir(fixture.worktree) != NULL); cl_assert(parent.worktree->is_worktree);
cl_assert(!fixture.repo->is_worktree);
cl_assert(fixture.worktree->is_worktree);
cleanup_fixture_worktree(&fixture);
} }
void test_worktree_submodule__submodule_worktree_child(void) void test_worktree_submodule__submodule_worktree_child(void)
{ {
worktree_fixture parent_fixture = cl_assert(!parent.repo->is_worktree);
WORKTREE_FIXTURE_INIT("submodules", WORKTREE_PARENT); cl_assert(parent.worktree->is_worktree);
worktree_fixture child_fixture = cl_assert(child.worktree->is_worktree);
WORKTREE_FIXTURE_INIT(NULL, WORKTREE_CHILD);
setup_fixture_worktree(&parent_fixture);
cl_git_pass(p_rename(
"submodules/testrepo/.gitted",
"submodules/testrepo/.git"));
setup_fixture_worktree(&child_fixture);
cl_assert(!parent_fixture.repo->is_worktree);
cl_assert(parent_fixture.worktree->is_worktree);
cl_assert(child_fixture.worktree->is_worktree);
cleanup_fixture_worktree(&child_fixture);
cleanup_fixture_worktree(&parent_fixture);
} }
void test_worktree_submodule__open_discovered_submodule_worktree(void) void test_worktree_submodule__open_discovered_submodule_worktree(void)
{ {
worktree_fixture parent_fixture =
WORKTREE_FIXTURE_INIT("submodules", WORKTREE_PARENT);
worktree_fixture child_fixture =
WORKTREE_FIXTURE_INIT(NULL, WORKTREE_CHILD);
git_buf path = GIT_BUF_INIT; git_buf path = GIT_BUF_INIT;
git_repository *repo; git_repository *repo;
setup_fixture_worktree(&parent_fixture);
cl_git_pass(p_rename(
"submodules/testrepo/.gitted",
"submodules/testrepo/.git"));
setup_fixture_worktree(&child_fixture);
cl_git_pass(git_repository_discover(&path, cl_git_pass(git_repository_discover(&path,
git_repository_workdir(child_fixture.worktree), false, NULL)); git_repository_workdir(child.worktree), false, NULL));
cl_git_pass(git_repository_open(&repo, path.ptr)); cl_git_pass(git_repository_open(&repo, path.ptr));
cl_assert_equal_s(git_repository_workdir(child_fixture.worktree), cl_assert_equal_s(git_repository_workdir(child.worktree),
git_repository_workdir(repo)); git_repository_workdir(repo));
git_buf_free(&path); git_buf_free(&path);
git_repository_free(repo); git_repository_free(repo);
cleanup_fixture_worktree(&child_fixture);
cleanup_fixture_worktree(&parent_fixture);
} }