apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r562895 - in /apr/apr-util/trunk/test: Makefile.in Makefile.win abts_tests.h testutil.h testxlate.c
Date Sun, 05 Aug 2007 15:40:21 GMT
Author: davi
Date: Sun Aug  5 08:40:20 2007
New Revision: 562895

URL: http://svn.apache.org/viewvc?view=rev&rev=562895
Log:
Cleanup and merge testxlate into the abts test suite (testall).

Modified:
    apr/apr-util/trunk/test/Makefile.in
    apr/apr-util/trunk/test/Makefile.win
    apr/apr-util/trunk/test/abts_tests.h
    apr/apr-util/trunk/test/testutil.h
    apr/apr-util/trunk/test/testxlate.c

Modified: apr/apr-util/trunk/test/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/Makefile.in?view=diff&rev=562895&r1=562894&r2=562895
==============================================================================
--- apr/apr-util/trunk/test/Makefile.in (original)
+++ apr/apr-util/trunk/test/Makefile.in Sun Aug  5 08:40:20 2007
@@ -3,7 +3,7 @@
 INCLUDES = @APRUTIL_PRIV_INCLUDES@ @APR_INCLUDES@ @APRUTIL_INCLUDES@
 
 PROGRAMS = testall testdbm testrmm \
-	   testxlate dbd testssl \
+	   dbd testssl \
            echod sockperf
 TARGETS = $(PROGRAMS)
 
@@ -51,11 +51,6 @@
 testrmm: $(testrmm_OBJECTS) $(testrmm_LDADD)
 	$(LINK_PROG) $(APRUTIL_LDFLAGS) $(testrmm_OBJECTS) $(testrmm_LDADD) $(PROGRAM_DEPENDENCIES)
 
-testxlate_OBJECTS = testxlate.lo
-testxlate_LDADD =  $(TARGET_LIB_PATH)
-testxlate: $(testxlate_OBJECTS) $(testxlate_LDADD)
-	$(LINK_PROG) $(APRUTIL_LDFLAGS) $(testxlate_OBJECTS) $(testxlate_LDADD) $(PROGRAM_DEPENDENCIES)
-
 testssl_OBJECTS = testssl.lo
 testssl_LDADD =  $(TARGET_LIB_PATH)
 testssl: $(testssl_OBJECTS) $(testssl_LDADD)
@@ -76,7 +71,7 @@
 testall_OBJECTS = teststrmatch.lo testuri.lo testuuid.lo abts.lo testutil.lo \
 	testbuckets.lo testpass.lo testmd4.lo testmd5.lo testldap.lo \
 	testdate.lo testdbd.lo testmemcache.lo testreslist.lo testqueue.lo \
-	testxml.lo
+	testxml.lo testxlate.lo
 testall_LDADD =  $(TARGET_LIB_PATH)
 testall: $(testall_OBJECTS) $(testall_LDADD)
 	$(LINK_PROG) $(APRUTIL_LDFLAGS) $(testall_OBJECTS) $(testall_LDADD) $(PROGRAM_DEPENDENCIES)

Modified: apr/apr-util/trunk/test/Makefile.win
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/Makefile.win?view=diff&rev=562895&r1=562894&r2=562895
==============================================================================
--- apr/apr-util/trunk/test/Makefile.win (original)
+++ apr/apr-util/trunk/test/Makefile.win Sun Aug  5 08:40:20 2007
@@ -112,11 +112,9 @@
 ##!		$(OUTPUT_DIR)\testrmm.exe \
 ##!		$(OUTPUT_DIR)\teststrmatch.exe \
 ##!		$(OUTPUT_DIR)\testuri.exe \
-##!		$(OUTPUT_DIR)\testuuid.exe \
-##!		$(OUTPUT_DIR)\testxlate.exe
+##!		$(OUTPUT_DIR)\testuuid.exe
 
-ALL_TARGETS = 	$(OUTPUT_DIR)\testxlate.exe \
-		$(OUTPUT_DIR)\testdbm.exe \
+ALL_TARGETS = 	$(OUTPUT_DIR)\testdbm.exe \
 		$(OUTPUT_DIR)\testqueue.exe \
 		$(OUTPUT_DIR)\testrmm.exe \
 		$(OUTPUT_DIR)\testmd4.exe \

