Commit 57f5d8dca5e5d080c59fe0dc3e2221dabd9d4c2c
2012-12-14T14:15:42
Remove placeholder files during tests
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
diff --git a/tests-clar/clone/empty.c b/tests-clar/clone/empty.c
new file mode 100644
index 0000000..93fe151
--- /dev/null
+++ b/tests-clar/clone/empty.c
@@ -0,0 +1,67 @@
+#include "clar_libgit2.h"
+
+#include "git2/clone.h"
+#include "repository.h"
+
+static git_clone_options g_options;
+static git_remote *g_origin;
+static git_repository *g_repo;
+
+void test_clone_empty__initialize(void)
+{
+ git_repository *sandbox = cl_git_sandbox_init("empty_bare.git");
+ cl_git_remove_placeholders(git_repository_path(sandbox), "dummy-marker.txt");
+
+ g_repo = NULL;
+
+ memset(&g_options, 0, sizeof(git_clone_options));
+ g_options.version = GIT_CLONE_OPTIONS_VERSION;
+ cl_git_pass(git_remote_new(&g_origin, NULL, "origin", cl_git_fixture_url("testrepo.git"), GIT_REMOTE_DEFAULT_FETCH));
+}
+
+void test_clone_empty__cleanup(void)
+{
+ git_remote_free(g_origin);
+ cl_git_sandbox_cleanup();
+}
+
+static void cleanup_repository(void *path)
+{
+ cl_fixture_cleanup((const char *)path);
+}
+
+void test_clone_empty__can_clone_an_empty_local_repo_barely(void)
+{
+ cl_set_cleanup(&cleanup_repository, "./empty");
+
+ git_remote_free(g_origin);
+ cl_git_pass(git_remote_new(&g_origin, NULL, "origin", "./empty_bare.git", GIT_REMOTE_DEFAULT_FETCH));
+
+ g_options.bare = true;
+ cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options));
+}
+
+void test_clone_empty__can_clone_an_empty_local_repo(void)
+{
+ cl_set_cleanup(&cleanup_repository, "./empty");
+
+ git_remote_free(g_origin);
+ cl_git_pass(git_remote_new(&g_origin, NULL, "origin", "./empty_bare.git", GIT_REMOTE_DEFAULT_FETCH));
+
+ cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options));
+}
+
+void test_clone_empty__can_clone_an_empty_standard_repo(void)
+{
+ cl_git_sandbox_cleanup();
+ g_repo = cl_git_sandbox_init("empty_standard_repo");
+ cl_git_remove_placeholders(git_repository_path(g_repo), "dummy-marker.txt");
+ git_repository_free(g_repo);
+
+ git_remote_free(g_origin);
+ cl_git_pass(git_remote_new(&g_origin, NULL, "origin", "./empty_standard_repo", GIT_REMOTE_DEFAULT_FETCH));
+
+ cl_set_cleanup(&cleanup_repository, "./empty");
+
+ cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options));
+}
diff --git a/tests-clar/clone/nonetwork.c b/tests-clar/clone/nonetwork.c
index 1283761..623a068 100644
--- a/tests-clar/clone/nonetwork.c
+++ b/tests-clar/clone/nonetwork.c
@@ -86,43 +86,3 @@ void test_clone_nonetwork__fail_with_already_existing_but_non_empty_directory(vo
cl_git_mkfile("./foo/bar", "Baz!");
cl_git_fail(git_clone(&g_repo, g_origin, "./foo", &g_options));
}
-
-void test_clone_nonetwork__can_clone_an_empty_local_repo_barely(void)
-{
- const char *src = cl_git_fixture_url("empty_bare.git");
- cl_set_cleanup(&cleanup_repository, "./empty");
-
- git_remote_free(g_origin);
- cl_git_pass(git_remote_new(&g_origin, NULL, "origin", src, GIT_REMOTE_DEFAULT_FETCH));
-
- g_options.bare = true;
- cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options));
-}
-
-void test_clone_nonetwork__can_clone_an_empty_local_repo(void)
-{
- const char *src = cl_git_fixture_url("empty_bare.git");
- cl_set_cleanup(&cleanup_repository, "./empty");
-
- git_remote_free(g_origin);
- cl_git_pass(git_remote_new(&g_origin, NULL, "origin", src, GIT_REMOTE_DEFAULT_FETCH));
-
- cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options));
-}
-
-void test_clone_nonetwork__can_clone_an_empty_standard_repo(void)
-{
- const char *src;
-
- cl_git_sandbox_init("empty_standard_repo");
- src = cl_git_path_url("./empty_standard_repo");
-
- git_remote_free(g_origin);
- cl_git_pass(git_remote_new(&g_origin, NULL, "origin", src, GIT_REMOTE_DEFAULT_FETCH));
-
- cl_set_cleanup(&cleanup_repository, "./empty");
-
- cl_git_pass(git_clone(&g_repo, g_origin, "./empty", &g_options));
-
- cl_git_sandbox_cleanup();
-}