thodg/libgit2/tests/apply/workdir.c

• Show log

  Commit

• Hash : 0eb63b9f
  Author :
  Date : 2018-06-25T19:50:35
  

  apply tests: separate common patch hunks Move the commonly-used patch hunks into a single constant location. This allows us to avoid re-declaring them in each test, and allows us to compose them to build a larger patch file that includes all the hunks.

Download

• tests/apply/workdir.c

• #include "clar_libgit2.h"
  #include "../merge/merge_helpers.h"
  
  static git_repository *repo;
  
  #define TEST_REPO_PATH "merge-recursive"
  
  #define DIFF_MODIFY_TWO_FILES \
  	"diff --git a/asparagus.txt b/asparagus.txt\n" \
  	"index f516580..ffb36e5 100644\n" \
  	"--- a/asparagus.txt\n" \
  	"+++ b/asparagus.txt\n" \
  	"@@ -1 +1 @@\n" \
  	"-ASPARAGUS SOUP!\n" \
  	"+ASPARAGUS SOUP.\n" \
  	"diff --git a/veal.txt b/veal.txt\n" \
  	"index 94d2c01..a7b0665 100644\n" \
  	"--- a/veal.txt\n" \
  	"+++ b/veal.txt\n" \
  	"@@ -1 +1 @@\n" \
  	"-VEAL SOUP!\n" \
  	"+VEAL SOUP.\n" \
  	"@@ -7 +7 @@ occasionally, then put into it a shin of veal, let it boil two hours\n" \
  	"-longer. take out the slices of ham, and skim off the grease if any\n" \
  	"+longer; take out the slices of ham, and skim off the grease if any\n"
  
  #define DIFF_DELETE_FILE \
  	"diff --git a/gravy.txt b/gravy.txt\n" \
  	"deleted file mode 100644\n" \
  	"index c4e6cca..0000000\n" \
  	"--- a/gravy.txt\n" \
  	"+++ /dev/null\n" \
  	"@@ -1,8 +0,0 @@\n" \
  	"-GRAVY SOUP.\n" \
  	"-\n" \
  	"-Get eight pounds of coarse lean beef--wash it clean and lay it in your\n" \
  	"-pot, put in the same ingredients as for the shin soup, with the same\n" \
  	"-quantity of water, and follow the process directed for that. Strain the\n" \
  	"-soup through a sieve, and serve it up clear, with nothing more than\n" \
  	"-toasted bread in it; two table-spoonsful of mushroom catsup will add a\n" \
  	"-fine flavour to the soup.\n"
  
  #define DIFF_ADD_FILE \
  	"diff --git a/newfile.txt b/newfile.txt\n" \
  	"new file mode 100644\n" \
  	"index 0000000..6370543\n" \
  	"--- /dev/null\n" \
  	"+++ b/newfile.txt\n" \
  	"@@ -0,0 +1,2 @@\n" \
  	"+This is a new file!\n" \
  	"+Added by a patch.\n"
  
  void test_apply_workdir__initialize(void)
  {
  	git_oid oid;
  	git_commit *commit;
  
  	repo = cl_git_sandbox_init(TEST_REPO_PATH);
  
  	git_oid_fromstr(&oid, "539bd011c4822c560c1d17cab095006b7a10f707");
  	cl_git_pass(git_commit_lookup(&commit, repo, &oid));
  	cl_git_pass(git_reset(repo, (git_object *)commit, GIT_RESET_HARD, NULL));
  	git_commit_free(commit);
  }
  
  void test_apply_workdir__cleanup(void)
  {
  	cl_git_sandbox_cleanup();
  }
  
  struct iterator_compare_data {
  	struct merge_index_entry *expected;
  	size_t cnt;
  	size_t idx;
  };
  
  static int iterator_compare(const git_index_entry *entry, void *_data)
  {
  	git_oid expected_id;
  
  	struct iterator_compare_data *data = (struct iterator_compare_data *)_data;
  
  	cl_assert_equal_i(GIT_IDXENTRY_STAGE(entry), data->expected[data->idx].stage);
  	cl_git_pass(git_oid_fromstr(&expected_id, data->expected[data->idx].oid_str));
  	cl_assert_equal_oid(&entry->id, &expected_id);
  	cl_assert_equal_i(entry->mode, data->expected[data->idx].mode);
  	cl_assert_equal_s(entry->path, data->expected[data->idx].path);
  
  	if (data->idx >= data->cnt)
  		return -1;
  
  	data->idx++;
  
  	return 0;
  }
  
  static void validate_apply_workdir(
  	git_repository *repo,
  	struct merge_index_entry *workdir_entries,
  	size_t workdir_cnt)
  {
  	git_index *index;
  	git_iterator *iterator;
  	git_iterator_options opts = GIT_ITERATOR_OPTIONS_INIT;
  	struct iterator_compare_data data = { workdir_entries, workdir_cnt };
  
  	opts.flags |= GIT_ITERATOR_INCLUDE_HASH;
  
  	cl_git_pass(git_repository_index(&index, repo));
  	cl_git_pass(git_iterator_for_workdir(&iterator, repo, index, NULL, &opts));
  
  	cl_git_pass(git_iterator_foreach(iterator, iterator_compare, &data));
  	cl_assert_equal_i(data.idx, data.cnt);
  
  	git_iterator_free(iterator);
  	git_index_free(index);
  }
  
  static int iterator_eq(const git_index_entry **entry, void *_data)
  {
  	GIT_UNUSED(_data);
  
  	if (!entry[0] || !entry[1])
  		return -1;
  
  	cl_assert_equal_i(GIT_IDXENTRY_STAGE(entry[0]), GIT_IDXENTRY_STAGE(entry[1]));
  	cl_assert_equal_oid(&entry[0]->id, &entry[1]->id);
  	cl_assert_equal_i(entry[0]->mode, entry[1]->mode);
  	cl_assert_equal_s(entry[0]->path, entry[1]->path);
  
  	return 0;
  }
  
  static void validate_index_unchanged(git_repository *repo)
  {
  	git_tree *head;
  	git_index *index;
  	git_iterator *head_iterator, *index_iterator, *iterators[2];
  
  	cl_git_pass(git_repository_head_tree(&head, repo));
  	cl_git_pass(git_repository_index(&index, repo));
  
  	cl_git_pass(git_iterator_for_tree(&head_iterator, head, NULL));
  	cl_git_pass(git_iterator_for_index(&index_iterator, repo, index, NULL));
  
  	iterators[0] = head_iterator;
  	iterators[1] = index_iterator;
  
  	cl_git_pass(git_iterator_walk(iterators, 2, iterator_eq, NULL));
  
  	git_iterator_free(head_iterator);
  	git_iterator_free(index_iterator);
  
  	git_tree_free(head);
  	git_index_free(index);
  }
  
  void test_apply_workdir__generated_diff(void)
  {
  	git_oid a_oid, b_oid;
  	git_commit *a_commit, *b_commit;
  	git_tree *a_tree, *b_tree;
  	git_diff *diff;
  	git_diff_options opts = GIT_DIFF_OPTIONS_INIT;
  
  	struct merge_index_entry workdir_expected[] = {
  		{ 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
  		{ 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
  		{ 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
  		{ 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
  		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
  		{ 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
  	};
  	size_t workdir_expected_cnt = sizeof(workdir_expected) /
  		sizeof(struct merge_index_entry);
  
  	git_oid_fromstr(&a_oid, "539bd011c4822c560c1d17cab095006b7a10f707");
  	git_oid_fromstr(&b_oid, "7c7bf85e978f1d18c0566f702d2cb7766b9c8d4f"); cl_git_pass(git_commit_lookup(&a_commit, repo, &a_oid));
  	cl_git_pass(git_commit_lookup(&b_commit, repo, &b_oid));
  
  	cl_git_pass(git_commit_tree(&a_tree, a_commit));
  	cl_git_pass(git_commit_tree(&b_tree, b_commit));
  
  	cl_git_pass(git_diff_tree_to_tree(&diff, repo, a_tree, b_tree, &opts));
  
  	cl_git_pass(git_apply(repo, diff, NULL));
  
  	validate_index_unchanged(repo);
  	validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
  
  	git_diff_free(diff);
  	git_tree_free(a_tree);
  	git_tree_free(b_tree);
  	git_commit_free(a_commit);
  	git_commit_free(b_commit);
  }
  
  void test_apply_workdir__parsed_diff(void)
  {
  	git_diff *diff;
  
  	struct merge_index_entry workdir_expected[] = {
  		{ 0100644, "ffb36e513f5fdf8a6ba850a20142676a2ac4807d", 0, "asparagus.txt" },
  		{ 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
  		{ 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
  		{ 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
  		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
  		{ 0100644, "a7b066537e6be7109abfe4ff97b675d4e077da20", 0, "veal.txt" },
  	};
  	size_t workdir_expected_cnt = sizeof(workdir_expected) /
  	    sizeof(struct merge_index_entry);
  
  	cl_git_pass(git_diff_from_buffer(&diff,
  		DIFF_MODIFY_TWO_FILES, strlen(DIFF_MODIFY_TWO_FILES)));
  	cl_git_pass(git_apply(repo, diff, NULL));
  
  	validate_index_unchanged(repo);
  	validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
  
  	git_diff_free(diff);
  }
  
  void test_apply_workdir__removes_file(void)
  {
  	git_diff *diff;
  
  	struct merge_index_entry workdir_expected[] = {
  		{ 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
  		{ 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
  		{ 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
  		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
  		{ 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
  	};
  	size_t workdir_expected_cnt = sizeof(workdir_expected) /
  	    sizeof(struct merge_index_entry);
  
  	cl_git_pass(git_diff_from_buffer(&diff, DIFF_DELETE_FILE,
  		strlen(DIFF_DELETE_FILE)));
  	cl_git_pass(git_apply(repo, diff, NULL));
  
  	validate_index_unchanged(repo);
  	validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
  
  	git_diff_free(diff);
  }
  
  void test_apply_workdir__adds_file(void)
  {
  	git_diff *diff;
  
  	struct merge_index_entry workdir_expected[] = {
  		{ 0100644, "f51658077d85f2264fa179b4d0848268cb3475c3", 0, "asparagus.txt" },
  		{ 0100644, "68f6182f4c85d39e1309d97c7e456156dc9c0096", 0, "beef.txt" },
  		{ 0100644, "4b7c5650008b2e747fe1809eeb5a1dde0e80850a", 0, "bouilli.txt" },
  		{ 0100644, "c4e6cca3ec6ae0148ed231f97257df8c311e015f", 0, "gravy.txt" },
  		{ 0100644, "6370543fcfedb3e6516ec53b06158f3687dc1447", 0, "newfile.txt" },
  		{ 0100644, "68af1fc7407fd9addf1701a87eb1c95c7494c598", 0, "oyster.txt" },
  		{ 0100644, "94d2c01087f48213bd157222d54edfefd77c9bba", 0, "veal.txt" },
  	};
  	size_t workdir_expected_cnt = sizeof(workdir_expected) /
  	    sizeof(struct merge_index_entry);
  
  	cl_git_pass(git_diff_from_buffer(&diff,
  		DIFF_ADD_FILE, strlen(DIFF_ADD_FILE)));
  	cl_git_pass(git_apply(repo, diff, NULL));
  
  	validate_index_unchanged(repo);
  	validate_apply_workdir(repo, workdir_expected, workdir_expected_cnt);
  
  	git_diff_free(diff);
  }
  

Download