Modified: apr/apr-util/trunk/test/abts_tests.h
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/abts_tests.h?view=diff&rev=562895&r1=562894&r2=562895
==============================================================================
--- apr/apr-util/trunk/test/abts_tests.h (original)
+++ apr/apr-util/trunk/test/abts_tests.h Sun Aug  5 08:40:20 2007
@@ -36,7 +36,8 @@
     {testmemcache},
     {testreslist},
     {testqueue},
-    {testxml}
+    {testxml},
+    {testxlate}
 };
 
 #endif /* APR_TEST_INCLUDES */

Modified: apr/apr-util/trunk/test/testutil.h
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/testutil.h?view=diff&rev=562895&r1=562894&r2=562895
==============================================================================
--- apr/apr-util/trunk/test/testutil.h (original)
+++ apr/apr-util/trunk/test/testutil.h Sun Aug  5 08:40:20 2007
@@ -57,5 +57,6 @@
 abts_suite *testreslist(abts_suite *suite);
 abts_suite *testqueue(abts_suite *suite);
 abts_suite *testxml(abts_suite *suite);
+abts_suite *testxlate(abts_suite *suite);
 
 #endif /* APR_TEST_INCLUDES */

Modified: apr/apr-util/trunk/test/testxlate.c
URL: http://svn.apache.org/viewvc/apr/apr-util/trunk/test/testxlate.c?view=diff&rev=562895&r1=562894&r2=562895
==============================================================================
--- apr/apr-util/trunk/test/testxlate.c (original)
+++ apr/apr-util/trunk/test/testxlate.c Sun Aug  5 08:40:20 2007
@@ -14,111 +14,90 @@
  * limitations under the License.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "apr.h"
 #include "apr_errno.h"
 #include "apr_general.h"
 #include "apr_strings.h"
 #include "apr_xlate.h"
+#include "abts.h"
+#include "testutil.h"
+
+#ifdef APR_HAS_XLATE
 
 static const char test_utf8[] = "Edelwei\xc3\x9f";
 static const char test_utf7[] = "Edelwei+AN8-";
 static const char test_latin1[] = "Edelwei\xdf";
 static const char test_latin2[] = "Edelwei\xdf";
 
-
-static int check_status (apr_status_t status, const char *msg)
-{
-    if (status)
-    {
-        static char buf[1024];
-        printf("ERROR: %s\n      %s\n", msg,
-               apr_strerror(status, buf, sizeof(buf)));
-        return 1;
-    }
-    return 0;
-}
-
-static int test_conversion (apr_xlate_t *convset,
-                            const char *inbuf,
-                            const char *expected)
+static void test_conversion(abts_case *tc, apr_xlate_t *convset,
+                            const char *inbuf, const char *expected)
 {
     static char buf[1024];
-    int retcode = 0;
     apr_size_t inbytes_left = strlen(inbuf);
     apr_size_t outbytes_left = sizeof(buf) - 1;
-    apr_status_t status = apr_xlate_conv_buffer(convset,
-                                                inbuf,
-                                                &inbytes_left,
-                                                buf,
-                                                &outbytes_left);
-    if (status == APR_SUCCESS) {
-        status = apr_xlate_conv_buffer(convset, NULL, NULL,
-                                       buf + sizeof(buf) - outbytes_left - 1,
-                                       &outbytes_left);
-    }
+    apr_status_t rv;
+
+    rv = apr_xlate_conv_buffer(convset, inbuf, &inbytes_left, buf, &outbytes_left);
+    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+
+    if (rv != APR_SUCCESS)
+        return;
+
+    rv = apr_xlate_conv_buffer(convset, NULL, NULL, buf + sizeof(buf) -
+                               outbytes_left - 1, &outbytes_left);
+    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+
     buf[sizeof(buf) - outbytes_left - 1] = '\0';
-    retcode |= check_status(status, "apr_xlate_conv_buffer");
-    if ((!status || APR_STATUS_IS_INCOMPLETE(status))
-        && strcmp(buf, expected))
-    {
-        printf("ERROR: expected: '%s'\n       actual:   '%s'"
-               "\n       inbytes_left: %"APR_SIZE_T_FMT"\n",
-               expected, buf, inbytes_left);
-        retcode |= 1;
-    }
-    return retcode;
+
+    ABTS_STR_EQUAL(tc, buf, expected);
 }
 
