index::crlf: simplify test case
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 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174
diff --git a/tests/index/crlf.c b/tests/index/crlf.c
index 6544d9b..334513e 100644
--- a/tests/index/crlf.c
+++ b/tests/index/crlf.c
@@ -43,64 +43,43 @@ struct compare_data
static int add_and_check_file(void *payload, git_buf *actual_path)
{
- git_buf expected_path_oid = GIT_BUF_INIT;
+ git_buf expected_path = GIT_BUF_INIT;
git_buf expected_path_fail = GIT_BUF_INIT;
git_buf expected_contents = GIT_BUF_INIT;
struct compare_data *cd = payload;
- bool failed = true;
- int cmp_git, cmp_gitattributes;
char *basename;
- int add_bypath_ret;
const git_index_entry *entry;
- git_oid oid;
- git_error_state error = { 0 };
+ git_blob *blob;
basename = git_path_basename(actual_path->ptr);
- cmp_git = strcmp(basename, ".git");
- cmp_gitattributes = strcmp(basename, ".gitattributes");
-
- if (cmp_git == 0 || cmp_gitattributes == 0) {
- failed = false;
- goto done;
- }
- giterr_clear();
- add_bypath_ret = git_index_add_bypath(g_index, basename);
- giterr_state_capture(&error, add_bypath_ret);
+ if (!strcmp(basename, ".git") || !strcmp(basename, ".gitattributes"))
+ return 0;
- entry = git_index_get_bypath(g_index, basename, 0);
- if (!add_bypath_ret && !entry)
- goto done;
+ cl_git_pass(git_buf_joinpath(&expected_path, cd->dirname, basename));
- cl_git_pass(git_buf_joinpath(&expected_path_oid, cd->dirname, basename));
- cl_git_pass(git_buf_joinpath(&expected_path_fail, cd->dirname, basename));
- git_buf_puts(&expected_path_oid, ".obj");
- git_buf_puts(&expected_path_fail, ".fail");
+ cl_git_pass(git_buf_puts(&expected_path_fail, expected_path.ptr));
+ cl_git_pass(git_buf_puts(&expected_path_fail, ".fail"));
- if (git_path_isfile(expected_path_oid.ptr)) {
- if (add_bypath_ret)
- goto done;
+ if (git_path_isfile(expected_path.ptr)) {
+ cl_git_pass(git_index_add_bypath(g_index, basename));
- if (git_futils_readbuffer(&expected_contents, expected_path_oid.ptr) < 0)
- goto done;
+ cl_assert(entry = git_index_get_bypath(g_index, basename, 0));
+ cl_git_pass(git_blob_lookup(&blob, g_repo, &entry->id));
- if (git_oid_fromstr(&oid, expected_contents.ptr))
- goto done;
- if (!git_oid_equal(&oid, &entry->id))
- goto done;
- }
-
- if (git_path_isfile(expected_path_fail.ptr)) {
- if (!add_bypath_ret)
- goto done;
-
- if (git_futils_readbuffer(&expected_contents, expected_path_fail.ptr) < 0)
- goto done;
+ cl_git_pass(git_futils_readbuffer(&expected_contents, expected_path.ptr));
+ cl_assert_equal_s(expected_contents, git_blob_rawcontent(blob));
+ git_blob_free(blob);
+ } else if (git_path_isfile(expected_path_fail.ptr)) {
+ cl_git_pass(git_futils_readbuffer(&expected_contents, expected_path_fail.ptr));
git_buf_rtrim(&expected_contents);
- if (error.error_msg.klass != GITERR_FILTER || strstr(error.error_msg.message, expected_contents.ptr) == NULL)
- goto done;
+ cl_git_fail(git_index_add_bypath(g_index, basename));
+ cl_assert_equal_i(GITERR_FILTER, giterr_last()->klass);
+ cl_assert_equal_s(expected_contents.ptr, giterr_last()->message);
+ } else {
+ cl_fail("unexpected index failure");
}
failed = false;
@@ -108,19 +87,17 @@ static int add_and_check_file(void *payload, git_buf *actual_path)
done:
if (failed) {
git_buf details = GIT_BUF_INIT;
- git_buf_printf(&details, "filename=%s, safecrlf=%s, autocrlf=%s, attrs={%s}",
- git_path_basename(actual_path->ptr), cd->safecrlf, cd->autocrlf, cd->attrs);
+ git_buf_printf(&details, "filename=%s, system=%s, autocrlf=%s, safecrlf=%s, attrs={%s}",
+ basename, cd->systype, cd->autocrlf, cd->safecrlf, cd->attrs);
clar__fail(__FILE__, __LINE__,
- "adding file did not work as expected", details.ptr, 0);
- git_buf_free(&details);
+ "index contents did not match expected", details.ptr, 0);
+ git_buf_dispose(&details);
}
git__free(basename);
- git_buf_free(&expected_contents);
- git_buf_free(&expected_path_oid);
- git_buf_free(&expected_path_fail);
- giterr_state_free(&error);
-
+ git_buf_dispose(&expected_contents);
+ git_buf_dispose(&expected_path);
+ git_buf_dispose(&expected_path_fail);
return 0;
}
@@ -135,12 +112,12 @@ static void test_add_index(const char *safecrlf, const char *autocrlf, const cha
git_buf_puts(&reponame, "crlf");
- git_buf_puts(&sandboxname, "safecrlf_");
- git_buf_puts(&sandboxname, safecrlf);
-
- git_buf_puts(&sandboxname, ",autocrlf_");
+ git_buf_puts(&sandboxname, "autocrlf_");
git_buf_puts(&sandboxname, autocrlf);
+ git_buf_puts(&sandboxname, ",safecrlf_");
+ git_buf_puts(&sandboxname, safecrlf);
+
if (*attrs) {
git_buf_puts(&sandboxname, ",");
@@ -162,7 +139,7 @@ static void test_add_index(const char *safecrlf, const char *autocrlf, const cha
cl_git_pass(git_index_clear(g_index));
- git_buf_joinpath(&expected_dirname, "crlf_data", "checkin_results");
+ git_buf_joinpath(&expected_dirname, "crlf_data", "posix_to_odb");
git_buf_joinpath(&expected_fixture, expected_dirname.ptr, sandboxname.ptr);
cl_fixture_sandbox(expected_fixture.ptr);
@@ -199,13 +176,18 @@ static void set_up_workingdir(const char *name)
git_vector_free_deep(&contents);
/* copy input files */
- git_path_dirload(&contents, cl_fixture("crlf_data/checkin_input_files"), 0, 0);
+ git_path_dirload(&contents, cl_fixture("crlf"), 0, 0);
git_vector_foreach(&contents, i, fn) {
char *basename = git_path_basename(fn);
git_buf dest_filename = GIT_BUF_INIT;
- git_buf_joinpath(&dest_filename, name, basename);
+
+ if (strcmp(basename, ".gitted") &&
+ strcmp(basename, ".gitattributes")) {
+ git_buf_joinpath(&dest_filename, name, basename);
+ cl_git_pass(git_futils_cp(fn, dest_filename.ptr, 0644));
+ }
+
git__free(basename);
- cl_git_pass(git_futils_cp(fn, dest_filename.ptr, 0644));
git_buf_free(&dest_filename);
}
git_vector_free_deep(&contents);
@@ -217,7 +199,7 @@ void test_index_crlf__matches_core_git(void)
const char *autocrlf[] = { "true", "false", "input", NULL };
const char *attrs[] = { "", "-crlf", "-text", "eol=crlf", "eol=lf",
"text", "text eol=crlf", "text eol=lf",
- "text=auto", "text=auto eol=crlf", "text=auto eol=lf",
+ "text=auto", "text=auto eol=crlf", "text=auto eol=lf",
NULL };
const char **a, **b, **c;