thodg/libgit2/tests-clar/status/worktree.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/status/worktree.c

• #include "clar_libgit2.h"
  #include "fileops.h"
  #include "ignore.h"
  #include "status_data.h"
  
  
  /**
   * Auxiliary methods
   */
  static int
  cb_status__normal( const char *path, unsigned int status_flags, void *payload)
  {
  	struct status_entry_counts *counts = payload;
  
  	if (counts->entry_count >= counts->expected_entry_count) {
  		counts->wrong_status_flags_count++;
  		goto exit;
  	}
  
  	if (strcmp(path, counts->expected_paths[counts->entry_count])) {
  		counts->wrong_sorted_path++;
  		goto exit;
  	}
  
  	if (status_flags != counts->expected_statuses[counts->entry_count])
  		counts->wrong_status_flags_count++;
  
  exit:
  	counts->entry_count++;
  	return GIT_SUCCESS;
  }
  
  static int
  cb_status__count(const char *p, unsigned int s, void *payload)
  {
  	volatile int *count = (int *)payload;
  
  	GIT_UNUSED(p);
  	GIT_UNUSED(s);
  
  	(*count)++;
  
  	return GIT_SUCCESS;
  }
  
  
  /**
   * Initializer
   *
   * Not all of the tests in this file use the same fixtures, so we allow each
   * test to load their fixture at the top of the test function.
   */
  void test_status_worktree__initialize(void)
  {
  }
  
  /**
   * Cleanup
   *
   * This will be called once after each test finishes, even
   * if the test failed
   */
  void test_status_worktree__cleanup(void)
  {
  	cl_git_sandbox_cleanup();
  }
  
  /**
   * Tests - Status determination on a working tree
   */
  void test_status_worktree__whole_repository(void)
  {
  	struct status_entry_counts counts;
  	git_repository *repo = cl_git_sandbox_init("status");
  
  	memset(&counts, 0x0, sizeof(struct status_entry_counts));
  	counts.expected_entry_count = entry_count0;
  	counts.expected_paths = entry_paths0;
  	counts.expected_statuses = entry_statuses0;
  
  	cl_git_pass(
  		git_status_foreach(repo, cb_status__normal, &counts)
  	);
  
  	cl_assert(counts.entry_count == counts.expected_entry_count);
  	cl_assert(counts.wrong_status_flags_count == 0);
  	cl_assert(counts.wrong_sorted_path == 0);
  }
  
  void test_status_worktree__empty_repository(void)
  {
  	int count = 0;
  	git_repository *repo = cl_git_sandbox_init("empty_standard_repo");
  
  	cl_git_pass(git_status_foreach(repo, cb_status__count, &count));
  
  	cl_assert(count == 0);
  }
  
  void test_status_worktree__single_file(void)
  {
  	int i;
  	unsigned int status_flags;
  	git_repository *repo = cl_git_sandbox_init("status");
  
  	for (i = 0; i < (int)entry_count0; i++) {
  		cl_git_pass(
  			git_status_file(&status_flags, repo, entry_paths0[i])
  		);
  		cl_assert(entry_statuses0[i] == status_flags);
  	}
  }
  
  void test_status_worktree__ignores(void)
  {
  	int i, ignored;
  	git_repository *repo = cl_git_sandbox_init("status");
  
  	for (i = 0; i < (int)entry_count0; i++) {
  		cl_git_pass(
  			git_status_should_ignore(repo, entry_paths0[i], &ignored)
  		);
  		cl_assert(ignored == (entry_statuses0[i] == GIT_STATUS_IGNORED));
  	}
  
  	cl_git_pass(
  		git_status_should_ignore(repo, "nonexistent_file", &ignored)
  	);
  	cl_assert(!ignored);
  
  	cl_git_pass(
  		git_status_should_ignore(repo, "ignored_nonexistent_file", &ignored)
  	);
  	cl_assert(ignored);
  }
  

Download