cvs: php-src /ext/gd/tests bug44849.phpt imagecolorclosesthwb.phpt

tony2001 Wed Jul 30 09:57:56 2008 UTC Modified files: /php-src/ext/gd/tests bug44849.phpt imagecolorclosesthwb.phpt Log: fix tests http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/bug44849.phpt?r1=1.2&r2=1.3&diff_format=u Index: php-src/ext/gd/tests/bug44849.phpt diff -u php-src/ext/gd/tests/bug44849.phpt:1.2 php-src/ext/gd/tests/bug44849.phpt:1.3 --- php-src/ext/gd/tests/bug44849.phpt:1.2 Wed Jul 30 01:38:37 2008 +++ php-src/ext/gd/tests/bug44849.phpt Wed Jul 30 09:57:55 2008 @@ -2,8 +2,7 @@ Bug #44849 (imagecolorclosesthwb is not available on Windows) --SKIPIF-- <?php - if(!extension_loaded('gd')){ die('skip: gd extension not available'); } - if(strtoupper(substr(PHP_OS, 0, 3)) != 'WIN'){ die('skip: not a Windows operating system'); } + if(!extension_loaded('gd')){ die('skip gd extension not available'); } ?> --FILE-- <?php http://cvs.php.net/viewvc.cgi/php-src/ext/gd/tests/imagecolorclosesthwb.phpt?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/gd/tests/imagecolorclosesthwb.phpt diff -u php-src/ext/gd/tests/imagecolorclosesthwb.phpt:1.1 php-src/ext/gd/tests/imagecolorclosesthwb.phpt:1.2 --- php-src/ext/gd/tests/imagecolorclosesthwb.phpt:1.1 Wed Jul 30 04:35:21 2008 +++ php-src/ext/gd/tests/imagecolorclosesthwb.phpt Wed Jul 30 09:57:55 2008 @@ -7,21 +7,24 @@ ?> --FILE-- <?php - $im = imagecreatefrompng('test.png'); + $im = imagecreatefrompng(dirname(__FILE__).'/test.png'); - echo imagecolorclosesthwb($im, 255, 50, 0); + var_dump(imagecolorclosesthwb($im, 255, 50, 0)); - imagecolorclosesthwb(NULL); - imagecolorclosesthwb(NULL, NULL, NULL, NULL); - imagecolorclosesthwb($im, "hello", "from", "gd"); + var_dump(imagecolorclosesthwb(NULL)); + var_dump(imagecolorclosesthwb(NULL, NULL, NULL, NULL)); + var_dump(imagecolorclosesthwb($im, "hello", "from", "gd")); imagedestroy($im); ?> --EXPECTF-- -16724480 +int(16724480) -Warning: imagecolorclosesthwb\(\) expects exactly 4 parameters, 1 given in .* code on line \d+ +Warning: imagecolorclosesthwb() expects exactly 4 parameters, 1 given in %s on line %d +NULL -Warning: imagecolorclosesthwb\(\) expects parameter 1 to be resource, null given in .* code on line \d+ +Warning: imagecolorclosesthwb() expects parameter 1 to be resource, null given in %s on line %d +NULL -Warning: imagecolorclosesthwb\(\) expects parameter 2 to be long, string given in .* code on line \d+ \ No newline at end of file +Warning: imagecolorclosesthwb() expects parameter 2 to be long, string given in %s on line %d +NULL