rdohms Sun, 19 Jul 2009 22:16:35 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=284390
Changed paths:
U
php/php-src/branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation3.phpt
U
php/php-src/branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation4.phpt
U php/php-src/trunk/ext/gd/tests/imagecolorallocate_variation3.phpt
Log:
Adjusting tests to use EXPECTF (faster testing) and adjusting 5_2 version to
lack of parameter validation
Modified:
php/php-src/branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation3.phpt
===================================================================
---
php/php-src/branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation3.phpt
2009-07-19 22:16:35 UTC (rev 284389)
+++
php/php-src/branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation3.phpt
2009-07-19 22:16:35 UTC (rev 284390)
@@ -55,8 +55,8 @@
// float data
'float 10.5' => 10.5,
'float -10.5' => -10.5,
- 'float 10.1234567e10' => 10.1234567e10,
- 'float 10.7654321E-10' => 10.7654321E-10,
+ 'float 10.1234567e5' => 10.1234567e5,
+ 'float 10.7654321E-5' => 10.7654321E-5,
'float .5' => .5,
// array data
@@ -114,10 +114,10 @@
--float -10.5--
int(652810)
---float 10.1234567e10--
-int(217143306)
+--float 10.1234567e5--
+int(259815690)
---float 10.7654321E-10--
+--float 10.7654321E-5--
int(655370)
--float .5--
Modified:
php/php-src/branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation4.phpt
===================================================================
---
php/php-src/branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation4.phpt
2009-07-19 22:16:35 UTC (rev 284389)
+++
php/php-src/branches/PHP_5_2/ext/gd/tests/imagecolorallocate_variation4.phpt
2009-07-19 22:16:35 UTC (rev 284390)
@@ -114,7 +114,7 @@
int(657910)
--float 10.1234567e10--
-bool(false)
+int(657919)
--float 10.7654321E-10--
int(657920)
Modified: php/php-src/trunk/ext/gd/tests/imagecolorallocate_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/gd/tests/imagecolorallocate_variation3.phpt
2009-07-19 22:16:35 UTC (rev 284389)
+++ php/php-src/trunk/ext/gd/tests/imagecolorallocate_variation3.phpt
2009-07-19 22:16:35 UTC (rev 284390)
@@ -55,8 +55,8 @@
// float data
'float 10.5' => 10.5,
'float -10.5' => -10.5,
- 'float 10.1234567e10' => 10.1234567e10,
- 'float 10.7654321E-10' => 10.7654321E-10,
+ 'float 10.1234567e5' => 10.1234567e5,
+ 'float 10.7654321E-5' => 10.7654321E-5,
'float .5' => .5,
// array data
@@ -105,110 +105,110 @@
};
?>
===DONE===
---EXPECTREGEX--
-\*\*\* Testing imagecolorallocate\(\) : usage variations \*\*\*
+--EXPECTF--
+*** Testing imagecolorallocate() : usage variations ***
--float 10.5--
-int\(657930\)
+int(657930)
--float -10.5--
-int\(652810\)
+int(652810)
---float 10.1234567e10--
-int\(655114\)|int\(217143306\)
+--float 10.1234567e5--
+int(259815690)
---float 10.7654321E-10--
-int\(655370\)
+--float 10.7654321E-5--
+int(655370)
--float .5--
-int\(655370\)
+int(655370)
--empty array--
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, array given in
(\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, array given in
%s on line %d
NULL
--int indexed array--
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, array given in
(\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, array given in
%s on line %d
NULL
--associative array--
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, array given in
(\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, array given in
%s on line %d
NULL
--nested arrays--
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, array given in
(\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, array given in
%s on line %d
NULL
--uppercase NULL--
-int\(655370\)
+int(655370)
--lowercase null--
-int\(655370\)
+int(655370)
--lowercase true--
-int\(655626\)
+int(655626)
--lowercase false--
-int\(655370\)
+int(655370)
--uppercase TRUE--
-int\(655626\)
+int(655626)
--uppercase FALSE--
-int\(655370\)
+int(655370)
--empty string DQ--
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, Unicode string
given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, Unicode string
given in %s on line %d
NULL
--empty string SQ--
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, Unicode string
given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, Unicode string
given in %s on line %d
NULL
--string DQ--
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, Unicode string
given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, Unicode string
given in %s on line %d
NULL
--string SQ--
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, Unicode string
given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, Unicode string
given in %s on line %d
NULL
--mixed case string--
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, Unicode string
given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, Unicode string
given in %s on line %d
NULL
--heredoc--
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, Unicode string
given in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, Unicode string
given in %s on line %d
NULL
--instance of classWithToString--
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, object given
in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, object given in
%s on line %d
NULL
--instance of classWithoutToString--
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, object given
in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, object given in
%s on line %d
NULL
--undefined var--
-int\(655370\)
+int(655370)
--unset var--
-int\(655370\)
+int(655370)
--file resource--
-Warning: imagecolorallocate\(\) expects parameter 3 to be long, resource given
in (\w*|\/|\.)* on line \d+
+Warning: imagecolorallocate() expects parameter 3 to be long, resource given
in %s on line %d
NULL
===DONE===
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
