thodg/libgit2/tests-clar/diff/index.c

• Show log

  Commit

• Hash : 854eccbb
  Author :
  Date : 2012-02-29T12:04:59
  

  Clean up GIT_UNUSED macros on all platforms It turns out that commit 31e9cfc4cbcaf1b38cdd3dbe3282a8f57e5366a5 did not fix the GIT_USUSED behavior on all platforms. This commit walks through and really cleans things up more thoroughly, getting rid of the unnecessary stuff. To remove the use of some GIT_UNUSED, I ended up adding a couple of new iterators for hashtables that allow you to iterator just over keys or just over values. In making this change, I found a bug in the clar tests (where we were doing *count++ but meant to do (*count)++ to increment the value). I fixed that but then found the test failing because it was not really using an empty repo. So, I took some of the code that I wrote for iterator testing and moved it to clar_helpers.c, then made use of that to make it easier to open fixtures on a per test basis even within a single test file.

Download

• tests-clar/diff/index.c

• #include "clar_libgit2.h"
  #include "diff_helpers.h"
  
  static git_repository *g_repo = NULL;
  
  void test_diff_index__initialize(void)
  {
  	g_repo = cl_git_sandbox_init("status");
  }
  
  void test_diff_index__cleanup(void)
  {
  	cl_git_sandbox_cleanup();
  }
  
  void test_diff_index__0(void)
  {
  	/* grabbed a couple of commit oids from the history of the attr repo */
  	const char *a_commit = "26a125ee1bf"; /* the current HEAD */
  	const char *b_commit = "0017bd4ab1ec3"; /* the start */
  	git_tree *a = resolve_commit_oid_to_tree(g_repo, a_commit);
  	git_tree *b = resolve_commit_oid_to_tree(g_repo, b_commit);
  	git_diff_options opts = {0};
  	git_diff_list *diff = NULL;
  	diff_expects exp;
  
  	cl_assert(a);
  	cl_assert(b);
  
  	opts.context_lines = 1;
  	opts.interhunk_lines = 1;
  
  	memset(&exp, 0, sizeof(exp));
  
  	cl_git_pass(git_diff_index_to_tree(g_repo, &opts, a, &diff));
  
  	cl_git_pass(git_diff_foreach(
  		diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
  
  	/* to generate these values:
  	 * - cd to tests/resources/status,
  	 * - mv .gitted .git
  	 * - git diff --name-status --cached 26a125ee1bf
  	 * - git diff -U1 --cached 26a125ee1bf
  	 * - mv .git .gitted
  	 */
  	cl_assert(exp.files == 8);
  	cl_assert(exp.file_adds == 3);
  	cl_assert(exp.file_dels == 2);
  	cl_assert(exp.file_mods == 3);
  
  	cl_assert(exp.hunks == 8);
  
  	cl_assert(exp.lines == 11);
  	cl_assert(exp.line_ctxt == 3);
  	cl_assert(exp.line_adds == 6);
  	cl_assert(exp.line_dels == 2);
  
  	git_diff_list_free(diff);
  	diff = NULL;
  	memset(&exp, 0, sizeof(exp));
  
  	cl_git_pass(git_diff_index_to_tree(g_repo, &opts, b, &diff));
  
  	cl_git_pass(git_diff_foreach(
  		diff, &exp, diff_file_fn, diff_hunk_fn, diff_line_fn));
  
  	/* to generate these values:
  	 * - cd to tests/resources/status,
  	 * - mv .gitted .git
  	 * - git diff --name-status --cached 0017bd4ab1ec3
  	 * - git diff -U1 --cached 0017bd4ab1ec3
  	 * - mv .git .gitted
  	 */
  	cl_assert(exp.files == 12);
  	cl_assert(exp.file_adds == 7);
  	cl_assert(exp.file_dels == 2);
  	cl_assert(exp.file_mods == 3);
  
  	cl_assert(exp.hunks == 12);
  
  	cl_assert(exp.lines == 16);
  	cl_assert(exp.line_ctxt == 3);
  	cl_assert(exp.line_adds == 11);
  	cl_assert(exp.line_dels == 2);
  
  	git_diff_list_free(diff);
  	diff = NULL;
  
  	git_tree_free(a);
  	git_tree_free(b);
  }
  

Download