uw Wed Jul 11 15:07:29 2007 UTC
Modified files:
/php-src/ext/mysql/tests mysql_get_host_info.phpt
mysql_get_server_info.phpt
mysql_get_proto_info.phpt
Log:
Mainly Whitespace/CS changes. Partly "too many arguments" check added.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_get_host_info.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_get_host_info.phpt
diff -u php-src/ext/mysql/tests/mysql_get_host_info.phpt:1.1
php-src/ext/mysql/tests/mysql_get_host_info.phpt:1.2
--- php-src/ext/mysql/tests/mysql_get_host_info.phpt:1.1 Sun Nov 19
12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_get_host_info.phpt Wed Jul 11 15:07:28 2007
@@ -4,30 +4,34 @@
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
- include_once "connect.inc";
-
- if (false !== ($tmp = @mysql_get_host_info(NULL)))
- printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
-
- require "table.inc";
- if (!is_string($info = mysql_get_host_info($link)) || ('' === $info))
- printf("[003] Expecting string/any_non_empty, got %s/%s\n",
gettype($info), $info);
-
- $def_info = mysql_get_host_info();
- if ($def_info !== $info) {
- printf("[004] Host info for the default link and the specified link
differ, [%d] %s\n",
- mysql_errno(), mysql_error());
-
- var_dump($def_info);
- var_dump($info);
- }
-
- if (ini_get('unicode.semantics') && !is_unicode($info)) {
- printf("[005] Expecting Unicode error message!\n");
- var_inspect($info);
- }
+include_once "connect.inc";
- print "done!";
+if (false !== ($tmp = @mysql_get_host_info(NULL)))
+ printf("[001] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
+
+require "table.inc";
+if (!is_string($info = mysql_get_host_info($link)) || ('' === $info))
+ printf("[003] Expecting string/any_non_empty, got %s/%s\n",
gettype($info), $info);
+
+$def_info = mysql_get_host_info();
+if ($def_info !== $info) {
+ printf("[004] Host info for the default link and the specified link
differ, [%d] %s\n",
+ mysql_errno(), mysql_error());
+
+ var_dump($def_info);
+ var_dump($info);
+}
+
+if (ini_get('unicode.semantics') && !is_unicode($info)) {
+ printf("[005] Expecting Unicode error message!\n");
+ var_inspect($info);
+}
+
+if (!is_null($tmp = @mysql_get_host_info($link, "too many arguments"))) {
+ printf("[006] Expecting NULL/NULL got %s/%s\n", $tmp, gettype($tmp));
+}
+
+print "done!";
?>
--EXPECTF--
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_get_server_info.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_get_server_info.phpt
diff -u php-src/ext/mysql/tests/mysql_get_server_info.phpt:1.1
php-src/ext/mysql/tests/mysql_get_server_info.phpt:1.2
--- php-src/ext/mysql/tests/mysql_get_server_info.phpt:1.1 Sun Nov 19
12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_get_server_info.phpt Wed Jul 11 15:07:28 2007
@@ -2,33 +2,35 @@
mysql_get_server_info()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
--FILE--
<?php
- include "connect.inc";
-
- if (false !== ($tmp = @mysql_get_server_info(NULL)))
- printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
-
- require "table.inc";
- if (!is_string($info = mysql_get_server_info($link)) || ('' === $info))
- printf("[003] Expecting string/any_non_empty, got %s/%s\n",
gettype($info), $info);
-
- $def_info = mysql_get_server_info();
- if ($def_info !== $info) {
- printf("[004] Server info for the default link and the specified link
differ, [%d] %s\n",
- mysql_errno(), mysql_error());
-
- var_dump($def_info);
- var_dump($info);
- }
-
- if (ini_get('unicode.semantics') && !is_unicode($info)) {
- printf("[005] Expecting Unicode error message!\n");
- var_inspect($info);
- }
+include "connect.inc";
- print "done!";
+if (false !== ($tmp = @mysql_get_server_info(NULL)))
+ printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
+
+require "table.inc";
+if (!is_string($info = mysql_get_server_info($link)) || ('' === $info))
+ printf("[003] Expecting string/any_non_empty, got %s/%s\n",
gettype($info), $info);
+
+$def_info = mysql_get_server_info();
+if ($def_info !== $info) {
+ printf("[004] Server info for the default link and the specified link
differ, [%d] %s\n",
+ mysql_errno(), mysql_error());
+
+ var_dump($def_info);
+ var_dump($info);
+}
+
+if (ini_get('unicode.semantics') && !is_unicode($info)) {
+ printf("[005] Expecting Unicode error message!\n");
+ var_inspect($info);
+}
+
+if (NULL !== ($tmp = @mysql_get_server_info('too many', 'just too many')))
+ printf("[006] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!";
?>
--EXPECTF--
done!
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_get_proto_info.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_get_proto_info.phpt
diff -u php-src/ext/mysql/tests/mysql_get_proto_info.phpt:1.1
php-src/ext/mysql/tests/mysql_get_proto_info.phpt:1.2
--- php-src/ext/mysql/tests/mysql_get_proto_info.phpt:1.1 Sun Nov 19
12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_get_proto_info.phpt Wed Jul 11 15:07:28 2007
@@ -2,19 +2,26 @@
mysql_get_proto_info()
--SKIPIF--
<?php require_once('skipif.inc'); ?>
-<?php require_once('skipifemb.inc'); ?>
--FILE--
<?php
- include_once "connect.inc";
-
- if (false !== ($tmp = @mysql_get_proto_info(NULL)))
- printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
-
- require "table.inc";
- if (!is_int($info = mysql_get_proto_info($link)) || (0 === $info))
- printf("[003] Expecting int/any_non_empty, got %s/%s\n",
gettype($info), $info);
+include_once "connect.inc";
- print "done!";
+if (false !== ($tmp = @mysql_get_proto_info(NULL)))
+ printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
+
+require "table.inc";
+if (!is_int($info = mysql_get_proto_info($link)) || (0 === $info))
+ printf("[003] Expecting int/any_non_empty, got %s/%s\n",
gettype($info), $info);
+
+if (!is_int($info2 = mysql_get_proto_info()) || (0 === $info2))
+ printf("[004] Expecting int/any_non_empty, got %s/%s\n",
gettype($info2), $info2);
+
+assert($info === $info2);
+
+if (NULL !== ($tmp = @mysql_get_proto_info('too many', 'arguments')))
+ printf("[005] Expecting NULL got %s/%s\n", gettype($tmp), $tmp);
+
+print "done!";
?>
--EXPECTF--
done!
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
