From 1cef1c528d1efcaf0925f4627f1140f89b04e9f8 Mon Sep 17 00:00:00 2001
From: Ulf Wendel <uw@php.net>
Date: Thu, 12 Jul 2007 20:49:29 +0000
Subject: [PATCH] I forgot to mention: some will fail. In particular in unicode
 mode.

Next 10 in row to be tweaked:

     - take connection parameter from connect.inc
     - use proper UEXPECTF
     - have 'print "done!"' or similar at the end to detect crashes
     - whitespace changes where needed
     - take care of portability: PHP 5 vs. PHP 5, MySQL 4.1 - 6.0
     - understand return value checking as sometime that makes you type
       more when you write but makes you happy when you debug
---
 ext/mysqli/tests/020.phpt | 32 +++++++++++++++++++-------------
 ext/mysqli/tests/021.phpt | 24 +++++++++++++++++-------
 ext/mysqli/tests/022.phpt | 25 ++++++++++++++++++-------
 ext/mysqli/tests/023.phpt | 13 ++++++++-----
 ext/mysqli/tests/024.phpt | 12 +++++++-----
 ext/mysqli/tests/025.phpt | 13 ++++++++-----
 ext/mysqli/tests/026.phpt | 25 +++++++++++++++++--------
 ext/mysqli/tests/027.phpt |  6 ++++--
 ext/mysqli/tests/028.phpt | 11 ++++++++---
 ext/mysqli/tests/029.phpt |  8 +++++---
 10 files changed, 111 insertions(+), 58 deletions(-)

diff --git a/ext/mysqli/tests/020.phpt b/ext/mysqli/tests/020.phpt
index 17dc981b50..65ac2a0e16 100644
--- a/ext/mysqli/tests/020.phpt
+++ b/ext/mysqli/tests/020.phpt
@@ -4,27 +4,30 @@ mysqli bind_param/bind_result date
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
+	/* NOTE: There's an option in mysqlnd which controls if data and
+	time are returned as unicode or not. Consider this if you consider
+	adding a UEXPECTF to the test. */
 
 	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, "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), 
+	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))");
 
 	$stmt = mysqli_prepare($link, "INSERT INTO test_bind_result VALUES (?,?,?,?,?,?,?)");
 	mysqli_bind_param($stmt, "sssssss", $d1, $d2, $d3, $d4, $d5, $d6, $d7);
 
-  	$d1 = "2002-01-02";
+	$d1 = "2002-01-02";
 	$d2 = "12:49:00";
 	$d3 = "2002-01-02 17:46:59";
 	$d4 = "2010";
@@ -37,9 +40,9 @@ mysqli bind_param/bind_result date
 
 	$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);
@@ -48,6 +51,8 @@ mysqli bind_param/bind_result date
 
 	mysqli_stmt_close($stmt);
 	mysqli_close($link);
+
+	print "done!";
 ?>
 --EXPECTF--
 array(7) {
@@ -66,3 +71,4 @@ array(7) {
   [6]=>
   %s(19) "1999-12-29 00:00:00"
 }
+done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/021.phpt b/ext/mysqli/tests/021.phpt
index e351bd4540..b9f367afda 100644
--- a/ext/mysqli/tests/021.phpt
+++ b/ext/mysqli/tests/021.phpt
@@ -1,18 +1,18 @@
 --TEST--
-mysqli bind_param+bind_result char/text 
+mysqli bind_param+bind_result char/text
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	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)");
+	mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
+	mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 char(10), c2 text)");
 
 	$stmt = mysqli_prepare($link, "INSERT INTO test_bind_fetch VALUES (?,?)");
 	mysqli_bind_param($stmt, "ss", $q1, $q2);
@@ -32,11 +32,21 @@ mysqli bind_param+bind_result char/text
 
 	mysqli_stmt_close($stmt);
 	mysqli_close($link);
