Pretty much the same cosmetics and tweaking as before (proper UEXPECTF,

"done!" at the end to detect crashes, connection parameter tweaking, ...) -
plus: check return codes even if failures are unlikely.

diff --git a/ext/mysqli/tests/003.phpt b/ext/mysqli/tests/003.phpt
index ef6a9d551d41fcefaad91ca1034485672b23bc2f..dcbb6acce73dd4d0eb0b4fd04abafbc666dbee4b 100644 (file)
--- a/ext/mysqli/tests/003.phpt
+++ b/ext/mysqli/tests/003.phpt
@@ -7,29 +7,35 @@ mysqli connect
        include "connect.inc";
        
        /*** test mysqli_connect 127.0.0.1 ***/
-       $link = mysqli_connect($host, $user, $passwd, "test");
+       $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
        mysqli_query($link, "SET sql_mode=''");
                
-       mysqli_query($link,"DROP TABLE IF EXISTS test_bind_result");
-       mysqli_query($link,"CREATE TABLE test_bind_result(c1 date, c2 time, 
-                                                        c3 timestamp(14), 
-                                                        c4 year, 
-                                                        c5 datetime, 
-                                                        c6 timestamp(4), 
-                                                        c7 timestamp(6))");
-
-       mysqli_query($link,"INSERT INTO test_bind_result VALUES('2002-01-02',
-                                                              '12:49:00',
-                                                              '2002-01-02 17:46:59', 
-                                                              2010,
-                                                              '2010-07-10', 
-                                                              '2020','1999-12-29')");
+       if (!mysqli_query($link,"DROP TABLE IF EXISTS test_bind_result"))
+               printf("[001] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
+       $rc = mysqli_query($link,"CREATE TABLE test_bind_result(c1 date, c2 time, 
+                                                                                                               c3 timestamp(14), 
+                                                                                                               c4 year, 
+                                                                                                               c5 datetime, 
+                                                                                                               c6 timestamp(4), 
+                                                                                                               c7 timestamp(6)) ENGINE=" . $engine);
+
+       if (!$rc)
+               printf("[002] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
+
+       $rc = mysqli_query($link, "INSERT INTO test_bind_result VALUES('2002-01-02',
+                                                                                                                       '12:49:00',
+                                                                                                                       '2002-01-02 17:46:59', 
+                                                                                                                       2010,
+                                                                                                                       '2010-07-10', 
+                                                                                                                       '2020','1999-12-29')");
+       if (!$rc)
+               printf("[003] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_result");
-       mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
-       mysqli_execute($stmt);
+       mysqli_bind_result($stmt, $c1, $c2, $c3, $c4, $c5, $c6, $c7);
+       mysqli_execute($stmt);
        mysqli_fetch($stmt);
 
        $test = array($c1,$c2,$c3,$c4,$c5,$c6,$c7);
@@ -38,21 +44,41 @@ mysqli connect
 
        mysqli_stmt_close($stmt);
        mysqli_close($link);
+       print "done!";
 ?>
 --EXPECTF--
 array(7) {
   [0]=>
-  %s(10) "2002-01-02"
+  string(10) "2002-01-02"
+  [1]=>
+  string(8) "12:49:00"
+  [2]=>
+  string(19) "2002-01-02 17:46:59"
+  [3]=>
+  int(2010)
+  [4]=>
+  string(19) "2010-07-10 00:00:00"
+  [5]=>
+  string(19) "0000-00-00 00:00:00"
+  [6]=>
+  string(19) "1999-12-29 00:00:00"
+}
+done!
+--UEXPECTF--
+array(7) {
+  [0]=>
+  unicode(10) "2002-01-02"
   [1]=>
-  %s(8) "12:49:00"
+  unicode(8) "12:49:00"
   [2]=>
-  %s(19) "2002-01-02 17:46:59"
+  unicode(19) "2002-01-02 17:46:59"
   [3]=>
   int(2010)
   [4]=>
-  %s(19) "2010-07-10 00:00:00"
+  unicode(19) "2010-07-10 00:00:00"
   [5]=>
-  %s(19) "0000-00-00 00:00:00"
+  unicode(19) "0000-00-00 00:00:00"
   [6]=>
-  %s(19) "1999-12-29 00:00:00"
+  unicode(19) "1999-12-29 00:00:00"
 }
+done!

diff --git a/ext/mysqli/tests/004.phpt b/ext/mysqli/tests/004.phpt
index d7f0233d5b9c4b1f4d2bc3fdd6fe0477403a8b0c..ac443ffa60a5a6505a6cef0a7bd76736da64bf30 100644 (file)
--- a/ext/mysqli/tests/004.phpt
+++ b/ext/mysqli/tests/004.phpt
@@ -7,54 +7,91 @@ mysqli fetch char/text
        include ("connect.inc");
 
        /*** test mysqli_connect 127.0.0.1 ***/
-       $link = mysqli_connect($host, $user, $passwd);
+       $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
-       mysqli_select_db($link, "test");
+       mysqli_select_db($link, $db);
 
-       mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
-       mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 char(10), c2 text)");
+       if (!mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch"))
+               printf("[001] [%d] string\n", mysqli_errno($link), mysqli_error($link));
+               
+       if (!mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 char(10), c2 text) ENGINE=" . $engine))
+               printf("[002] [%d] string\n", mysqli_errno($link), mysqli_error($link));
 
-       mysqli_query($link, "INSERT INTO test_bind_fetch VALUES ('1234567890', 'this is a test0')");
-       mysqli_query($link, "INSERT INTO test_bind_fetch VALUES ('1234567891', 'this is a test1')");
-       mysqli_query($link, "INSERT INTO test_bind_fetch VALUES ('1234567892', 'this is a test2')");
-       mysqli_query($link, "INSERT INTO test_bind_fetch VALUES ('1234567893', 'this is a test3')");
+       if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES ('1234567890', 'this is a test0')"))
+               printf("[003] [%d] string\n", mysqli_errno($link), mysqli_error($link));
+
+       if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES ('1234567891', 'this is a test1')"))
+               printf("[004] [%d] string\n", mysqli_errno($link), mysqli_error($link));
+
+       if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES ('1234567892', 'this is a test2')"))
+               printf("[005] [%d] string\n", mysqli_errno($link), mysqli_error($link));
+
+       if (!mysqli_query($link, "INSERT INTO test_bind_fetch VALUES ('1234567893', 'this is a test3')"))
+               printf("[006] [%d] string\n", mysqli_errno($link), mysqli_error($link));
 
        $stmt = mysqli_prepare($link, "SELECT * FROM test_bind_fetch ORDER BY c1");
        mysqli_bind_result($stmt, $c1, $c2);
        mysqli_execute($stmt);
-       $i=4;
+       $i = 4;
        while ($i--) {
                mysqli_fetch($stmt);
-               $test = array($c1,$c2);
+               $test = array($c1, $c2);
                var_dump($test);
        }
 
-
        mysqli_stmt_close($stmt);
        mysqli_close($link);
+       print "done!";
 ?>
 --EXPECTF--
 array(2) {
   [0]=>
-  %s(10) "1234567890"
+  string(10) "1234567890"
+  [1]=>
+  string(15) "this is a test0"
+}
+array(2) {
+  [0]=>
+  string(10) "1234567891"
+  [1]=>
+  string(15) "this is a test1"
+}
+array(2) {
+  [0]=>
+  string(10) "1234567892"
+  [1]=>
+  string(15) "this is a test2"
+}
+array(2) {
+  [0]=>
+  string(10) "1234567893"
+  [1]=>
+  string(15) "this is a test3"
+}
+done!
+--UEXPECTF--
+array(2) {
+  [0]=>
+  unicode(10) "1234567890"
   [1]=>
-  %s(15) "this is a test0"
+  unicode(15) "this is a test0"
 }
 array(2) {
   [0]=>
-  %s(10) "1234567891"
+  unicode(10) "1234567891"
   [1]=>
-  %s(15) "this is a test1"
+  unicode(15) "this is a test1"
 }
 array(2) {
   [0]=>
-  %s(10) "1234567892"
+  unicode(10) "1234567892"
   [1]=>
-  %s(15) "this is a test2"
+  unicode(15) "this is a test2"
 }
 array(2) {
   [0]=>
-  %s(10) "1234567893"
+  unicode(10) "1234567893"
   [1]=>
-  %s(15) "this is a test3"
+  unicode(15) "this is a test3"
 }
+done!
\ No newline at end of file