Author: julianfoad
Date: Fri Oct 15 13:33:24 2010
New Revision: 1022912
URL: http://svn.apache.org/viewvc?rev=1022912&view=rev
Log:
* subversion/tests/libsvn_wc/db-test.c
(validate_node): Replace long-hand string comparisons with
SVN_TEST_STRING_ASSERT fopr clarity.
Modified:
subversion/trunk/subversion/tests/libsvn_wc/db-test.c
Modified: subversion/trunk/subversion/tests/libsvn_wc/db-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/db-test.c?rev=1022912&r1=1022911&r2=1022912&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/db-test.c Fri Oct 15 13:33:24
2010
@@ -580,28 +580,28 @@ validate_node(svn_wc__db_t *db,
}
value = apr_hash_get(props, "p1", APR_HASH_KEY_STRING);
- SVN_TEST_ASSERT(value != NULL && strcmp(value->data, "v1") == 0);
+ SVN_TEST_STRING_ASSERT(value->data, "v1");
SVN_ERR(svn_wc__db_base_get_prop(&value, db, path, "p1",
scratch_pool, scratch_pool));
- SVN_TEST_ASSERT(value != NULL && strcmp(value->data, "v1") == 0);
+ SVN_TEST_STRING_ASSERT(value->data, "v1");
value = apr_hash_get(props, "for-file", APR_HASH_KEY_STRING);
- SVN_TEST_ASSERT(value != NULL && strcmp(value->data, relpath) == 0);
+ SVN_TEST_STRING_ASSERT(value->data, relpath);
SVN_ERR(svn_wc__db_base_get_prop(&value, db, path, "for-file",
scratch_pool, scratch_pool));
- SVN_TEST_ASSERT(value != NULL && strcmp(value->data, relpath) == 0);
+ SVN_TEST_STRING_ASSERT(value->data, relpath);
SVN_ERR(svn_wc__db_read_props(&props, db, path,
scratch_pool, scratch_pool));
SVN_TEST_ASSERT(props != NULL);
value = apr_hash_get(props, "p1", APR_HASH_KEY_STRING);
- SVN_TEST_ASSERT(value != NULL && strcmp(value->data, "v1") == 0);
+ SVN_TEST_STRING_ASSERT(value->data, "v1");
SVN_ERR(svn_wc__db_read_pristine_props(&props, db, path,
scratch_pool, scratch_pool));
SVN_TEST_ASSERT(props != NULL);
value = apr_hash_get(props, "p1", APR_HASH_KEY_STRING);
- SVN_TEST_ASSERT(value != NULL && strcmp(value->data, "v1") == 0);
+ SVN_TEST_STRING_ASSERT(value->data, "v1");
/* Now add a property value and read it back (all on actual) */
apr_hash_set(props, "p999", APR_HASH_KEY_STRING, value);
@@ -611,7 +611,7 @@ validate_node(svn_wc__db_t *db,
scratch_pool, scratch_pool));
SVN_TEST_ASSERT(props != NULL);
value = apr_hash_get(props, "p999", APR_HASH_KEY_STRING);
- SVN_TEST_ASSERT(value != NULL && strcmp(value->data, "v1") == 0);
+ SVN_TEST_STRING_ASSERT(value->data, "v1");
return SVN_NO_ERROR;
}