+	print "done!";
 ?>
 --EXPECTF--
 array(2) {
   [0]=>
-  %s(10) "1234567890"
+  string(10) "1234567890"
+  [1]=>
+  %s(14) "this is a test"
+}
+done!
+--UEXPECTF--
+array(2) {
+  [0]=>
+  unicode(10) "1234567890"
   [1]=>
   %s(14) "this is a test"
 }
+done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/022.phpt b/ext/mysqli/tests/022.phpt
index a716d848fd..969936ed8a 100644
--- a/ext/mysqli/tests/022.phpt
+++ b/ext/mysqli/tests/022.phpt
@@ -1,18 +1,18 @@
 --TEST--
-mysqli bind_param/bind_result char/text long 
+mysqli bind_param/bind_result char/text long
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	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)");
+	mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
+	mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 char(10), c2 text)");
 
 
 	$stmt = mysqli_prepare($link, "INSERT INTO test_bind_fetch VALUES (?,?)");
@@ -36,11 +36,22 @@ mysqli bind_param/bind_result char/text long
 
 	mysqli_stmt_close($stmt);
 	mysqli_close($link);
+
+	print "done!";
 ?>
 --EXPECTF--
 array(2) {
   [0]=>
-  %s(10) "1234567890"
+  string(10) "1234567890"
+  [1]=>
+  %s(13) "32K String ok"
+}
+done!
+--UEXPECTF--
+array(2) {
+  [0]=>
+  unicode(10) "1234567890"
   [1]=>
   %s(13) "32K String ok"
 }
+done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/023.phpt b/ext/mysqli/tests/023.phpt
index 24a717a6eb..97398001f8 100644
--- a/ext/mysqli/tests/023.phpt
+++ b/ext/mysqli/tests/023.phpt
@@ -5,15 +5,15 @@ mysqli bind_param/bind_prepare fetch long values
 --FILE--
 <?php
 	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, "SET sql_mode=''");
 
-  	mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
-  	mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 int unsigned,
+	mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
+	mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 int unsigned,
                                                      c2 int unsigned,
                                                      c3 int,
                                                      c4 int,
@@ -45,6 +45,8 @@ mysqli bind_param/bind_prepare fetch long values
 
 	mysqli_stmt_close($stmt);
 	mysqli_close($link);
+
+	print "done!";
 ?>
 --EXPECT--
 array(7) {
@@ -63,3 +65,4 @@ array(7) {
   [6]=>
   int(0)
 }
+done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/024.phpt b/ext/mysqli/tests/024.phpt
index f0d0a6407a..58302b39d4 100644
--- a/ext/mysqli/tests/024.phpt
+++ b/ext/mysqli/tests/024.phpt
@@ -5,15 +5,15 @@ mysqli bind_param/bind_result short values
 --FILE--
 <?php
 	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, "SET sql_mode=''");
 
-  	mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
-  	mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 smallint unsigned,
+	mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
+	mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 smallint unsigned,
                                                      c2 smallint unsigned,
                                                      c3 smallint,
                                                      c4 smallint,
@@ -46,6 +46,7 @@ mysqli bind_param/bind_result short values
 
 	mysqli_stmt_close($stmt);
 	mysqli_close($link);
+	print "done!";
 ?>
 --EXPECT--
 array(7) {
@@ -64,3 +65,4 @@ array(7) {
   [6]=>
   int(0)
 }
+done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/025.phpt b/ext/mysqli/tests/025.phpt
index f3338cf467..8d3e2388e1 100644
--- a/ext/mysqli/tests/025.phpt
+++ b/ext/mysqli/tests/025.phpt
@@ -5,15 +5,15 @@ mysqli bind_param/bind_result tinyint values
 --FILE--
 <?php
 	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, "SET sql_mode=''");
 
-  	mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
-  	mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 tinyint,
+	mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
+	mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 tinyint,
                                                      c2 tinyint unsigned,
                                                      c3 tinyint not NULL,
                                                      c4 tinyint,
