MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:uwendel Date:July 12 2007 4:58pm
Subject:PHP mysqlnd svn commit: r745 - trunk/tests/ext/mysqli
View as plain text  
Author: uwendel
Date: 2007-07-12 18:58:14 +0200 (Thu, 12 Jul 2007)
New Revision: 745

Modified:
   trunk/tests/ext/mysqli/045.phpt
   trunk/tests/ext/mysqli/046.phpt
   trunk/tests/ext/mysqli/047.phpt
   trunk/tests/ext/mysqli/048.phpt
   trunk/tests/ext/mysqli/049.phpt
Log:
The usual: adding "done", adding proper UEXPECTF


Modified: trunk/tests/ext/mysqli/045.phpt
===================================================================
--- trunk/tests/ext/mysqli/045.phpt	2007-07-12 16:52:54 UTC (rev 744)
+++ trunk/tests/ext/mysqli/045.phpt	2007-07-12 16:58:14 UTC (rev 745)
@@ -1,9 +1,9 @@
 --TEST--
 mysqli_bind_result (SHOW)
 --SKIPIF--
-<?php	
+<?php
 	require_once('skipif.inc');
-	require_once('skipifemb.inc'); 
+	require_once('skipifemb.inc');
 
 	include "connect.inc";
 	$link = mysqli_connect($host, $user, $passwd);
@@ -21,26 +21,36 @@
 --FILE--
 <?php
 	include "connect.inc";
-	
+
 	/*** test mysqli_connect 127.0.0.1 ***/
 	$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
 	$stmt = mysqli_prepare($link, "SHOW VARIABLES LIKE 'port'");
 	mysqli_execute($stmt);
 
-	mysqli_bind_result($stmt, $c1, $c2); 	
+	mysqli_bind_result($stmt, $c1, $c2);
 	mysqli_fetch($stmt);
-	mysqli_stmt_close($stmt);	
+	mysqli_stmt_close($stmt);
 	$test = array ($c1,$c2);
 
 	var_dump($test);
 
 	mysqli_close($link);
+	print "done!";
 ?>
 --EXPECTF--
 array(2) {
   [0]=>
-  %s(4) "port"
+  string(4) "port"
   [1]=>
-  %s(%d) "%s"
+  string(%d) "%s"
 }
+done!
+--UEXPECTF--
+array(2) {
+  [0]=>
+  unicode(4) "port"
+  [1]=>
+  unicode(%d) "%s"
+}
+done!
\ No newline at end of file

Modified: trunk/tests/ext/mysqli/046.phpt
===================================================================
--- trunk/tests/ext/mysqli/046.phpt	2007-07-12 16:52:54 UTC (rev 744)
+++ trunk/tests/ext/mysqli/046.phpt	2007-07-12 16:58:14 UTC (rev 745)
@@ -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);
 
@@ -24,10 +24,12 @@
 	mysqli_execute($stmt);
 	$x = mysqli_stmt_affected_rows($stmt);
 
-	mysqli_stmt_close($stmt);	
+	mysqli_stmt_close($stmt);
 	var_dump($x==1);
 
 	mysqli_close($link);
+	print "done!";
 ?>
 --EXPECT--
 bool(true)
+done!
\ No newline at end of file

Modified: trunk/tests/ext/mysqli/047.phpt
===================================================================
--- trunk/tests/ext/mysqli/047.phpt	2007-07-12 16:52:54 UTC (rev 744)
+++ trunk/tests/ext/mysqli/047.phpt	2007-07-12 16:58:14 UTC (rev 745)
@@ -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);
 
@@ -31,14 +31,15 @@
 	while ($field = mysqli_fetch_field($result)) {
 		var_dump($field);
 	}
-    
+
 	print_r(mysqli_fetch_lengths($result));
-    
+
 	mysqli_free_result($result);
 
 
-	mysqli_stmt_close($stmt);	
+	mysqli_stmt_close($stmt);
 	mysqli_close($link);
+	print "done!";
 ?>
 --EXPECTF--
 === fetch_fields ===
@@ -194,6 +195,7 @@
   ["decimals"]=>
   int(0)
 }
+done!
 --UEXPECTF--
 === fetch_fields ===
 array(2) {
@@ -348,3 +350,4 @@
   [u"decimals"]=>
   int(0)
 }
