thodg/libgit2/tests-clar/clar_libgit2.h

• 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/clar_libgit2.h

• #ifndef __CLAR_LIBGIT2__
  #define __CLAR_LIBGIT2__
  
  #include "clar.h"
  #include <git2.h>
  #include "common.h"
  
  /**
   * Special wrapper for `clar_must_pass` that passes
   * the last library error as the test failure message.
   *
   * Use this wrapper around all `git_` library calls that
   * return error codes!
   */
  #define cl_git_pass(expr) do { \
  	git_clearerror(); \
  	if ((expr) != GIT_SUCCESS) \
  		clar__assert(0, __FILE__, __LINE__, "Function call failed: " #expr, git_lasterror(), 1); \
  	} while(0)
  
  /**
   * Wrapper for `clar_must_fail` -- this one is
   * just for consistency. Use with `git_` library
   * calls that are supposed to fail!
   */
  #define cl_git_fail(expr) cl_must_fail(expr)
  
  /**
   * Wrapper for string comparison that knows about nulls.
   */
  #define cl_assert_strequal(a,b) \
  	cl_assert_strequal_internal(a,b,__FILE__,__LINE__,"string mismatch: " #a " != " #b)
  
  GIT_INLINE(void) cl_assert_strequal_internal(
  	const char *a, const char *b, const char *file, int line, const char *err)
  {
  	int match = (a == NULL || b == NULL) ? (a == b) : (strcmp(a, b) == 0);
  	if (!match) {
  		char buf[4096];
  		snprintf(buf, 4096, "'%s' != '%s'", a, b);
  		clar__assert(0, file, line, err, buf, 1);
  	}
  }
  
  #define cl_assert_intequal(a,b) \
  	do { if ((a) != (b)) { char buf[128]; snprintf(buf,128,"%d != %d",(a),(b)); clar__assert(0,__FILE__,__LINE__,#a " != " #b,buf,1); } } while (0)
  
  /*
   * Some utility macros for building long strings
   */
  #define REP4(STR)	 STR STR STR STR
  #define REP15(STR)	 REP4(STR) REP4(STR) REP4(STR) STR STR STR
  #define REP16(STR)	 REP4(REP4(STR))
  #define REP256(STR)  REP16(REP16(STR))
  #define REP1024(STR) REP4(REP256(STR))
  
  /* Write the contents of a buffer to disk */
  void cl_git_mkfile(const char *filename, const char *content);
  void cl_git_append2file(const char *filename, const char *new_content);
  
  /* Git sandbox setup helpers */
  
  git_repository *cl_git_sandbox_init(const char *sandbox);
  void cl_git_sandbox_cleanup(void);
  
  #endif
  

Download