@@ -50,6 +50,8 @@ mysqli bind_param/bind_result tinyint values
 
 	mysqli_stmt_close($stmt);
 	mysqli_close($link);
+
+	print "done!";
 ?>
 --EXPECT--
 array(7) {
@@ -68,3 +70,4 @@ array(7) {
   [6]=>
   int(0)
 }
+done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/026.phpt b/ext/mysqli/tests/026.phpt
index ad4fe67b84..04faf108c6 100644
--- a/ext/mysqli/tests/026.phpt
+++ b/ext/mysqli/tests/026.phpt
@@ -1,19 +1,19 @@
 --TEST--
-mysqli bind_param/bind_result with send_long_data 
+mysqli bind_param/bind_result with send_long_data
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	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, "SET sql_mode=''");
 
-  	mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
-  	mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 varchar(10), c2 text)");
+	mysqli_query($link,"DROP TABLE IF EXISTS test_bind_fetch");
+	mysqli_query($link,"CREATE TABLE test_bind_fetch(c1 varchar(10), c2 text)");
 
 	$stmt = mysqli_prepare ($link, "INSERT INTO test_bind_fetch VALUES (?,?)");
 	mysqli_bind_param($stmt, "sb", $c1, $c2);
@@ -39,11 +39,20 @@ mysqli bind_param/bind_result with send_long_data
 	mysqli_stmt_close($stmt);
 
 	mysqli_close($link);
-?>
+	print "done!";
 --EXPECTF--
 array(2) {
   [0]=>
-  %s(10) "Hello Worl"
+  string(10) "Hello Worl"
+  [1]=>
+  string(99) "This is the first sentence. And this is the second sentence. And finally this is the last sentence."
+}
+done!
+--UEXPECTF--
+array(2) {
+  [0]=>
+  unicode(10) "Hello Worl"
   [1]=>
   %s(99) "This is the first sentence. And this is the second sentence. And finally this is the last sentence."
 }
+done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/027.phpt b/ext/mysqli/tests/027.phpt
index 9f8eadf9dd..dc0f1af928 100644
--- a/ext/mysqli/tests/027.phpt
+++ b/ext/mysqli/tests/027.phpt
@@ -5,9 +5,9 @@ function test: mysqli_stat
 --FILE--
 <?php
 	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);
 
 	$status = mysqli_stat($link);
 
@@ -15,6 +15,8 @@ function test: mysqli_stat
 	var_dump(strlen($status) > 0);
 
 	mysqli_close($link);
+	print "done!";
 ?>
 --EXPECT--
 bool(true)
+done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/028.phpt b/ext/mysqli/tests/028.phpt
index b11da2ae44..44704dcae0 100644
--- a/ext/mysqli/tests/028.phpt
+++ b/ext/mysqli/tests/028.phpt
@@ -5,15 +5,20 @@ function test: mysqli_character_set_name
 --FILE--
 <?php
 	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);
 
 	$cset = substr(mysqli_character_set_name($link),0,6);
 
 	var_dump($cset);
 
 	mysqli_close($link);
+	print "done!";
 ?>
 --EXPECTF--
-%s(%d) "%s"
+string(%d) "%s"
+done!
+--UEXPECTF--
+unicode(%d) "%s"
+done!
\ No newline at end of file
diff --git a/ext/mysqli/tests/029.phpt b/ext/mysqli/tests/029.phpt
index 318e6aeb9e..4970736f2a 100644
--- a/ext/mysqli/tests/029.phpt
+++ b/ext/mysqli/tests/029.phpt
@@ -5,11 +5,11 @@ function test: mysqli_affected_rows
 --FILE--
 <?php
 	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 general_test");
 	mysqli_query($link, "create table general_test (a int)");
@@ -20,6 +20,8 @@ function test: mysqli_affected_rows
 	var_dump($afc);
 
 	mysqli_close($link);
+	print "done!";
 ?>
 --EXPECT--
 int(3)
+done!
\ No newline at end of file
-- 
2.50.1