All (three) current DB tests pass.

diff --git a/pear/Makefile.in b/pear/Makefile.in
index addc966a44914154cebf8055ae21cf62b55c46d8..125f467d1f58f1bac9c13fc5b9f71583a5d14f33 100644 (file)
--- a/pear/Makefile.in
+++ b/pear/Makefile.in
@@ -108,16 +108,9 @@ install-headers:
                cd $(top_builddir)/$$i && cp -p *.h $(phpincludedir)/$$i) 2>/dev/null || true; \
        done
 
-test: run-tests Makefile
-       @./run-tests
-
 Makefile: Makefile.in $(top_builddir)/config.status
        (cd ..;CONFIG_FILES=pear/Makefile CONFIG_HEADERS= $(top_builddir)/config.status)
 
-run-tests: run-tests.in $(top_builddir)/config.status
-       (cd ..;CONFIG_FILES=pear/$@ CONFIG_HEADERS= $(top_builddir)/config.status)
-       chmod +x $@
-
 pear: pear.in $(top_builddir)/config.status
        (cd ..;CONFIG_FILES=pear/pear CONFIG_HEADERS= $(top_builddir)/config.status)
 

diff --git a/pear/tests/DB_Error.phpt b/pear/tests/DB_Error.phpt
index b27f0e28f3d622fcc5dfbecb18c88754a3bbdfbc..5cc546281d126d7c1bc76ce68dbe6a5904c69911 100644 (file)
--- a/pear/tests/DB_Error.phpt
+++ b/pear/tests/DB_Error.phpt
@@ -29,20 +29,20 @@ var_dump(DB::parseDSN(""));
 
 
 print "testing different error codes...\n";
-$e = new DB_Error(); var_dump($e->toString());
-$e = new DB_Error("test error"); var_dump($e->toString());
-$e = new DB_Error(DB_OK); var_dump($e->toString());
-$e = new DB_Error(DB_ERROR); var_dump($e->toString());
-$e = new DB_Error(DB_ERROR_SYNTAX); var_dump($e->toString());
-$e = new DB_Error(DB_ERROR_DIVZERO); var_dump($e->toString());
-$e = new DB_Warning(); var_dump($e->toString());
-$e = new DB_Warning("test warning"); var_dump($e->toString());
-$e = new DB_Warning(DB_WARNING_READ_ONLY); var_dump($e->toString());
+$e = new DB_Error(); print $e->__string_value()."\n";
+$e = new DB_Error("test error"); print $e->__string_value()."\n";
+$e = new DB_Error(DB_OK); print $e->__string_value()."\n";
+$e = new DB_Error(DB_ERROR); print $e->__string_value()."\n";
+$e = new DB_Error(DB_ERROR_SYNTAX); print $e->__string_value()."\n";
+$e = new DB_Error(DB_ERROR_DIVZERO); print $e->__string_value()."\n";
+$e = new DB_Warning(); print $e->__string_value()."\n";
+$e = new DB_Warning("test warning"); print $e->__string_value()."\n";
+$e = new DB_Warning(DB_WARNING_READ_ONLY); print $e->__string_value()."\n";
 
 ini_alter("html_errors", false);
 
 print "testing different error modes...\n";
-$e = new DB_Error(DB_ERROR, PEAR_ERROR_PRINT); var_dump($e->toString());
+$e = new DB_Error(DB_ERROR, PEAR_ERROR_PRINT); print $e->__string_value()."\n";
 $e = new DB_Error(DB_ERROR_SYNTAX, PEAR_ERROR_TRIGGER);
 
 print "testing different error serverities...\n";
@@ -55,17 +55,17 @@ $e = new DB_Error(DB_ERROR_SYNTAX, PEAR_ERROR_TRIGGER, E_USER_ERROR);
 --POST--
 --EXPECT--
 testing different error codes...
-string(109) "[db_error: message="DB Error: unknown error" code=-1 mode=return level=notice prefix="" prepend="" append=""]"
-string(105) "[db_error: message="DB Error: test error" code=0 mode=return level=notice prefix="" prepend="" append=""]"
-string(103) "[db_error: message="DB Error: no error" code=0 mode=return level=notice prefix="" prepend="" append=""]"
-string(109) "[db_error: message="DB Error: unknown error" code=-1 mode=return level=notice prefix="" prepend="" append=""]"
-string(108) "[db_error: message="DB Error: syntax error" code=-2 mode=return level=notice prefix="" prepend="" append=""]"
-string(113) "[db_error: message="DB Error: division by zero" code=-13 mode=return level=notice prefix="" prepend="" append=""]"
-string(118) "[db_warning: message="DB Warning: unknown warning" code=-1000 mode=return level=notice prefix="" prepend="" append=""]"
-string(111) "[db_warning: message="DB Warning: test warning" code=0 mode=return level=notice prefix="" prepend="" append=""]"
-string(112) "[db_warning: message="DB Warning: read only" code=-1001 mode=return level=notice prefix="" prepend="" append=""]"
+[db_error: message="DB Error: unknown error" code=-1 mode=return level=notice prefix="" prepend="" append=""]
+[db_error: message="DB Error: test error" code=0 mode=return level=notice prefix="" prepend="" append=""]
+[db_error: message="DB Error: no error" code=0 mode=return level=notice prefix="" prepend="" append=""]
+[db_error: message="DB Error: unknown error" code=-1 mode=return level=notice prefix="" prepend="" append=""]
+[db_error: message="DB Error: syntax error" code=-2 mode=return level=notice prefix="" prepend="" append=""]
+[db_error: message="DB Error: division by zero" code=-13 mode=return level=notice prefix="" prepend="" append=""]
+[db_warning: message="DB Warning: unknown warning" code=-1000 mode=return level=notice prefix="" prepend="" append=""]
+[db_warning: message="DB Warning: test warning" code=0 mode=return level=notice prefix="" prepend="" append=""]
+[db_warning: message="DB Warning: read only" code=-1001 mode=return level=notice prefix="" prepend="" append=""]
 testing different error modes...
