rdohms                                   Fri, 24 Jul 2009 03:06:05 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=284678

Log:
Adding tests for imagesetthickness, basic and errors for both params, and 
complementing imagetruecolortopalette with out of bound params

Changed paths:
    A   php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_basic.phpt
    A   php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_error1.phpt
    A   php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_error2.phpt
    A   
php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_error4.phpt
    A   php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_basic.phpt
    A   php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_error1.phpt
    A   php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_error2.phpt
    A   
php/php-src/branches/PHP_5_3/ext/gd/tests/imagetruecolortopalette_error4.phpt
    A   php/php-src/trunk/ext/gd/tests/imagesetthickness_basic.phpt
    A   php/php-src/trunk/ext/gd/tests/imagesetthickness_error1.phpt
    A   php/php-src/trunk/ext/gd/tests/imagesetthickness_error2.phpt
    A   php/php-src/trunk/ext/gd/tests/imagetruecolortopalette_error4.phpt

Added: php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_basic.phpt	                        (rev 0)
+++ php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_basic.phpt	2009-07-24 03:06:05 UTC (rev 284678)
@@ -0,0 +1,34 @@
+--TEST--
+Testing imagetruecolortopalette() of GD library
+--CREDITS--
+Rafael Dohms <rdohms [at] gmail [dot] com>
+--SKIPIF--
+<?php
+	if (!extension_loaded("gd")) die("skip GD not present");
+	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
+?>
+--FILE--
+<?php
+// Create a 200x100 image
+$image = imagecreatetruecolor(200, 100);
+$white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
+$black = imagecolorallocate($image, 0x00, 0x00, 0x00);
+
+// Set the background to be white
+imagefilledrectangle($image, 0, 0, 299, 99, $white);
+
+// Set the line thickness to 5
+imagesetthickness($image, 5);
+
+// Draw the rectangle
+imagerectangle($image, 14, 14, 185, 85, $black);
+
+ob_start();
+imagepng($image, null, 9);
+$img = ob_get_contents();
+ob_end_clean();
+
+echo md5(base64_encode($img));
+?>
+--EXPECT--
+93c3077f1bdc372cd0b0db96db282985
\ No newline at end of file

Added: php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_error1.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_error1.phpt	                        (rev 0)
+++ php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_error1.phpt	2009-07-24 03:06:05 UTC (rev 284678)
@@ -0,0 +1,22 @@
+--TEST--
+Testing imagetruecolortopalette(): wrong types for first parameter
+--CREDITS--
+Rafael Dohms <rdohms [at] gmail [dot] com>
+--SKIPIF--
+<?php
+	if (!extension_loaded("gd")) die("skip GD not present");
+?>
+--FILE--
+<?php
+$resource = tmpfile();
+
+imagesetthickness('string', 5);
+imagesetthickness(array(), 5);
+imagesetthickness($resource, 5);
+?>
+--EXPECTF--
+Warning: imagesetthickness(): supplied argument is not a valid Image resource in %s on line %d
+
+Warning: imagesetthickness(): supplied argument is not a valid Image resource in %s on line %d
+
+Warning: imagesetthickness(): supplied resource is not a valid Image resource in %s on line %d
\ No newline at end of file

Added: php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_error2.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_error2.phpt	                        (rev 0)
+++ php/php-src/branches/PHP_5_2/ext/gd/tests/imagesetthickness_error2.phpt	2009-07-24 03:06:05 UTC (rev 284678)
@@ -0,0 +1,24 @@
+--TEST--
+Testing imagetruecolortopalette(): wrong types for second parameter
+--CREDITS--
+Rafael Dohms <rdohms [at] gmail [dot] com>
+--SKIPIF--
+<?php
+	if (!extension_loaded("gd")) die("skip GD not present");
+	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
+?>
+--FILE--
+<?php
+$image = imagecreatetruecolor(200, 100);
+
+$a = imagesetthickness($image, 's');
+$b = imagesetthickness($image, array());
+$c = imagesetthickness($image, $image);
+
+var_dump($a, $b, $c);
+//All should be true because 5,2 does not check parameters
+?>
+--EXPECTF--
+bool(true)
+bool(true)
+bool(true)
\ No newline at end of file

Added: php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_error4.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_error4.phpt	                        (rev 0)
+++ php/php-src/branches/PHP_5_2/ext/gd/tests/imagetruecolortopalette_error4.phpt	2009-07-24 03:06:05 UTC (rev 284678)
@@ -0,0 +1,21 @@
+--TEST--
+Testing imagetruecolortopalette(): out of range parameter 3
+--CREDITS--
+Rafael Dohms <rdohms [at] gmail [dot] com>
+--SKIPIF--
+<?php
+	if (!extension_loaded("gd")) die("skip GD not present");
+	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
+?>
+--FILE--
+<?php
+$image = imagecreatetruecolor(50, 50);
+
+imagetruecolortopalette($image, true, 0);
+imagetruecolortopalette($image, true, -1);
+
+?>
+--EXPECTF--
+Warning: imagetruecolortopalette(): Number of colors has to be greater than zero in %s on line %d
+
+Warning: imagetruecolortopalette(): Number of colors has to be greater than zero in %s on line %d
\ No newline at end of file

