Commit 6cf9a0b3ee341b8f56be7c1de4f2b23e98c28bbd
2021-09-14T12:34:45
Refactor shared code in longpath test.
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
diff --git a/tests/win32/longpath.c b/tests/win32/longpath.c
index 4bc8a83..294faea 100644
--- a/tests/win32/longpath.c
+++ b/tests/win32/longpath.c
@@ -64,15 +64,11 @@ void test_win32_longpath__workdir_path_validated(void)
#endif
}
-void test_win32_longpath__status_and_add(void)
-{
-#ifdef GIT_WIN32
- git_repository *repo = cl_git_sandbox_init("testrepo");
+static void assert_longpath_status_and_add(git_repository* repo) {
git_index *index;
git_buf out = GIT_BUF_INIT;
unsigned int status_flags;
- cl_repo_set_bool(repo, "core.longpaths", true);
cl_git_pass(git_repository_workdir_path(&out, repo, LONG_FILENAME));
cl_git_rewritefile(out.ptr, "This is a long path.\r\n");
@@ -88,33 +84,27 @@ void test_win32_longpath__status_and_add(void)
git_index_free(index);
git_buf_dispose(&out);
-#endif
}
-void test_win32_longpath__status_and_add_with_filter(void)
+void test_win32_longpath__status_and_add(void)
{
#ifdef GIT_WIN32
git_repository *repo = cl_git_sandbox_init("testrepo");
- git_index *index;
- git_buf out = GIT_BUF_INIT;
- unsigned int status_flags;
cl_repo_set_bool(repo, "core.longpaths", true);
- cl_repo_set_bool(repo, "core.autocrlf", true);
- cl_git_pass(git_repository_workdir_path(&out, repo, LONG_FILENAME));
- cl_git_rewritefile(out.ptr, "This is a long path.\r\n");
-
- cl_git_pass(git_status_file(&status_flags, repo, LONG_FILENAME));
- cl_assert_equal_i(GIT_STATUS_WT_NEW, status_flags);
+ assert_longpath_status_and_add(repo);
+#endif
+}
- cl_git_pass(git_repository_index(&index, repo));
- cl_git_pass(git_index_add_bypath(index, LONG_FILENAME));
+void test_win32_longpath__status_and_add_with_filter(void)
+{
+#ifdef GIT_WIN32
+ git_repository *repo = cl_git_sandbox_init("testrepo");
- cl_git_pass(git_status_file(&status_flags, repo, LONG_FILENAME));
- cl_assert_equal_i(GIT_STATUS_INDEX_NEW, status_flags);
+ cl_repo_set_bool(repo, "core.longpaths", true);
+ cl_repo_set_bool(repo, "core.autocrlf", true);
- git_index_free(index);
- git_buf_dispose(&out);
+ assert_longpath_status_and_add(repo);
#endif
}