You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/03/06 18:39:25 UTC
svn commit: r1733812 - in /subversion/trunk/subversion/tests: svn_test_fs.c
svn_test_fs.h
Author: stefan2
Date: Sun Mar 6 17:39:25 2016
New Revision: 1733812
URL: http://svn.apache.org/viewvc?rev=1733812&view=rev
Log:
Switch a test function to the latest FS API.
* subversion/tests/svn_test_fs.h
(svn_test__validate_changes): Update docstring.
* subversion/tests/svn_test_fs.c
(svn_test__validate_changes): Use the latest FS API.
Modified:
subversion/trunk/subversion/tests/svn_test_fs.c
subversion/trunk/subversion/tests/svn_test_fs.h
Modified: subversion/trunk/subversion/tests/svn_test_fs.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test_fs.c?rev=1733812&r1=1733811&r2=1733812&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test_fs.c (original)
+++ subversion/trunk/subversion/tests/svn_test_fs.c Sun Mar 6 17:39:25 2016
@@ -646,10 +646,27 @@ svn_test__validate_changes(svn_fs_root_t
apr_hash_t *expected,
apr_pool_t *pool)
{
+ svn_fs_path_change_iterator_t *iter;
apr_hash_t *actual;
apr_hash_index_t *hi;
+ svn_fs_path_change3_t *change;
- SVN_ERR(svn_fs_paths_changed2(&actual, root, pool));
+ SVN_ERR(svn_fs_paths_changed3(&iter, root, pool, pool));
+ SVN_ERR(svn_fs_path_change_get(&change, iter));
+
+ /* We collect all changes b/c this is the easiest way to check for an
+ exact match against EXPECTED. */
+ actual = apr_hash_make(pool);
+ while (change)
+ {
+ const char *path = apr_pstrmemdup(pool, change->path.data,
+ change->path.len);
+ /* No duplicates! */
+ SVN_TEST_ASSERT(!apr_hash_get(actual, path, change->path.len));
+ apr_hash_set(actual, path, change->path.len, path);
+
+ SVN_ERR(svn_fs_path_change_get(&change, iter));
+ }
#if 0
/* Print ACTUAL and EXPECTED. */
Modified: subversion/trunk/subversion/tests/svn_test_fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/svn_test_fs.h?rev=1733812&r1=1733811&r2=1733812&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/svn_test_fs.h (original)
+++ subversion/trunk/subversion/tests/svn_test_fs.h Sun Mar 6 17:39:25 2016
@@ -134,7 +134,7 @@ svn_test__validate_tree(svn_fs_root_t *r
int num_entries,
apr_pool_t *pool);
-/* Verify that svn_fs_paths_changed2(ROOT) returns a hash with exactly
+/* Verify that svn_fs_paths_changed3(ROOT) returns a hash with exactly
the same keys as EXPECTED_KEYS. Values are not currently verified.
*/
svn_error_t *