uw Thu Jul 12 13:44:00 2007 UTC Modified files: /php-src/ext/mysql/tests mysql_thread_id.phpt Log: 1) Whitespace/CS 2) Added test for default link http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/tests/mysql_thread_id.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/mysql/tests/mysql_thread_id.phpt diff -u php-src/ext/mysql/tests/mysql_thread_id.phpt:1.1 php-src/ext/mysql/tests/mysql_thread_id.phpt:1.2 --- php-src/ext/mysql/tests/mysql_thread_id.phpt:1.1 Sun Nov 19 12:14:44 2006 +++ php-src/ext/mysql/tests/mysql_thread_id.phpt Thu Jul 12 13:44:00 2007 @@ -4,27 +4,33 @@ <?php require_once('skipif.inc'); ?> --FILE-- <?php - include_once "connect.inc"; - - $tmp = NULL; - $link = NULL; - - if (!is_null($tmp = @mysql_thread_id($link))) - printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); - - require('table.inc'); - - if (!is_int($tmp = mysql_thread_id($link)) || (0 === $tmp)) - printf("[002] Expecting int/any but zero, got %s/%s. [%d] %s\n", - gettype($tmp), $tmp, mysql_errno($link), mysql_error($link)); - - mysql_close($link); - - if (false !== ($tmp = mysql_thread_id($link))) - printf("[003] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); - - print "done!"; +include_once "connect.inc"; + +$tmp = NULL; +$link = NULL; + +if (!is_null($tmp = @mysql_thread_id($link))) + printf("[001] Expecting NULL, got %s/%s\n", gettype($tmp), $tmp); + +require('table.inc'); + +if (!is_int($id = mysql_thread_id($link)) || (0 === $id)) + printf("[002] Expecting int/any but zero, got %s/%s. [%d] %s\n", + gettype($id), $id, mysql_errno($link), mysql_error($link)); + +if (!is_int($id_def = mysql_thread_id()) || (0 === $id_def)) + printf("[003] Expecting int/any but zero, got %s/%s. [%d] %s\n", + gettype($id_def), $id_def, mysql_errno(), mysql_error()); + +assert($id === $id_def); + +mysql_close($link); + +if (false !== ($tmp = mysql_thread_id($link))) + printf("[003] Expecting boolean/false, got %s/%s\n", gettype($tmp), $tmp); + +print "done!"; ?> --EXPECTF-- Warning: mysql_thread_id(): %d is not a valid MySQL-Link resource in %s on line %d -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