Added: php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_basic.phpt	                        (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_basic.phpt	2009-07-24 03:06:05 UTC (rev 284678)
@@ -0,0 +1,34 @@
+--TEST--
+Testing imagetruecolortopalette() of GD library
+--CREDITS--
+Rafael Dohms <rdohms [at] gmail [dot] com>
+--SKIPIF--
+<?php
+	if (!extension_loaded("gd")) die("skip GD not present");
+	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
+?>
+--FILE--
+<?php
+// Create a 200x100 image
+$image = imagecreatetruecolor(200, 100);
+$white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
+$black = imagecolorallocate($image, 0x00, 0x00, 0x00);
+
+// Set the background to be white
+imagefilledrectangle($image, 0, 0, 299, 99, $white);
+
+// Set the line thickness to 5
+imagesetthickness($image, 5);
+
+// Draw the rectangle
+imagerectangle($image, 14, 14, 185, 85, $black);
+
+ob_start();
+imagepng($image, null, 9);
+$img = ob_get_contents();
+ob_end_clean();
+
+echo md5(base64_encode($img));
+?>
+--EXPECT--
+93c3077f1bdc372cd0b0db96db282985
\ No newline at end of file

Added: php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_error1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_error1.phpt	                        (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_error1.phpt	2009-07-24 03:06:05 UTC (rev 284678)
@@ -0,0 +1,22 @@
+--TEST--
+Testing imagetruecolortopalette(): wrong types for first parameter
+--CREDITS--
+Rafael Dohms <rdohms [at] gmail [dot] com>
+--SKIPIF--
+<?php
+	if (!extension_loaded("gd")) die("skip GD not present");
+?>
+--FILE--
+<?php
+$resource = tmpfile();
+
+imagesetthickness('string', 5);
+imagesetthickness(array(), 5);
+imagesetthickness($resource, 5);
+?>
+--EXPECTF--
+Warning: imagesetthickness() expects parameter 1 to be resource, %s given in %s on line %d
+
+Warning: imagesetthickness() expects parameter 1 to be resource, array given in %s on line %d
+
+Warning: imagesetthickness(): supplied resource is not a valid Image resource in %s on line %d
\ No newline at end of file

Added: php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_error2.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_error2.phpt	                        (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/gd/tests/imagesetthickness_error2.phpt	2009-07-24 03:06:05 UTC (rev 284678)
@@ -0,0 +1,24 @@
+--TEST--
+Testing imagetruecolortopalette(): wrong types for second parameter
+--CREDITS--
+Rafael Dohms <rdohms [at] gmail [dot] com>
+--SKIPIF--
+<?php
+	if (!extension_loaded("gd")) die("skip GD not present");
+	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
+?>
+--FILE--
+<?php
+$image = imagecreatetruecolor(200, 100);
+
+imagesetthickness($image, 's');
+imagesetthickness($image, array());
+imagesetthickness($image, $image);
+
+?>
+--EXPECTF--
+Warning: imagesetthickness() expects parameter 2 to be long, string given in %s on line %d
+
+Warning: imagesetthickness() expects parameter 2 to be long, array given in %s on line %d
+
+Warning: imagesetthickness() expects parameter 2 to be long, resource given in %s on line %d
\ No newline at end of file

Added: php/php-src/branches/PHP_5_3/ext/gd/tests/imagetruecolortopalette_error4.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/gd/tests/imagetruecolortopalette_error4.phpt	                        (rev 0)
+++ php/php-src/branches/PHP_5_3/ext/gd/tests/imagetruecolortopalette_error4.phpt	2009-07-24 03:06:05 UTC (rev 284678)
@@ -0,0 +1,21 @@
+--TEST--
+Testing imagetruecolortopalette(): out of range parameter 3
+--CREDITS--
+Rafael Dohms <rdohms [at] gmail [dot] com>
+--SKIPIF--
+<?php
+	if (!extension_loaded("gd")) die("skip GD not present");
+	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
+?>
+--FILE--
+<?php
+$image = imagecreatetruecolor(50, 50);
+
+imagetruecolortopalette($image, true, 0);
+imagetruecolortopalette($image, true, -1);
+
+?>
+--EXPECTF--
+Warning: imagetruecolortopalette(): Number of colors has to be greater than zero in %s on line %d
+
+Warning: imagetruecolortopalette(): Number of colors has to be greater than zero in %s on line %d
\ No newline at end of file

Added: php/php-src/trunk/ext/gd/tests/imagesetthickness_basic.phpt
===================================================================
--- php/php-src/trunk/ext/gd/tests/imagesetthickness_basic.phpt	                        (rev 0)
+++ php/php-src/trunk/ext/gd/tests/imagesetthickness_basic.phpt	2009-07-24 03:06:05 UTC (rev 284678)
@@ -0,0 +1,34 @@
+--TEST--
+Testing imagetruecolortopalette() of GD library
+--CREDITS--
+Rafael Dohms <rdohms [at] gmail [dot] com>
+--SKIPIF--
+<?php
+	if (!extension_loaded("gd")) die("skip GD not present");
+	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
+?>
+--FILE--
+<?php
+// Create a 200x100 image
+$image = imagecreatetruecolor(200, 100);
+$white = imagecolorallocate($image, 0xFF, 0xFF, 0xFF);
+$black = imagecolorallocate($image, 0x00, 0x00, 0x00);
+
+// Set the background to be white
+imagefilledrectangle($image, 0, 0, 299, 99, $white);
+
+// Set the line thickness to 5
+imagesetthickness($image, 5);
+
+// Draw the rectangle
+imagerectangle($image, 14, 14, 185, 85, $black);
+
+ob_start();
+imagepng($image, null, 9);
+$img = ob_get_contents();
+ob_end_clean();
+
+echo md5(base64_encode($img));
+?>
+--EXPECT--
+93c3077f1bdc372cd0b0db96db282985
\ No newline at end of file

Added: php/php-src/trunk/ext/gd/tests/imagesetthickness_error1.phpt
===================================================================
--- php/php-src/trunk/ext/gd/tests/imagesetthickness_error1.phpt	                        (rev 0)
+++ php/php-src/trunk/ext/gd/tests/imagesetthickness_error1.phpt	2009-07-24 03:06:05 UTC (rev 284678)
@@ -0,0 +1,22 @@
+--TEST--
+Testing imagetruecolortopalette(): wrong types for first parameter
+--CREDITS--
+Rafael Dohms <rdohms [at] gmail [dot] com>
+--SKIPIF--
+<?php
+	if (!extension_loaded("gd")) die("skip GD not present");
+?>
+--FILE--
+<?php
+$resource = tmpfile();
+
+imagesetthickness('string', 5);
+imagesetthickness(array(), 5);
+imagesetthickness($resource, 5);
+?>
+--EXPECTF--
+Warning: imagesetthickness() expects parameter 1 to be resource, %s given in %s on line %d
+
+Warning: imagesetthickness() expects parameter 1 to be resource, array given in %s on line %d
+
+Warning: imagesetthickness(): supplied resource is not a valid Image resource in %s on line %d
\ No newline at end of file

Added: php/php-src/trunk/ext/gd/tests/imagesetthickness_error2.phpt
===================================================================
--- php/php-src/trunk/ext/gd/tests/imagesetthickness_error2.phpt	                        (rev 0)
+++ php/php-src/trunk/ext/gd/tests/imagesetthickness_error2.phpt	2009-07-24 03:06:05 UTC (rev 284678)
@@ -0,0 +1,24 @@
+--TEST--
+Testing imagetruecolortopalette(): wrong types for second parameter
+--CREDITS--
+Rafael Dohms <rdohms [at] gmail [dot] com>
+--SKIPIF--
+<?php
+	if (!extension_loaded("gd")) die("skip GD not present");
+	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
+?>
+--FILE--
+<?php
+$image = imagecreatetruecolor(200, 100);
+
+imagesetthickness($image, 's');
+imagesetthickness($image, array());
+imagesetthickness($image, $image);
+
+?>
+--EXPECTF--
+Warning: imagesetthickness() expects parameter 2 to be long, Unicode string given in %s on line %d
+
+Warning: imagesetthickness() expects parameter 2 to be long, array given in %s on line %d
+
+Warning: imagesetthickness() expects parameter 2 to be long, resource given in %s on line %d
\ No newline at end of file

Added: php/php-src/trunk/ext/gd/tests/imagetruecolortopalette_error4.phpt
===================================================================
--- php/php-src/trunk/ext/gd/tests/imagetruecolortopalette_error4.phpt	                        (rev 0)
+++ php/php-src/trunk/ext/gd/tests/imagetruecolortopalette_error4.phpt	2009-07-24 03:06:05 UTC (rev 284678)
@@ -0,0 +1,21 @@
+--TEST--
+Testing imagetruecolortopalette(): out of range parameter 3
+--CREDITS--
+Rafael Dohms <rdohms [at] gmail [dot] com>
+--SKIPIF--
+<?php
+	if (!extension_loaded("gd")) die("skip GD not present");
+	if (!function_exists("imagecreatetruecolor")) die("skip GD Version not compatible");
+?>
+--FILE--
+<?php
+$image = imagecreatetruecolor(50, 50);
+
+imagetruecolortopalette($image, true, 0);
+imagetruecolortopalette($image, true, -1);
+
+?>
+--EXPECTF--
+Warning: imagetruecolortopalette(): Number of colors has to be greater than zero in %s on line %d
+
+Warning: imagetruecolortopalette(): Number of colors has to be greater than zero in %s on line %d
\ No newline at end of file
-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to