-static int one_test (const char *cs1, const char *cs2,
+static void one_test(abts_case *tc, const char *cs1, const char *cs2,
                      const char *str1, const char *str2,
                      apr_pool_t *pool)
 {
+    apr_status_t rv;
     apr_xlate_t *convset;
-    const char *msg = apr_psprintf(pool, "apr_xlate_open(%s, %s)", cs2, cs1);
-    int retcode = check_status(apr_xlate_open(&convset, cs2, cs1, pool), msg);
-    if (!retcode)
-    {
-        retcode |= test_conversion(convset, str1, str2);
-        retcode |= check_status(apr_xlate_close(convset), "apr_xlate_close");
-    }
-    printf("%s:  %s -> %s\n", (retcode ? "FAIL" : "PASS"), cs1, cs2);
-    return retcode;
-}
 
+    rv = apr_xlate_open(&convset, cs2, cs1, pool);
+    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
 
-int main (int argc, char **argv)
-{
-    apr_pool_t *pool;
-    int retcode = 0;
+    if (rv != APR_SUCCESS)
+        return;
 
-#ifndef APR_HAS_XLATE
-    puts("SKIP: apr_xlate not implemented");
-    return 0;
-#endif
+    test_conversion(tc, convset, str1, str2);
 
-    apr_initialize();
-    atexit(apr_terminate);
-    apr_pool_create(&pool, NULL);
+    rv = apr_xlate_close(convset);
+    ABTS_INT_EQUAL(tc, rv, APR_SUCCESS);
+}
 
+static void test_transformation(abts_case *tc, void *data)
+{
     /* 1. Identity transformation: UTF-8 -> UTF-8 */
-    retcode |= one_test("UTF-8", "UTF-8", test_utf8, test_utf8, pool);
+    one_test(tc, "UTF-8", "UTF-8", test_utf8, test_utf8, p);
 
     /* 2. UTF-8 <-> ISO-8859-1 */
-    retcode |= one_test("UTF-8", "ISO-8859-1", test_utf8, test_latin1, pool);
-    retcode |= one_test("ISO-8859-1", "UTF-8", test_latin1, test_utf8, pool);
+    one_test(tc, "UTF-8", "ISO-8859-1", test_utf8, test_latin1, p);
+    one_test(tc, "ISO-8859-1", "UTF-8", test_latin1, test_utf8, p);
 
     /* 3. ISO-8859-1 <-> ISO-8859-2, identity */
-    retcode |= one_test("ISO-8859-1", "ISO-8859-2",
-                        test_latin1, test_latin2, pool);
-    retcode |= one_test("ISO-8859-2", "ISO-8859-1",
-                        test_latin2, test_latin1, pool);
+    one_test(tc, "ISO-8859-1", "ISO-8859-2", test_latin1, test_latin2, p);
+    one_test(tc, "ISO-8859-2", "ISO-8859-1", test_latin2, test_latin1, p);
 
     /* 4. Transformation using charset aliases */
-    retcode |= one_test("UTF-8", "UTF-7", test_utf8, test_utf7, pool);
-    retcode |= one_test("UTF-7", "UTF-8", test_utf7, test_utf8, pool);
+    one_test(tc, "UTF-8", "UTF-7", test_utf8, test_utf7, p);
+    one_test(tc, "UTF-7", "UTF-8", test_utf7, test_utf8, p);
+}
+
+#endif /* APR_HAS_XLATE */
+
+abts_suite *testxlate(abts_suite *suite)
+{
+    suite = ADD_SUITE(suite);
+
+#ifdef APR_HAS_XLATE
+    abts_run_test(suite, test_transformation, NULL);
+#endif
 
-    return retcode;
+    return suite;
 }



Mime
View raw message