apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r758170 - /apr/apr/trunk/test/
Date Wed, 25 Mar 2009 08:04:55 GMT
Author: jorton
Date: Wed Mar 25 08:04:52 2009
New Revision: 758170

URL: http://svn.apache.org/viewvc?rev=758170&view=rev
Log:
* test/: Merge test suite from apr-util.  Substitute 
  s/apr_assert_success/APR_ASSERT_SUCCESS/ as necessary.

Added:
    apr/apr/trunk/test/testbuckets.c   (contents, props changed)
      - copied, changed from r757706, apr/apr-util/trunk/test/testbuckets.c
    apr/apr/trunk/test/testcrypto.c   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/test/testcrypto.c
    apr/apr/trunk/test/testdate.c   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/test/testdate.c
    apr/apr/trunk/test/testdbd.c   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/test/testdbd.c
    apr/apr/trunk/test/testdbm.c   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/test/testdbm.c
    apr/apr/trunk/test/testldap.c   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/test/testldap.c
    apr/apr/trunk/test/testmd4.c   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/test/testmd4.c
    apr/apr/trunk/test/testmd5.c   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/test/testmd5.c
    apr/apr/trunk/test/testmemcache.c   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/test/testmemcache.c
    apr/apr/trunk/test/testpass.c   (contents, props changed)
      - copied, changed from r757706, apr/apr-util/trunk/test/testpass.c
    apr/apr/trunk/test/testqueue.c   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/test/testqueue.c
    apr/apr/trunk/test/testreslist.c   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/test/testreslist.c
    apr/apr/trunk/test/testrmm.c   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/test/testrmm.c
    apr/apr/trunk/test/teststrmatch.c   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/test/teststrmatch.c
    apr/apr/trunk/test/testuri.c   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/test/testuri.c
    apr/apr/trunk/test/testuuid.c   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/test/testuuid.c
    apr/apr/trunk/test/testxlate.c   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/test/testxlate.c
    apr/apr/trunk/test/testxml.c   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/test/testxml.c
Modified:
    apr/apr/trunk/test/Makefile.in
    apr/apr/trunk/test/testutil.h

Modified: apr/apr/trunk/test/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/Makefile.in?rev=758170&r1=758169&r2=758170&view=diff
==============================================================================
--- apr/apr/trunk/test/Makefile.in (original)
+++ apr/apr/trunk/test/Makefile.in Wed Mar 25 08:04:52 2009
@@ -20,15 +20,20 @@
 	testmutexscope@EXEEXT@ \
 	testall@EXEEXT@
 
-TESTS = testtime.lo teststr.lo testvsn.lo testipsub.lo testshm.lo \
-	testmmap.lo testud.lo testtable.lo testsleep.lo testpools.lo \
-	testfmt.lo testfile.lo testdir.lo testfileinfo.lo testrand.lo \
-	testdso.lo testoc.lo testdup.lo testsockets.lo testproc.lo \
-	testpoll.lo testlock.lo testsockopt.lo testpipe.lo testthread.lo \
-	testhash.lo testargs.lo testnames.lo testuser.lo testpath.lo \
-	testenv.lo testprocmutex.lo testfnmatch.lo testatomic.lo testflock.lo \
-	testsock.lo testglobalmutex.lo teststrnatcmp.lo testfilecopy.lo \
-	testtemp.lo testlfs.lo testcond.lo
+TESTS = testtime.lo teststr.lo testvsn.lo testipsub.lo testshm.lo	\
+	testmmap.lo testud.lo testtable.lo testsleep.lo testpools.lo	\
+	testfmt.lo testfile.lo testdir.lo testfileinfo.lo testrand.lo	\
+	testdso.lo testoc.lo testdup.lo testsockets.lo testproc.lo	\
+	testpoll.lo testlock.lo testsockopt.lo testpipe.lo		\
+	testthread.lo testhash.lo testargs.lo testnames.lo testuser.lo	\
+	testpath.lo testenv.lo testprocmutex.lo testfnmatch.lo		\
+	testatomic.lo testflock.lo testsock.lo testglobalmutex.lo	\
+	teststrnatcmp.lo testfilecopy.lo testtemp.lo testlfs.lo		\
+	testcond.lo testuri.lo testmemcache.lo testdate.lo		\
+	testxlate.lo testdbd.lo testrmm.lo testldap.lo testmd4.lo	\
+	teststrmatch.lo testpass.lo testcrypto.lo testqueue.lo		\
+	testbuckets.lo testxml.lo testdbm.lo testuuid.lo testmd5.lo	\
+	testreslist.lo
 
 OTHER_PROGRAMS = \
 	sendfile@EXEEXT@ \

