uw Thu Jul 12 13:31:27 2007 UTC
Modified files:
/php-src/ext/mysql/tests mysql_stat.phpt
Log:
1) Whitespace/CS
2) Added check for default connection
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_stat.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_stat.phpt
diff -u php-src/ext/mysql/tests/mysql_stat.phpt:1.1
php-src/ext/mysql/tests/mysql_stat.phpt:1.2
--- php-src/ext/mysql/tests/mysql_stat.phpt:1.1 Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_stat.phpt Thu Jul 12 13:31:27 2007
@@ -4,35 +4,41 @@
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
- include_once "connect.inc";
+include_once "connect.inc";
- $dbname = 'test';
- $tmp = NULL;
- $link = NULL;
-
- if (!is_null($tmp = @mysql_stat($link)))
- printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- require('table.inc');
-
- if (!is_null($tmp = @mysql_stat($link, "foo")))
- printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- if ((!is_string($tmp = mysql_stat($link))) || ('' === $tmp))
- printf("[003] Expecting non empty string, got %s/'%s', [%d] %s\n",
- gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
-
- if (ini_get('unicode.semantics') && !is_unicode($tmp)) {
- printf("[004] Expecting Unicode error message!\n");
- var_inspect($tmp);
- }
-
- mysql_close($link);
-
- if (false !== ($tmp = mysql_stat($link)))
- printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
-
- print "done!";
+$dbname = 'test';
+$tmp = NULL;
+$link = NULL;
+
+if (!is_null($tmp = @mysql_stat($link)))
+ printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+
+if (!is_null($tmp = @mysql_stat($link, "foo")))
+ printf("[002] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if ((!is_string($stat = mysql_stat($link))) || ('' === $stat))
+ printf("[003] Expecting non empty string, got %s/'%s', [%d] %s\n",
+ gettype($stat), $stat, mysql_errno($link), mysql_error($link));
+
+if (ini_get('unicode.semantics') && !is_unicode($stat)) {
+ printf("[004] Expecting Unicode error message!\n");
+ var_inspect($stat);
+}
+
+if ((!is_string($stat_def = mysql_stat())) || ('' === $stat_def))
+ printf("[003] Expecting non empty string, got %s/'%s', [%d] %s\n",
+ gettype($stat_def), $stat_def, mysql_errno(), mysql_error());
+
+assert($stat === $stat_def);
+
+mysql_close($link);
+
+if (false !== ($tmp = mysql_stat($link)))
+ printf("[005] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
+
+print "done!";
?>
--EXPECTF--
Warning: mysql_stat(): %d is not a valid MySQL-Link resource in %s on line %d
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
