summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/worktree/open.c65
-rw-r--r--tests/worktree/submodule.c69
2 files changed, 69 insertions, 65 deletions
diff --git a/tests/worktree/open.c b/tests/worktree/open.c
index bdc8bcf9d..a97b43b15 100644
--- a/tests/worktree/open.c
+++ b/tests/worktree/open.c
@@ -2,9 +2,6 @@
#include "repository.h"
#include "worktree_helpers.h"
-#define WORKTREE_PARENT "submodules-worktree-parent"
-#define WORKTREE_CHILD "submodules-worktree-child"
-
#define COMMON_REPO "testrepo"
#define WORKTREE_REPO "testrepo-worktree"
@@ -130,65 +127,3 @@ void test_worktree_open__repository_with_nonexistent_parent(void)
cl_fixture_cleanup(WORKTREE_REPO);
}
-void test_worktree_open__submodule_worktree_parent(void)
-{
- worktree_fixture fixture =
- WORKTREE_FIXTURE_INIT("submodules", WORKTREE_PARENT);
- setup_fixture_worktree(&fixture);
-
- cl_assert(git_repository_path(fixture.worktree) != NULL);
- cl_assert(git_repository_workdir(fixture.worktree) != NULL);
-
- cl_assert(!fixture.repo->is_worktree);
- cl_assert(fixture.worktree->is_worktree);
-
- cleanup_fixture_worktree(&fixture);
-}
-
-void test_worktree_open__submodule_worktree_child(void)
-{
- worktree_fixture parent_fixture =
- WORKTREE_FIXTURE_INIT("submodules", WORKTREE_PARENT);
- worktree_fixture child_fixture =
- 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_open__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_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,
- git_repository_workdir(child_fixture.worktree), false, NULL));
- cl_git_pass(git_repository_open(&repo, path.ptr));
- cl_assert_equal_s(git_repository_workdir(child_fixture.worktree),
- git_repository_workdir(repo));
-
- git_buf_free(&path);
- git_repository_free(repo);
- cleanup_fixture_worktree(&child_fixture);
- cleanup_fixture_worktree(&parent_fixture);
-}
diff --git a/tests/worktree/submodule.c b/tests/worktree/submodule.c
new file mode 100644
index 000000000..1d8e46cc8
--- /dev/null
+++ b/tests/worktree/submodule.c
@@ -0,0 +1,69 @@
+#include "clar_libgit2.h"
+#include "repository.h"
+#include "worktree_helpers.h"
+
+#define WORKTREE_PARENT "submodules-worktree-parent"
+#define WORKTREE_CHILD "submodules-worktree-child"
+
+void test_worktree_submodule__submodule_worktree_parent(void)
+{
+ worktree_fixture fixture =
+ WORKTREE_FIXTURE_INIT("submodules", WORKTREE_PARENT);
+ setup_fixture_worktree(&fixture);
+
+ cl_assert(git_repository_path(fixture.worktree) != NULL);
+ cl_assert(git_repository_workdir(fixture.worktree) != NULL);
+
+ cl_assert(!fixture.repo->is_worktree);
+ cl_assert(fixture.worktree->is_worktree);
+
+ cleanup_fixture_worktree(&fixture);
+}
+
+void test_worktree_submodule__submodule_worktree_child(void)
+{
+ worktree_fixture parent_fixture =
+ WORKTREE_FIXTURE_INIT("submodules", WORKTREE_PARENT);
+ worktree_fixture child_fixture =
+ 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)
+{
+ 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_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,
+ git_repository_workdir(child_fixture.worktree), false, NULL));
+ cl_git_pass(git_repository_open(&repo, path.ptr));
+ cl_assert_equal_s(git_repository_workdir(child_fixture.worktree),
+ git_repository_workdir(repo));
+
+ git_buf_free(&path);
+ git_repository_free(repo);
+ cleanup_fixture_worktree(&child_fixture);
+ cleanup_fixture_worktree(&parent_fixture);
+}