diff options
Diffstat (limited to 'tests-clar/diff')
-rw-r--r-- | tests-clar/diff/iterator.c | 8 | ||||
-rw-r--r-- | tests-clar/diff/workdir.c | 20 |
2 files changed, 15 insertions, 13 deletions
diff --git a/tests-clar/diff/iterator.c b/tests-clar/diff/iterator.c index be29bea66..eee84810a 100644 --- a/tests-clar/diff/iterator.c +++ b/tests-clar/diff/iterator.c @@ -474,13 +474,14 @@ static const char *status_paths[] = { "subdir/current_file", "subdir/modified_file", "subdir/new_file", + "\xe8\xbf\x99", NULL }; void test_diff_iterator__workdir_1(void) { workdir_iterator_test( - "status", NULL, NULL, 12, 1, status_paths, "ignored_file"); + "status", NULL, NULL, 13, 1, status_paths, "ignored_file"); } static const char *status_paths_range_0[] = { @@ -527,13 +528,14 @@ static const char *status_paths_range_4[] = { "subdir/current_file", "subdir/modified_file", "subdir/new_file", + "\xe8\xbf\x99", NULL }; void test_diff_iterator__workdir_1_ranged_4(void) { workdir_iterator_test( - "status", "subdir/", NULL, 3, 0, status_paths_range_4, NULL); + "status", "subdir/", NULL, 4, 0, status_paths_range_4, NULL); } static const char *status_paths_range_5[] = { @@ -551,7 +553,7 @@ void test_diff_iterator__workdir_1_ranged_5(void) void test_diff_iterator__workdir_1_ranged_empty_0(void) { workdir_iterator_test( - "status", "z_does_not_exist", NULL, + "status", "\xff_does_not_exist", NULL, 0, 0, NULL, NULL); } diff --git a/tests-clar/diff/workdir.c b/tests-clar/diff/workdir.c index 1ea1af86a..42152f1ad 100644 --- a/tests-clar/diff/workdir.c +++ b/tests-clar/diff/workdir.c @@ -37,12 +37,12 @@ void test_diff_workdir__to_index(void) * - git diff * - mv .git .gitted */ - cl_assert_equal_i(12, exp.files); + cl_assert_equal_i(13, exp.files); cl_assert_equal_i(0, exp.file_adds); cl_assert_equal_i(4, exp.file_dels); cl_assert_equal_i(4, exp.file_mods); cl_assert_equal_i(1, exp.file_ignored); - cl_assert_equal_i(3, exp.file_untracked); + cl_assert_equal_i(4, exp.file_untracked); cl_assert_equal_i(8, exp.hunks); @@ -87,12 +87,12 @@ void test_diff_workdir__to_tree(void) cl_git_pass(git_diff_foreach( diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); - cl_assert(exp.files == 13); + cl_assert(exp.files == 14); cl_assert(exp.file_adds == 0); cl_assert(exp.file_dels == 4); cl_assert(exp.file_mods == 4); cl_assert(exp.file_ignored == 1); - cl_assert(exp.file_untracked == 4); + cl_assert(exp.file_untracked == 5); /* Since there is no git diff equivalent, let's just assume that the * text diffs produced by git_diff_foreach are accurate here. We will @@ -115,12 +115,12 @@ void test_diff_workdir__to_tree(void) cl_git_pass(git_diff_foreach( diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); - cl_assert(exp.files == 14); + cl_assert(exp.files == 15); cl_assert(exp.file_adds == 2); cl_assert(exp.file_dels == 5); cl_assert(exp.file_mods == 4); cl_assert(exp.file_ignored == 1); - cl_assert(exp.file_untracked == 2); + cl_assert(exp.file_untracked == 3); cl_assert(exp.hunks == 11); @@ -144,12 +144,12 @@ void test_diff_workdir__to_tree(void) cl_git_pass(git_diff_foreach( diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn)); - cl_assert(exp.files == 15); + cl_assert(exp.files == 16); cl_assert(exp.file_adds == 5); cl_assert(exp.file_dels == 4); cl_assert(exp.file_mods == 3); cl_assert(exp.file_ignored == 1); - cl_assert(exp.file_untracked == 2); + cl_assert(exp.file_untracked == 3); cl_assert(exp.hunks == 12); @@ -182,12 +182,12 @@ void test_diff_workdir__to_index_with_pathspec(void) cl_git_pass(git_diff_workdir_to_index(g_repo, &opts, &diff)); cl_git_pass(git_diff_foreach(diff, &exp, diff_file_fn, NULL, NULL)); - cl_assert_equal_i(12, exp.files); + cl_assert_equal_i(13, exp.files); cl_assert_equal_i(0, exp.file_adds); cl_assert_equal_i(4, exp.file_dels); cl_assert_equal_i(4, exp.file_mods); cl_assert_equal_i(1, exp.file_ignored); - cl_assert_equal_i(3, exp.file_untracked); + cl_assert_equal_i(4, exp.file_untracked); git_diff_list_free(diff); |