Copied: apr/apr/trunk/test/testbuckets.c (from r757706, apr/apr-util/trunk/test/testbuckets.c)
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testbuckets.c?p2=apr/apr/trunk/test/testbuckets.c&p1=apr/apr-util/trunk/test/testbuckets.c&r1=757706&r2=758170&rev=758170&view=diff
==============================================================================
--- apr/apr-util/trunk/test/testbuckets.c (original)
+++ apr/apr/trunk/test/testbuckets.c Wed Mar 25 08:04:52 2009
@@ -101,7 +101,7 @@
     char msg[200];
 
     sprintf(msg, "%s: flatten brigade", ctx);
-    apr_assert_success(tc, msg, apr_brigade_flatten(bb, buf, &len));
+    APR_ASSERT_SUCCESS(tc, msg, apr_brigade_flatten(bb, buf, &len));
     sprintf(msg, "%s: length match (%ld not %ld)", ctx,
             (long)len, (long)elen);
     ABTS_ASSERT(tc, msg, len == elen);
@@ -173,12 +173,12 @@
     int n;
 
     for (n = 0; n < COUNT; n++) {
-        apr_assert_success(tc, "brigade_write", 
+        APR_ASSERT_SUCCESS(tc, "brigade_write", 
                            apr_brigade_write(bb, NULL, NULL,
                                              THESTR, sizeof THESTR));
     }
 
-    apr_assert_success(tc, "determine brigade length",
+    APR_ASSERT_SUCCESS(tc, "determine brigade length",
                        apr_brigade_length(bb, 1, &length));
 
     ABTS_ASSERT(tc, "brigade has correct length",
@@ -197,7 +197,7 @@
                               "end of line.\nfoo foo foo");
     bout = apr_brigade_create(p, ba);
 
-    apr_assert_success(tc, "split line",
+    APR_ASSERT_SUCCESS(tc, "split line",
                        apr_brigade_split_line(bout, bin,
                                               APR_BLOCK_READ, 100));
 
@@ -218,7 +218,7 @@
     const char *adata;
     apr_size_t alen;
 
-    apr_assert_success(tc, "read from bucket",
+    APR_ASSERT_SUCCESS(tc, "read from bucket",
                        apr_bucket_read(e, &adata, &alen, 
                                        APR_BLOCK_READ));
 
@@ -266,14 +266,14 @@
         const char *data;
         apr_size_t len;
         
-        apr_assert_success(tc, "read alpha from bucket",
+        APR_ASSERT_SUCCESS(tc, "read alpha from bucket",
                            apr_bucket_read(e, &data, &len, APR_BLOCK_READ));
         ABTS_ASSERT(tc, "read 5 bytes", len == 5);
         ABTS_STR_NEQUAL(tc, "alpha", data, 5);
 
         e = APR_BUCKET_NEXT(e);
 
-        apr_assert_success(tc, "read beta from bucket",
+        APR_ASSERT_SUCCESS(tc, "read beta from bucket",
                            apr_bucket_read(e, &data, &len, APR_BLOCK_READ));
         ABTS_ASSERT(tc, "read 4 bytes", len == 4);
         ABTS_STR_NEQUAL(tc, "beta", data, 5);
@@ -450,7 +450,7 @@
     e = apr_bucket_immortal_create(hello, strlen(hello), ba);
     APR_BRIGADE_INSERT_HEAD(bb, e);
 
-    apr_assert_success(tc, "partition brigade",
+    APR_ASSERT_SUCCESS(tc, "partition brigade",
                        apr_brigade_partition(bb, 5, &e));
 
     test_bucket_content(tc, APR_BRIGADE_FIRST(bb),

Propchange: apr/apr/trunk/test/testbuckets.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/testbuckets.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/test/testcrypto.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/testcrypto.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/test/testdate.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/testdate.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/test/testdbd.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/testdbd.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/test/testdbm.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/testdbm.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/test/testldap.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/testldap.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/test/testmd4.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/testmd4.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/test/testmd5.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/testmd5.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/test/testmemcache.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/testmemcache.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: apr/apr/trunk/test/testpass.c (from r757706, apr/apr-util/trunk/test/testpass.c)
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testpass.c?p2=apr/apr/trunk/test/testpass.c&p1=apr/apr-util/trunk/test/testpass.c&r1=757706&r2=758170&rev=758170&view=diff
==============================================================================
--- apr/apr-util/trunk/test/testpass.c (original)
+++ apr/apr/trunk/test/testpass.c Wed Mar 25 08:04:52 2009
@@ -62,7 +62,7 @@
     int i;
 
     for (i = 0; i < num_passwords; i++) {
-        apr_assert_success(tc, "check for valid password",
+        APR_ASSERT_SUCCESS(tc, "check for valid password",
                            apr_password_validate(passwords[i].password,
                                                  passwords[i].hash));
     }
@@ -111,7 +111,7 @@
 
     apr_sha1_base64(pass, strlen(pass), hash);
 
-    apr_assert_success(tc, "SHA1 password validated",
+    APR_ASSERT_SUCCESS(tc, "SHA1 password validated",
                        apr_password_validate(pass, hash));
 }
 
@@ -122,7 +122,7 @@
 
     apr_md5_encode(pass, salt, hash, sizeof hash);
 
-    apr_assert_success(tc, "MD5 password validated",
+    APR_ASSERT_SUCCESS(tc, "MD5 password validated",
                        apr_password_validate(pass, hash));
 }
 

Propchange: apr/apr/trunk/test/testpass.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/testpass.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/test/testqueue.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/testqueue.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/test/testreslist.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/testreslist.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/test/testrmm.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/testrmm.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/test/teststrmatch.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/teststrmatch.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/test/testuri.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/testuri.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: apr/apr/trunk/test/testutil.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testutil.h?rev=758170&r1=758169&r2=758170&view=diff
==============================================================================
--- apr/apr/trunk/test/testutil.h (original)
+++ apr/apr/trunk/test/testutil.h Wed Mar 25 08:04:52 2009
@@ -103,4 +103,23 @@
 abts_suite *testuser(abts_suite *suite);
 abts_suite *testvsn(abts_suite *suite);
 
+abts_suite *teststrmatch(abts_suite *suite);
+abts_suite *testuri(abts_suite *suite);
+abts_suite *testuuid(abts_suite *suite);
+abts_suite *testbuckets(abts_suite *suite);
+abts_suite *testpass(abts_suite *suite);
+abts_suite *testmd4(abts_suite *suite);
+abts_suite *testmd5(abts_suite *suite);
+abts_suite *testcrypto(abts_suite *suite);
+abts_suite *testldap(abts_suite *suite);
+abts_suite *testdbd(abts_suite *suite);
+abts_suite *testdate(abts_suite *suite);
+abts_suite *testmemcache(abts_suite *suite);
+abts_suite *testreslist(abts_suite *suite);
+abts_suite *testqueue(abts_suite *suite);
+abts_suite *testxml(abts_suite *suite);
+abts_suite *testxlate(abts_suite *suite);
+abts_suite *testrmm(abts_suite *suite);
+abts_suite *testdbm(abts_suite *suite);
+
 #endif /* APR_TEST_INCLUDES */

Propchange: apr/apr/trunk/test/testuuid.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/testuuid.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/test/testxlate.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/testxlate.c
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/test/testxml.c
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/test/testxml.c
------------------------------------------------------------------------------
    svn:mergeinfo = 



Mime
View raw message