-DB Error: unknown errorstring(108) "[db_error: message="DB Error: unknown error" code=-1 mode=print level=notice prefix="" prepend="" append=""]"
+DB Error: unknown error[db_error: message="DB Error: unknown error" code=-1 mode=print level=notice prefix="" prepend="" append=""]
 <br>
 <b>Notice</b>:  DB Error: syntax error in <b>PEAR.php</b> on line <b>182</b><br>
 testing different error serverities...

diff --git a/pear/tests/DB_factory.phpt b/pear/tests/DB_factory.phpt
index 21427972695f0bfa090de1b400f0380b029dfb6e..f0a15e8e6efbcb525a12187f108ad3f3dfe1d726 100644 (file)
--- a/pear/tests/DB_factory.phpt
+++ b/pear/tests/DB_factory.phpt
@@ -28,7 +28,7 @@ while (list($i, $name) = each($backends)) {
     if (DB::isError($obj)) {
        print "error: ".$obj->getMessage()."\n";
     } else {
-       print "object: ".$obj->toString()."\n";
+       print "object: ".$obj."\n";
     }
 }
 

diff --git a/pear/tests/DB_parseDSN.phpt b/pear/tests/DB_parseDSN.phpt
index 6d3031bfa058c3d5fd53d4a0bea4946d25caeae5..a4c969eb9531e90f9c34eb9d5a763ea3b793ac59 100644 (file)
--- a/pear/tests/DB_parseDSN.phpt
+++ b/pear/tests/DB_parseDSN.phpt
@@ -10,30 +10,29 @@ DB::parseDSN test
 
 require_once "DB.php";
 
+function test($dsn) {
+    print implode(",", DB::parseDSN($dsn))."\n";
+}
+
 print "testing DB::parseDSN...\n";
-var_dump(DB::parseDSN("mysql"));
-var_dump(DB::parseDSN("odbc(mssql)"));
-var_dump(DB::parseDSN("mysql://localhost"));
-var_dump(DB::parseDSN("mysql://remote.host.com/db"));
-var_dump(DB::parseDSN("mysql://testuser:testpw"));
-var_dump(DB::parseDSN("oci8://user:pass@tns-name"));
-var_dump(DB::parseDSN(""));
-var_dump(DB::parseDSN(""));
-var_dump(DB::parseDSN(""));
-var_dump(DB::parseDSN(""));
-var_dump(DB::parseDSN(""));
-var_dump(DB::parseDSN(""));
-var_dump(DB::parseDSN(""));
+test("mysql");
+test("odbc(mssql)");
+test("mysql://localhost");
+test("mysql://remote.host.com/db");
+test("mysql://testuser:testpw");
+test("oci8://user:pass@tns-name");
+test("odbc(solid)://foo:bar@tcp+localhost+1313");
 
+/* phptype,dbsyntax,protocol,hostspec,database,username,password */
 ?>
 --GET--
 --POST--
 --EXPECT--
-testing ibase: object: db_ibase: (phptype=ibase, dbsyntax=ibase)
-testing msql: object: db_msql: (phptype=msql, dbsyntax=msql)
-testing mssql: object: db_mssql: (phptype=mssql, dbsyntax=mssql)
-testing mysql: object: db_mysql: (phptype=mysql, dbsyntax=mysql)
-testing oci8: object: db_oci8: (phptype=oci8, dbsyntax=oci8)
-testing odbc: object: db_odbc: (phptype=odbc, dbsyntax=unknown)
-testing pgsql: object: db_pgsql: (phptype=pgsql, dbsyntax=pgsql)
-testing sybase: object: db_sybase: (phptype=sybase, dbsyntax=sybase)
+testing DB::parseDSN...
+mysql,,,,,,
+odbc,mssql,,,,,
+mysql,mysql,,localhost,,,
+mysql,mysql,,remote.host.com,db,,
+mysql,mysql,,,,testuser,testpw
+oci8,oci8,,tns-name,,user,pass
+odbc,solid,tcp,localhost 1313,,foo,bar