> -----Original Message-----
> From: Hyrum K. Wright [mailto:hyrum_at_hyrumwright.org]
> Sent: vrijdag 19 juni 2009 23:10
> To: svn_at_subversion.tigris.org
> Subject: svn commit: r38109 - in trunk/subversion/tests: . libsvn_wc
>
> Author: hwright
> Date: Fri Jun 19 14:09:59 2009
> New Revision: 38109
>
> Log:
> Add a macro for testing string equality in the C testsuite.
>
> This could probably use some improvement, but I think it better to
> commit
> and let the many eyes do their magic.
>
> * subversion/tests/libsvn_wc/db-test.c
> (test_getting_info, test_working_info, test_scan_addition,
> test_op_relocate): Use the new macro.
>
> * subversion/tests/svn_test.h
> (SVN_TEST_STRING_ASSERT): New.
>
> Modified:
> trunk/subversion/tests/libsvn_wc/db-test.c
> trunk/subversion/tests/svn_test.h
>
<snip />
> Modified: trunk/subversion/tests/svn_test.h
> URL:
> http://svn.collab.net/viewvc/svn/trunk/subversion/tests/svn_test.h?path
> rev=38109&r1=38108&r2=38109
> =======================================================================
> =======
> --- trunk/subversion/tests/svn_test.h Fri Jun 19 14:03:28 2009
> (r38108)
> +++ trunk/subversion/tests/svn_test.h Fri Jun 19 14:09:59 2009
> (r38109)
> @@ -46,6 +46,26 @@ extern "C" {
> return svn_error_create(SVN_ERR_TEST_FAILED, 0, #expr); \
> } while (0)
>
> +/** Handy macro for testing string equality.
> + *
> + * Note: This assumes there is an a pool available for use somewhere
> in
> + * in the variable namespace.
> + */
> +#define SVN_TEST_STRING_ASSERT(expr, expected_expr) \
> + do { \
> + const char *tst_str1 = (expr); \
> + const char *tst_str2 = (expected_expr); \
> + \
> + if (tst_str2 == NULL && tst_str1 == NULL) \
> + break; \
> + if ( (tst_str2 != NULL && tst_str1 == NULL) \
> + || (strcmp(tst_str2, tst_str1) != 0) ) \
> + return svn_error_create(SVN_ERR_TEST_FAILED, 0, \
> + apr_psprintf(pool, \
> + "Strings not equal\n Expected: '%s'\n Found: '%s'", \
> + tst_str2, tst_str1)); \
> + } while(0)
Using svn_error_createf() allows removing the pool requirement. (And I think
the second argument to svn_error_create() should be NULL)
Bert
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2363689
Received on 2009-06-19 23:20:04 CEST