svn commit: r1134295 - in /subversion/trunk/subversion/tests: libsvn_subr/dirent_uri-test.c libsvn_wc/utils.c

[rhuijben]

Author: rhuijben
Date: Fri Jun 10 12:46:48 2011
New Revision: 1134295

URL: http://svn.apache.org/viewvc?rev=1134295&view=rev
Log:
Use non deprecated svn_io_ functions in a few places in our test suite, where
we aren't explicitly testing these functions.

Deprecation warnings are by default disabled in these test files to
allow testing old functions without many warnings.

* subversion/tests/libsvn_subr/dirent_uri-test.c
  (test_dirent_get_absolute_from_lc_drive): Use svn_io_get_dirents3 and
    new struct.

* subversion/tests/libsvn_wc/utils.c
  (svn_test__create_fake_wc): Use svn_io_remove_file2.

Modified:
    subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c
    subversion/trunk/subversion/tests/libsvn_wc/utils.c

Modified: subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c?rev=1134295&r1=1134294&r2=1134295&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c Fri Jun 10 
12:46:48 2011
@@ -2129,7 +2129,7 @@ test_dirent_get_absolute_from_lc_drive(a
   if (! getdcwd(3, current_dir_on_C, sizeof(current_dir_on_C)))
     return svn_error_create(SVN_ERR_BASE, NULL, "getdcwd() failed");
 
-  SVN_ERR(svn_io_get_dirents2(&dirents, "C:\\", pool));
+  SVN_ERR(svn_io_get_dirents3(&dirents, "C:\\", TRUE, pool, pool));
 
   /* We need a directory on 'C:\' to switch to lower case and back.
      We use the first directory we can find that is not the CWD and
@@ -2138,7 +2138,7 @@ test_dirent_get_absolute_from_lc_drive(a
   for (hi = apr_hash_first(pool, dirents); hi; hi = apr_hash_next(hi))
     {
       const char *dir = svn__apr_hash_index_key(hi);
-      svn_io_dirent_t *de = svn__apr_hash_index_val(hi);
+      svn_io_dirent2_t *de = svn__apr_hash_index_val(hi);
 
       if (de->kind == svn_node_dir &&
           strcmp(dir, current_dir_on_C))

Modified: subversion/trunk/subversion/tests/libsvn_wc/utils.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/utils.c?rev=1134295&r1=1134294&r2=1134295&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/utils.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/utils.c Fri Jun 10 12:46:48 2011
@@ -130,7 +130,7 @@ svn_test__create_fake_wc(const char *wc_
   /* Create fake-wc/SUBDIR/.svn/ for placing the metadata. */
   SVN_ERR(svn_io_make_dir_recursively(dotsvn_abspath, scratch_pool));
 
-  svn_error_clear(svn_io_remove_file(db_abspath, scratch_pool));
+  svn_error_clear(svn_io_remove_file2(db_abspath, FALSE, scratch_pool));
   SVN_ERR(svn_wc__db_util_open_db(&sdb, wc_abspath, "wc.db",
                                   svn_sqlite__mode_rwcreate, my_statements,
                                   result_pool, scratch_pool));