uw Wed Jul 11 12:47:23 2007 UTC
Modified files:
/php-src/ext/mysql/tests mysql_db_name.phpt mysql_drop_db.phpt
Log:
Those two should be whitespace / coding standards only. However, in some of
my commit messages I might be wrong, it's hard to say what we added to the
tests and I might miss this or that little detail, although I check the diff
before commit.
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_db_name.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_db_name.phpt
diff -u php-src/ext/mysql/tests/mysql_db_name.phpt:1.1
php-src/ext/mysql/tests/mysql_db_name.phpt:1.2
--- php-src/ext/mysql/tests/mysql_db_name.phpt:1.1 Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_db_name.phpt Wed Jul 11 12:47:23 2007
@@ -4,57 +4,55 @@
<?php require_once('skipif.inc'); ?>
--FILE--
<?php
- include "connect.inc";
+include "connect.inc";
- $tmp = NULL;
- $link = NULL;
-
- if (NULL !== ($tmp = @mysql_db_name()))
- printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- if (false !== ($tmp = @mysql_db_name($link, $link)))
- printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
-
- require('table.inc');
-
- if (!$res = mysql_list_dbs($link))
- printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
-
- if (!$num = mysql_num_rows($res))
- printf("[004] Empty database list? [%d] %s\n", mysql_errno($link),
mysql_error($link));
-
- if (false !== ($tmp = mysql_db_name($res, -1)))
- printf("[005] Expecting boolean/false, got %s/%s. [%d] %s\n",
- gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
-
- if (false !== ($tmp = mysql_db_name($res, $num + 1)))
- printf("[006] Expecting boolean/false, got %s/%s. [%d] %s\n",
- gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
-
- $unicode = (boolean)ini_get('unicode.semantics');
- for ($i = 0; $i < $num; $i++) {
-
- if ('' === ($dbname = mysql_db_name($res, $i)))
- printf("[%03d] Got empty database name! [%d] %s\n",
- (($i * 2) + 1) + 6, mysql_errno($link), mysql_error($link));
-
- if ($unicode && !is_unicode($dbname)) {
- printf("[%03d] Expecting unicode string! [%d] %s\n",
- (($i * 2) + 2) + 6, mysql_errno($link), mysql_error($link));
- var_inspect($dbname);
- }
-
- }
-
- mysql_free_result($res);
-
- if (false !== ($tmp = mysql_db_name($res, $num)))
- printf("[999] Expecting boolean/false, got %s/%s. [%d] %s\n",
- gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
-
- mysql_close($link);
-
- print "done!\n";
+$tmp = NULL;
+$link = NULL;
+
+if (NULL !== ($tmp = @mysql_db_name()))
+ printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+if (false !== ($tmp = @mysql_db_name($link, $link)))
+ printf("[002] Expecting boolean/false, got %s/%s\n", gettype($tmp),
$tmp);
+
+require('table.inc');
+
+if (!$res = mysql_list_dbs($link))
+ printf("[003] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!$num = mysql_num_rows($res))
+ printf("[004] Empty database list? [%d] %s\n", mysql_errno($link),
mysql_error($link));
+
+if (false !== ($tmp = mysql_db_name($res, -1)))
+ printf("[005] Expecting boolean/false, got %s/%s. [%d] %s\n",
+ gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+
+if (false !== ($tmp = mysql_db_name($res, $num + 1)))
+ printf("[006] Expecting boolean/false, got %s/%s. [%d] %s\n",
+ gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+
+$unicode = (boolean)ini_get('unicode.semantics');
+for ($i = 0; $i < $num; $i++) {
+ if ('' === ($dbname = mysql_db_name($res, $i)))
+ printf("[%03d] Got empty database name! [%d] %s\n",
+ (($i * 2) + 1) + 6, mysql_errno($link),
mysql_error($link));
+
+ if ($unicode && !is_unicode($dbname)) {
+ printf("[%03d] Expecting unicode string! [%d] %s\n",
+ (($i * 2) + 2) + 6, mysql_errno($link),
mysql_error($link));
+ var_inspect($dbname);
+ }
+}
+
+mysql_free_result($res);
+
+if (false !== ($tmp = mysql_db_name($res, $num)))
+ printf("[999] Expecting boolean/false, got %s/%s. [%d] %s\n",
+ gettype($tmp), $tmp, mysql_errno($link), mysql_error($link));
+
+mysql_close($link);
+
+print "done!\n";
?>
--EXPECTF--
Warning: mysql_db_name(): Unable to jump to row -1 on MySQL result index %d in
%s on line %d
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_drop_db.phpt?r1=1.1&r2=1.2&diff_format=u
Index: php-src/ext/mysql/tests/mysql_drop_db.phpt
diff -u php-src/ext/mysql/tests/mysql_drop_db.phpt:1.1
php-src/ext/mysql/tests/mysql_drop_db.phpt:1.2
--- php-src/ext/mysql/tests/mysql_drop_db.phpt:1.1 Sun Nov 19 12:14:44 2006
+++ php-src/ext/mysql/tests/mysql_drop_db.phpt Wed Jul 11 12:47:23 2007
@@ -1,43 +1,43 @@
--TEST--
mysql_drop_db()
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
if (!function_exists('mysql_drop_db'))
- die("Skip function is deprecated and not available");
+ die("Skip function is deprecated and not available");
?>
--FILE--
<?php
- include_once "connect.inc";
+include_once "connect.inc";
+
+$tmp = NULL;
+$link = NULL;
+
+// NOTE: again this test does not test all of the behaviour of the function
+
+if (NULL !== ($tmp = mysql_drop_db()))
+ printf("[001] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp);
+
+require('table.inc');
+if (!mysql_query('DROP DATABASE IF EXISTS mysqldropdb'))
+ printf("[004] [%d] %s\n", mysql_errno($link), mysql_error($link));
+
+if (!mysql_query('CREATE DATABASE mysqldropdb'))
+ die(sprintf("[005] Skipping, can't create test database. [%d] %s\n",
mysql_errno($link), mysql_error($link)));
+
+if (true !== ($tmp = mysql_drop_db('mysqldropdb', $link)))
+ printf("[006] Can't drop, got %s/%s. [%d] %s\n",
+ gettype($tmp), $tmp,
+ mysql_errno($link), mysql_error($link));
+
+if (false !== ($tmp = mysql_drop_db('mysqldropdb', $link)))
+ printf("[007] Expecting boolean/false, got %s/%s. [%d] %s\n",
+ gettype($tmp), $tmp,
+ mysql_errno($link), mysql_error($link));
- $tmp = NULL;
- $link = NULL;
-
- // NOTE: again this test does not test all of the behaviour of the function
-
- if (NULL !== ($tmp = mysql_drop_db()))
- printf("[001] Expecting NULL/NULL, got %s/%s\n", gettype($tmp), $tmp);
-
- require('table.inc');
- if (!mysql_query('DROP DATABASE IF EXISTS mysqldropdb'))
- printf("[004] [%d] %s\n", mysql_errno($link), mysql_error($link));
-
- if (!mysql_query('CREATE DATABASE mysqldropdb'))
- die(sprintf("[005] Skipping, can't create test database. [%d] %s\n",
mysql_errno($link), mysql_error($link)));
-
- if (true !== ($tmp = mysql_drop_db('mysqldropdb', $link)))
- printf("[006] Can't drop, got %s/%s. [%d] %s\n",
- gettype($tmp), $tmp,
- mysql_errno($link), mysql_error($link));
-
- if (false !== ($tmp = mysql_drop_db('mysqldropdb', $link)))
- printf("[007] Expecting boolean/false, got %s/%s. [%d] %s\n",
- gettype($tmp), $tmp,
- mysql_errno($link), mysql_error($link));
-
- mysql_close($link);
+mysql_close($link);
- print "done!\n";
+print "done!\n";
?>
--EXPECTF--
-done!
+done!
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
