PHP mysqlnd svn commit: r746 - trunk/tests/ext/mysqli

[uwendel]

Author: uwendel
Date: 2007-07-12 19:04:06 +0200 (Thu, 12 Jul 2007)
New Revision: 746

Modified:
   trunk/tests/ext/mysqli/050.phpt
   trunk/tests/ext/mysqli/051.phpt
   trunk/tests/ext/mysqli/057.phpt
   trunk/tests/ext/mysqli/058.phpt
   trunk/tests/ext/mysqli/059.phpt
Log:
done + UEXPECTF fixing


Modified: trunk/tests/ext/mysqli/050.phpt
===================================================================
--- trunk/tests/ext/mysqli/050.phpt	2007-07-12 16:58:14 UTC (rev 745)
+++ trunk/tests/ext/mysqli/050.phpt	2007-07-12 17:04:06 UTC (rev 746)
@@ -1,11 +1,11 @@
 --TEST--
-non freed statement test 
+non freed statement test
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
-	
+
 	/************************
 	 * non freed stamement
 	 ************************/

Modified: trunk/tests/ext/mysqli/051.phpt
===================================================================
--- trunk/tests/ext/mysqli/051.phpt	2007-07-12 16:58:14 UTC (rev 745)
+++ trunk/tests/ext/mysqli/051.phpt	2007-07-12 17:04:06 UTC (rev 746)
@@ -1,13 +1,13 @@
 --TEST--
-free statement after close 
+free statement after close
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
-	
+
 	/************************
-	 * free statement after close 
+	 * free statement after close
 	 ************************/
 	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 

Modified: trunk/tests/ext/mysqli/057.phpt
===================================================================
--- trunk/tests/ext/mysqli/057.phpt	2007-07-12 16:58:14 UTC (rev 745)
+++ trunk/tests/ext/mysqli/057.phpt	2007-07-12 17:04:06 UTC (rev 746)
@@ -5,14 +5,14 @@
 --FILE--
 <?php
 	include "connect.inc";
-	
+
 	/*** test mysqli_connect 127.0.0.1 ***/
 	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 
-  	mysqli_query($link,"DROP TABLE IF EXISTS test_store_result");
-  	mysqli_query($link,"CREATE TABLE test_store_result (a int)");
+	mysqli_query($link,"DROP TABLE IF EXISTS test_store_result");
+	mysqli_query($link,"CREATE TABLE test_store_result (a int)");
 
 	mysqli_query($link, "INSERT INTO test_store_result VALUES (1),(2),(3)");
 
@@ -46,15 +46,14 @@
 	if ($result = mysqli_query($link, "SELECT * FROM test_store_result")) {
 		$row = mysqli_fetch_row($result);
 		mysqli_free_result($result);
-	} 
-	
+	}
 
-	var_dump($row);	
+	var_dump($row);
 
 	mysqli_free_result($result1);
 	mysqli_stmt_close($stmt);
 	mysqli_close($link);
-	echo "done\n";
+	echo "done!";
 ?>
 --EXPECTF--
 bool(true)
@@ -63,13 +62,30 @@
 }
 bool(true)
 bool(false)
-%s(0) ""
+string(0) ""
 
 Warning: mysqli_stmt_reset() expects parameter 1 to be mysqli_stmt, boolean given in %s
on line %d
 NULL
 Rows: 3
 array(1) {
   [0]=>
-  %s(1) "1"
+  string(1) "1"
 }
-done
+done!
+--UEXPECTF--
+bool(true)
+bool(true)
+object(mysqli_stmt)#%d (%d) {
+}
+bool(true)
+bool(false)
+unicode(0) ""
+
+Warning: mysqli_stmt_reset() expects parameter 1 to be mysqli_stmt, boolean given in %s
on line %d
+NULL
+Rows: 3
+array(1) {
+  [0]=>
+  unicode(1) "1"
+}
+done!
\ No newline at end of file

Modified: trunk/tests/ext/mysqli/058.phpt
===================================================================
--- trunk/tests/ext/mysqli/058.phpt	2007-07-12 16:58:14 UTC (rev 745)
+++ trunk/tests/ext/mysqli/058.phpt	2007-07-12 17:04:06 UTC (rev 746)
@@ -5,17 +5,17 @@
 --FILE--
 <?php
 	include "connect.inc";
-	
+
 	/*** test mysqli_connect 127.0.0.1 ***/
 	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	mysqli_select_db($link, $db);
 
-  	mysqli_query($link,"DROP TABLE IF EXISTS mbind");
-  	mysqli_query($link,"CREATE TABLE mbind (a int, b varchar(10))");
+	mysqli_query($link,"DROP TABLE IF EXISTS mbind");
+	mysqli_query($link,"CREATE TABLE mbind (a int, b varchar(10))");
 
 	$stmt = mysqli_prepare($link, "INSERT INTO mbind VALUES (?,?)");
-	
+
 	mysqli_bind_param($stmt, "is", $a, $b);
 
 	$a = 1;
@@ -43,15 +43,29 @@
 	var_dump((array($e,$f,$g,$h)));
 
 	mysqli_close($link);
+	print "done!";
 ?>
 --EXPECTF--
 array(4) {
   [0]=>
   int(1)
   [1]=>
-  %s(3) "foo"
+  string(3) "foo"
   [2]=>
   int(2)
   [3]=>
-  %s(3) "bar"
+  string(3) "bar"
 }
+done!
+--UEXPECTF--
+array(4) {
+  [0]=>
+  int(1)
+  [1]=>
+  unicode(3) "foo"
+  [2]=>
+  int(2)
+  [3]=>
+  unicode(3) "bar"
+}
+done!
\ No newline at end of file

Modified: trunk/tests/ext/mysqli/059.phpt
===================================================================
--- trunk/tests/ext/mysqli/059.phpt	2007-07-12 16:58:14 UTC (rev 745)
+++ trunk/tests/ext/mysqli/059.phpt	2007-07-12 17:04:06 UTC (rev 746)
@@ -5,7 +5,7 @@
 --FILE--
 <?php
 	include "connect.inc";
-	
+
 	/*** test mysqli_connect 127.0.0.1 ***/
 	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
@@ -13,11 +13,11 @@
 
 	mysqli_query($link, "SET SQL_MODE='PIPES_AS_CONCAT'");
 
-  	mysqli_query($link,"DROP TABLE IF EXISTS mbind");
-  	mysqli_query($link,"CREATE TABLE mbind (b varchar(25))");
+	mysqli_query($link,"DROP TABLE IF EXISTS mbind");
+	mysqli_query($link,"CREATE TABLE mbind (b varchar(25))");
 
 	$stmt = mysqli_prepare($link, "INSERT INTO mbind VALUES (?||?)");
-	
+
 	mysqli_bind_param($stmt, "ss", $a, $b);
 
 	$a = "foo";
@@ -36,8 +36,11 @@
 	var_dump($e);
 
 	mysqli_close($link);
+	print "done!";
 ?>
 --EXPECT--
 string(6) "foobar"
+done!
 --UEXPECT--
 unicode(6) "foobar"
+done!
\ No newline at end of file