Return-Path: Delivered-To: apmail-apr-cvs-archive@www.apache.org Received: (qmail 2209 invoked from network); 6 Mar 2004 18:02:17 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 6 Mar 2004 18:02:17 -0000 Received: (qmail 86239 invoked by uid 500); 6 Mar 2004 18:02:09 -0000 Delivered-To: apmail-apr-cvs-archive@apr.apache.org Received: (qmail 86182 invoked by uid 500); 6 Mar 2004 18:02:09 -0000 Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Reply-To: dev@apr.apache.org Delivered-To: mailing list cvs@apr.apache.org Received: (qmail 86166 invoked from network); 6 Mar 2004 18:02:08 -0000 Date: 6 Mar 2004 18:02:16 -0000 Message-ID: <20040306180216.2163.qmail@minotaur.apache.org> From: jorton@apache.org To: apr-cvs@apache.org Subject: cvs commit: apr/test testdir.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N jorton 2004/03/06 10:02:16 Modified: include Tag: APR_0_9_BRANCH apr_file_info.h test Tag: APR_0_9_BRANCH testdir.c Log: Backport from HEAD: * include/apr_file_info.h: Remove misleading @remark about dot/dot-dot entries returned by apr_dir_read(); reported by Philip Martin. * test/testdir.c (test_readdir_onedot, test_readdir_twodot): Remove tests. Revision Changes Path No revision No revision 1.40.2.3 +1 -1 apr/include/apr_file_info.h Index: apr_file_info.h =================================================================== RCS file: /home/cvs/apr/include/apr_file_info.h,v retrieving revision 1.40.2.2 retrieving revision 1.40.2.3 diff -w -d -u -r1.40.2.2 -r1.40.2.3 --- apr_file_info.h 13 Feb 2004 09:33:44 -0000 1.40.2.2 +++ apr_file_info.h 6 Mar 2004 18:02:16 -0000 1.40.2.3 @@ -251,7 +251,7 @@ * @param finfo the file info structure and filled in by apr_dir_read * @param wanted The desired apr_finfo_t fields, as a bit flag of APR_FINFO_ values * @param thedir the directory descriptor returned from apr_dir_open - * @remark All systems return . and .. as the first two files. + * @remark No ordering is guaranteed for the entries read. */ APR_DECLARE(apr_status_t) apr_dir_read(apr_finfo_t *finfo, apr_int32_t wanted, apr_dir_t *thedir); No revision No revision 1.12.2.2 +10 -51 apr/test/testdir.c Index: testdir.c =================================================================== RCS file: /home/cvs/apr/test/testdir.c,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -w -d -u -r1.12.2.1 -r1.12.2.2 --- testdir.c 13 Feb 2004 09:33:52 -0000 1.12.2.1 +++ testdir.c 6 Mar 2004 18:02:16 -0000 1.12.2.2 @@ -144,63 +144,24 @@ CuAssertIntEquals(tc, APR_SUCCESS, rv); } -static void test_readdir_onedot(CuTest *tc) -{ - apr_status_t rv; - apr_dir_t *dir; - apr_finfo_t finfo; - - rv = apr_dir_open(&dir, "data", p); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - - rv = apr_dir_read(&finfo, APR_FINFO_DIRENT, dir); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - CuAssertStrEquals(tc, ".", finfo.name); - - rv = apr_dir_close(dir); - CuAssertIntEquals(tc, APR_SUCCESS, rv); -} - -static void test_readdir_twodot(CuTest *tc) -{ - apr_status_t rv; - apr_dir_t *dir; - apr_finfo_t finfo; - - rv = apr_dir_open(&dir, "data", p); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - - rv = apr_dir_read(&finfo, APR_FINFO_DIRENT, dir); - rv = apr_dir_read(&finfo, APR_FINFO_DIRENT, dir); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - CuAssertStrEquals(tc, "..", finfo.name); - - rv = apr_dir_close(dir); - CuAssertIntEquals(tc, APR_SUCCESS, rv); -} - static void test_rewind(CuTest *tc) { - apr_status_t rv; apr_dir_t *dir; - apr_finfo_t finfo; + apr_finfo_t first, second; - rv = apr_dir_open(&dir, "data", p); - CuAssertIntEquals(tc, APR_SUCCESS, rv); + apr_assert_success(tc, "apr_dir_open failed", apr_dir_open(&dir, "data", p)); - rv = apr_dir_read(&finfo, APR_FINFO_DIRENT, dir); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - CuAssertStrEquals(tc, ".", finfo.name); + apr_assert_success(tc, "apr_dir_read failed", + apr_dir_read(&first, APR_FINFO_DIRENT, dir)); - rv = apr_dir_rewind(dir); - CuAssertIntEquals(tc, APR_SUCCESS, rv); + apr_assert_success(tc, "apr_dir_rewind failed", apr_dir_rewind(dir)); - rv = apr_dir_read(&finfo, APR_FINFO_DIRENT, dir); - CuAssertIntEquals(tc, APR_SUCCESS, rv); - CuAssertStrEquals(tc, ".", finfo.name); + apr_assert_success(tc, "second apr_dir_read failed", + apr_dir_read(&second, APR_FINFO_DIRENT, dir)); - rv = apr_dir_close(dir); - CuAssertIntEquals(tc, APR_SUCCESS, rv); + apr_assert_success(tc, "apr_dir_close failed", apr_dir_close(dir)); + + CuAssertStrEquals(tc, first.name, second.name); } /* Test for a (fixed) bug in apr_dir_read(). This bug only happened @@ -269,8 +230,6 @@ SUITE_ADD_TEST(suite, test_remove_notthere); SUITE_ADD_TEST(suite, test_mkdir_twice); - SUITE_ADD_TEST(suite, test_readdir_onedot); - SUITE_ADD_TEST(suite, test_readdir_twodot); SUITE_ADD_TEST(suite, test_rewind); SUITE_ADD_TEST(suite, test_opendir);