Author: uwendel
Date: 2007-07-12 19:11:53 +0200 (Thu, 12 Jul 2007)
New Revision: 747
Modified:
trunk/tests/ext/mysqli/060.phpt
trunk/tests/ext/mysqli/061.phpt
trunk/tests/ext/mysqli/062.phpt
trunk/tests/ext/mysqli/066.phpt
trunk/tests/ext/mysqli/067.phpt
trunk/tests/ext/mysqli/068.phpt
trunk/tests/ext/mysqli/069.phpt
Log:
As usual: adding "done!" to detect crashes, fixing UEXPECTF
Modified: trunk/tests/ext/mysqli/060.phpt
===================================================================
--- trunk/tests/ext/mysqli/060.phpt 2007-07-12 17:04:06 UTC (rev 746)
+++ trunk/tests/ext/mysqli/060.phpt 2007-07-12 17:11:53 UTC (rev 747)
@@ -5,21 +5,21 @@
--FILE--
<?php
include "connect.inc";
-
+
class test_class {
function __construct($arg1, $arg2) {
echo __METHOD__ . "($arg1,$arg2)\n";
}
}
-
+
/*** test mysqli_connect 127.0.0.1 ***/
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
mysqli_select_db($link, $db);
mysqli_query($link, "SET sql_mode=''");
- mysqli_query($link,"DROP TABLE IF EXISTS test_fetch");
- mysqli_query($link,"CREATE TABLE test_fetch(c1 smallint unsigned,
+ mysqli_query($link,"DROP TABLE IF EXISTS test_fetch");
+ mysqli_query($link,"CREATE TABLE test_fetch(c1 smallint unsigned,
c2 smallint unsigned,
c3 smallint,
c4 smallint,
@@ -27,7 +27,7 @@
c6 smallint unsigned,
c7 smallint)");
- mysqli_query($link, "INSERT INTO test_fetch VALUES ( -23, 35999, NULL, -500, -9999999,
-0, 0)");
+ mysqli_query($link, "INSERT INTO test_fetch VALUES ( -23, 35999, NULL, -500, -9999999,
-0, 0)");
$result = mysqli_query($link, "SELECT * FROM test_fetch");
$test = mysqli_fetch_object($result, 'test_class', array(1, 2));
@@ -36,7 +36,7 @@
var_dump($test);
mysqli_close($link);
-
+
echo "Done\n";
?>
--EXPECTF--
Modified: trunk/tests/ext/mysqli/061.phpt
===================================================================
--- trunk/tests/ext/mysqli/061.phpt 2007-07-12 17:04:06 UTC (rev 746)
+++ trunk/tests/ext/mysqli/061.phpt 2007-07-12 17:11:53 UTC (rev 747)
@@ -10,7 +10,7 @@
$buffer = strrev(fread($fp, $buflen));
return(strlen($buffer));
}
-
+
/*** test mysqli_connect 127.0.0.1 ***/
$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
@@ -20,9 +20,9 @@
fwrite($fp, b"foo;bar");
fclose($fp);
- if (!mysqli_query($link,"DROP TABLE IF EXISTS t_061"))
+ if (!mysqli_query($link,"DROP TABLE IF EXISTS t_061"))
printf("Cannot drop table: [%d] %s\n", mysqli_errno($link), mysqli_error($link));
- if (!mysqli_query($link,"CREATE TABLE t_061 (c1 varchar(10), c2 varchar(10))"))
+ if (!mysqli_query($link,"CREATE TABLE t_061 (c1 varchar(10), c2 varchar(10))"))
printf("Cannot create table: [%d] %s\n", mysqli_errno($link), mysqli_error($link));
if (!mysqli_query($link, sprintf("LOAD DATA LOCAL INFILE '%s' INTO TABLE t_061 FIELDS
TERMINATED BY ';'", mysqli_real_escape_string($link, $filename))))
@@ -35,13 +35,24 @@
if ($result = mysqli_query($link, "SELECT c1,c2 FROM t_061")) {
while (($row = mysqli_fetch_row($result))) {
printf("%s-%s\n", $row[0], $row[1]);
+ printf("%s-%s\n", gettype($row[0]), gettype($row[1]));
}
mysqli_free_result($result);
}
mysqli_close($link);
unlink($filename);
+ print "done!";
?>
--EXPECT--
foo-bar
+string-string
rab-oof
+string-string
+done!
+--UEXPECTF--
+foo-bar
+unicode-unicode
+rab-oof
+unicode-unicode
+done!
\ No newline at end of file
Modified: trunk/tests/ext/mysqli/062.phpt
===================================================================
--- trunk/tests/ext/mysqli/062.phpt 2007-07-12 17:04:06 UTC (rev 746)
+++ trunk/tests/ext/mysqli/062.phpt 2007-07-12 17:11:53 UTC (rev 747)
@@ -1,5 +1,5 @@
--TEST--
-resultset constructor
+resultset constructor
--SKIPIF--
<?php require_once('skipif.inc'); ?>
--FILE--
@@ -17,9 +17,17 @@
$mysql->close();
var_dump($row);
+ print "done!";
?>
--EXPECTF--
array(1) {
[0]=>
- %s(3) "foo"
+ string(3) "foo"
}
+done!
+--UEXPECTF--
+array(1) {
+ [0]=>
+ unicode(3) "foo"
+}
+done!
\ No newline at end of file
Modified: trunk/tests/ext/mysqli/066.phpt
===================================================================
--- trunk/tests/ext/mysqli/066.phpt 2007-07-12 17:04:06 UTC (rev 746)
+++ trunk/tests/ext/mysqli/066.phpt 2007-07-12 17:11:53 UTC (rev 747)
@@ -6,7 +6,7 @@
<?php
include "connect.inc";
-
+
/*** test mysqli_connect 127.0.0.1 ***/
$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
@@ -15,7 +15,7 @@
$mysql->query("CREATE TABLE test_warnings (a int not null) ENGINE=myisam");
$mysql->query("INSERT INTO test_warnings VALUES (1),(2),(NULL)");
-
+
if (($warning = new mysqli_warning($mysql))) {
do {
printf("Warning\n");
@@ -23,6 +23,8 @@
}
$mysql->close();
+ print "done!";
?>
--EXPECT--
Warning
+done!
\ No newline at end of file
Modified: trunk/tests/ext/mysqli/067.phpt
===================================================================
--- trunk/tests/ext/mysqli/067.phpt 2007-07-12 17:04:06 UTC (rev 746)
+++ trunk/tests/ext/mysqli/067.phpt 2007-07-12 17:11:53 UTC (rev 747)
@@ -1,16 +1,18 @@
--TEST--
function test: nested selects (cursors)
--SKIPIF--
-<?php
- require_once('skipif.inc');
+<?php
+ require_once('skipif.inc');
include "connect.inc";
+
if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket))
- die("skip Cannot connect to check required version");
+ die("skip Cannot connect to check required version");
+
/* skip cursor test for versions < 50004 */
- if ((!$IS_MYSQLND && mysqli_get_client_version() < 50009) ||
+ if ((!$IS_MYSQLND && mysqli_get_client_version() < 50009) ||
(mysqli_get_server_version($link) < 50009)) {
die(sprintf("skip Client library doesn't support cursors (%s/%s)",
- mysqli_get_client_version(), mysqli_get_server_version($link));
+ mysqli_get_client_version(), mysqli_get_server_version($link));
}
mysqli_close($link);
?>
@@ -19,17 +21,17 @@
function open_cursor($mysql, $query) {
if (!is_object($stmt = $mysql->prepare($query))) {
- printf("[001] Cannot create statement object for '%s', [%d] %s\n",
+ printf("[001] Cannot create statement object for '%s', [%d] %s\n",
$query, $mysql->errno, $mysql->error);
}
-
+
$stmt->attr_set(MYSQLI_STMT_ATTR_CURSOR_TYPE, MYSQLI_CURSOR_TYPE_READ_ONLY);
return $stmt;
}
- include "connect.inc";
+ include "connect.inc";
$a = array();
-
+
/*** test mysqli_connect 127.0.0.1 ***/
$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
@@ -42,7 +44,7 @@
$stmt[$i]->bind_result($a[$i]);
}
-
+
$cnt = 0;
while ($stmt[0]->fetch()) {
$stmt[1]->fetch();
@@ -58,4 +60,4 @@
var_dump($cnt);
?>
--EXPECT--
-int(63)
+int(63)
\ No newline at end of file
Modified: trunk/tests/ext/mysqli/068.phpt
===================================================================
--- trunk/tests/ext/mysqli/068.phpt 2007-07-12 17:04:06 UTC (rev 746)
+++ trunk/tests/ext/mysqli/068.phpt 2007-07-12 17:11:53 UTC (rev 747)
@@ -1,13 +1,11 @@
--TEST--
mysqli get_client_info
--SKIPIF--
-<?php
- require_once('skipif.inc');
-?>
+<?php require_once('skipif.inc'); ?>
--FILE--
<?php
- $s = mysqli_get_client_info();
- echo gettype($s);
+ $s = mysqli_get_client_info();
+ echo gettype($s);
?>
--EXPECT--
string
Modified: trunk/tests/ext/mysqli/069.phpt
===================================================================
--- trunk/tests/ext/mysqli/069.phpt 2007-07-12 17:04:06 UTC (rev 746)
+++ trunk/tests/ext/mysqli/069.phpt 2007-07-12 17:11:53 UTC (rev 747)
@@ -9,7 +9,7 @@
$mysql = new mysqli($host, $user, $passwd, $db, $port, $socket);
$mysql->multi_query('SELECT 1;SELECT 2');
do {
- $res = $mysql->store_result();
+ $res = $mysql->store_result();
if ($mysql->errno == 0) {
while ($arr = $res->fetch_assoc()) {
var_dump($arr);
@@ -21,13 +21,25 @@
}
} while (@$mysql->next_result());
$mysql->close();
+ print "done!";
?>
--EXPECTF--
array(1) {
[1]=>
- %s(1) "1"
+ string(1) "1"
}
array(1) {
[2]=>
- %s(1) "2"
+ string(1) "2"
}
+done!
+--UEXPECTF--
+array(1) {
+ [1]=>
+ unicode(1) "1"
+}
+array(1) {
+ [2]=>
+ unicode(1) "2"
+}
+done!
\ No newline at end of file
| Thread |
|---|
| • PHP mysqlnd svn commit: r747 - trunk/tests/ext/mysqli | uwendel | 12 Jul |