+done!
\ No newline at end of file

Modified: trunk/tests/ext/mysqli/048.phpt
===================================================================
--- trunk/tests/ext/mysqli/048.phpt	2007-07-12 16:52:54 UTC (rev 744)
+++ trunk/tests/ext/mysqli/048.phpt	2007-07-12 16:58:14 UTC (rev 745)
@@ -1,29 +1,29 @@
 --TEST--
-mysqli bind_result (OO-Style) 
+mysqli bind_result (OO-Style)
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
-	
+
 	/*** test mysqli_connect 127.0.0.1 ***/
 	$mysql = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
-	$mysql->select_db($db);		
+	$mysql->select_db($db);
 	$mysql->query("DROP TABLE IF EXISTS test_fetch_null");
 
   	$mysql->query("CREATE TABLE test_fetch_null(col1 tinyint, col2 smallint,
-                                                       col3 int, col4 bigint, 
+                                                       col3 int, col4 bigint,
                                                        col5 float, col6 double,
-                                                       col7 date, col8 time, 
-                                                       col9 varbinary(10), 
+                                                       col7 date, col8 time,
+                                                       col9 varbinary(10),
                                                        col10 varchar(50),
                                                        col11 char(20))");
-  
+
 	$mysql->query("INSERT INTO test_fetch_null(col1,col10, col11) VALUES(1,'foo1',
1000),(2,'foo2', 88),(3,'foo3', 389789)");
 
 	$stmt = $mysql->prepare("SELECT col1, col2, col3, col4, col5, col6, col7, col8, col9,
col10, col11 from test_fetch_null");
-	$stmt->bind_result($c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8, $c9, $c10, $c11); 
+	$stmt->bind_result($c1, $c2, $c3, $c4, $c5, $c6, $c7, $c8, $c9, $c10, $c11);
 	$stmt->execute();
 
 	$stmt->fetch();
@@ -34,6 +34,7 @@
 
 	$stmt->close();
 	$mysql->close();
+	print "done!";
 ?>
 --EXPECTF--
 array(11) {
@@ -56,7 +57,34 @@
   [8]=>
   NULL
   [9]=>
-  %s(4) "foo1"
+  string(4) "foo1"
   [10]=>
-  %s(4) "1000"
+  string(4) "1000"
 }
+done!
+--UEXPECTF--
+array(11) {
+  [0]=>
+  int(1)
+  [1]=>
+  NULL
+  [2]=>
+  NULL
+  [3]=>
+  NULL
+  [4]=>
+  NULL
+  [5]=>
+  NULL
+  [6]=>
+  NULL
+  [7]=>
+  NULL
+  [8]=>
+  NULL
+  [9]=>
+  unicode(4) "foo1"
+  [10]=>
+  unicode(4) "1000"
+}
+done!
\ No newline at end of file

Modified: trunk/tests/ext/mysqli/049.phpt
===================================================================
--- trunk/tests/ext/mysqli/049.phpt	2007-07-12 16:52:54 UTC (rev 744)
+++ trunk/tests/ext/mysqli/049.phpt	2007-07-12 16:58:14 UTC (rev 745)
@@ -1,16 +1,16 @@
 --TEST--
-mysql_fetch_row (OO-Style) 
+mysql_fetch_row (OO-Style)
 --SKIPIF--
 <?php require_once('skipif.inc'); ?>
 <?php require_once('skipifemb.inc'); ?>
 --FILE--
 <?php
 	include "connect.inc";
-	
+
 	/*** test mysqli_connect 127.0.0.1 ***/
 	$mysql = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
 
-	$mysql->select_db($db);		
+	$mysql->select_db($db);
 	$result = $mysql->query("SELECT DATABASE()");
 	$row = $result->fetch_row();
 	$result->close();
@@ -18,9 +18,17 @@
 	var_dump($row);
 
 	$mysql->close();
+	print "done!";
 ?>
 --EXPECTF--
 array(1) {
   [0]=>
-  %s(%d) "%s"
+  string(%d) "%s"
 }
+done!
+--UEXPECTF--
+array(1) {
+  [0]=>
+  unicode(%d) "%s"
+}
+done!
\ No newline at end of file

Thread
PHP mysqlnd svn commit: r745 - trunk/tests/ext/mysqliuwendel12 Jul