Commit 5fff24ea1758b389c33029b367f16daa0c482a2e
2018-06-05T16:45:23
tests: status::ignore: fix style of a 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
diff --git a/tests/status/ignore.c b/tests/status/ignore.c
index 2c06d57..824475e 100644
--- a/tests/status/ignore.c
+++ b/tests/status/ignore.c
@@ -1158,29 +1158,24 @@ void test_status_ignore__subdir_ignore_everything_except_certain_files(void)
void test_status_ignore__deeper(void)
{
- int ignored;
-
- g_repo = cl_git_sandbox_init("empty_standard_repo");
-
- cl_git_mkfile("empty_standard_repo/.gitignore",
- "*.data\n"
- "!dont_ignore/*.data\n");
+ const char *test_files[] = {
+ "empty_standard_repo/foo.data",
+ "empty_standard_repo/bar.data",
+ "empty_standard_repo/dont_ignore/foo.data",
+ "empty_standard_repo/dont_ignore/bar.data",
+ NULL
+ };
- cl_git_pass(p_mkdir("empty_standard_repo/dont_ignore", 0777));
- cl_git_mkfile("empty_standard_repo/foo.data", "");
- cl_git_mkfile("empty_standard_repo/bar.data", "");
- cl_git_mkfile("empty_standard_repo/dont_ignore/foo.data", "");
- cl_git_mkfile("empty_standard_repo/dont_ignore/bar.data", "");
+ make_test_data("empty_standard_repo", test_files);
+ cl_git_mkfile("empty_standard_repo/.gitignore",
+ "*.data\n"
+ "!dont_ignore/*.data\n");
- cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "foo.data"));
- cl_assert_equal_i(1, ignored);
- cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "bar.data"));
- cl_assert_equal_i(1, ignored);
+ assert_is_ignored("foo.data");
+ assert_is_ignored("bar.data");
- cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "dont_ignore/foo.data"));
- cl_assert_equal_i(0, ignored);
- cl_git_pass(git_ignore_path_is_ignored(&ignored, g_repo, "dont_ignore/bar.data"));
- cl_assert_equal_i(0, ignored);
+ refute_is_ignored("dont_ignore/foo.data");
+ refute_is_ignored("dont_ignore/bar.data");
}
void test_status_ignore__unignored_dir_with_ignored_contents(void)