From 3d7b3c8bb24416faa82723b30166846baf271eda Mon Sep 17 00:00:00 2001
From: Felipe Pena <felipe@php.net>
Date: Wed, 1 Jul 2009 02:32:55 +0000
Subject: [PATCH] - Fixed tests

---
 ext/gd/tests/jpeg2wbmp_error1.phpt | 14 +++++++++-----
 ext/gd/tests/jpeg2wbmp_error2.phpt | 11 ++++++-----
 ext/gd/tests/jpeg2wbmp_error3.phpt | 14 ++++++++------
 ext/gd/tests/png2wbmp_error1.phpt  | 14 +++++++++-----
 ext/gd/tests/png2wbmp_error2.phpt  | 11 ++++++-----
 ext/gd/tests/png2wbmp_error3.phpt  | 14 ++++++++------
 6 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/ext/gd/tests/jpeg2wbmp_error1.phpt b/ext/gd/tests/jpeg2wbmp_error1.phpt
index 6ab0b055b6..b6514de8ba 100755
--- a/ext/gd/tests/jpeg2wbmp_error1.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error1.phpt
@@ -19,14 +19,17 @@ $im = imagecreatetruecolor(120, 20);
 $text_color = imagecolorallocate($im, 255, 255, 255);
 imagestring($im, 1, 5, 5,  'A Simple Text String', $text_color);
 
+$file = dirname(__FILE__) .'/simpletext.jpg';
+$file2 = dirname(__FILE__) .'/simpletext.wbmp';
+
 // Save the image as 'simpletext.jpg'
-imagejpeg($im, 'simpletext.jpg');
+imagejpeg($im, $file);
 
 // Free up memory
 imagedestroy($im);
 
-jpeg2wbmp('simpletext.jpg', 'simpletext.wbmp', 20, 120, 9);
-jpeg2wbmp('simpletext.jpg', 'simpletext.wbmp', 20, 120, -1);
+jpeg2wbmp($file, $file2, 20, 120, 9);
+jpeg2wbmp($file', $file2, 20, 120, -1);
 ?>
 --EXPECTF--
 Warning: jpeg2wbmp(): Invalid threshold value '9' in %s on line %d
@@ -34,5 +37,6 @@ Warning: jpeg2wbmp(): Invalid threshold value '9' in %s on line %d
 Warning: jpeg2wbmp(): Invalid threshold value '-1' in %s on line %d
 --CLEAN--
 <?php
-unlink('simpletext.jpg');
-?>
\ No newline at end of file
+unlink(dirname(__FILE__) .'/simpletext.jpg');
+unlink(dirname(__FILE__) .'/simpletext.wbmp');
+?>
diff --git a/ext/gd/tests/jpeg2wbmp_error2.phpt b/ext/gd/tests/jpeg2wbmp_error2.phpt
index 23a4162ce5..692dcb842d 100755
--- a/ext/gd/tests/jpeg2wbmp_error2.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error2.phpt
@@ -14,9 +14,10 @@ if(!function_exists('jpeg2wbmp')) {
 ?>
 --FILE--
 <?php
-jpeg2wbmp('', 'simpletext.wbmp', 20, 120, 8);
-jpeg2wbmp(null, 'simpletext.wbmp', 20, 120, 8);
-jpeg2wbmp(false, 'simpletext.wbmp', 20, 120, 8);
+$file = dirname(__FILE__) .'/simpletext.wbmp';
+jpeg2wbmp('', $file, 20, 120, 8);
+jpeg2wbmp(null, $file, 20, 120, 8);
+jpeg2wbmp(false, $file, 20, 120, 8);
 ?>
 --EXPECTF--
 Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
@@ -26,5 +27,5 @@ Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
 Warning: jpeg2wbmp(): Unable to open '' for reading in %s on line %d
 --CLEAN--
 <?php
-unlink('simpletext.jpg');
-?>
\ No newline at end of file
+unlink(dirname(__FILE__) .'/simpletext.wbmp');
+?>
diff --git a/ext/gd/tests/jpeg2wbmp_error3.phpt b/ext/gd/tests/jpeg2wbmp_error3.phpt
index 2cf0beceaa..df436c8cc3 100755
--- a/ext/gd/tests/jpeg2wbmp_error3.phpt
+++ b/ext/gd/tests/jpeg2wbmp_error3.phpt
@@ -19,15 +19,17 @@ $im = imagecreatetruecolor(120, 20);
 $text_color = imagecolorallocate($im, 255, 255, 255);
 imagestring($im, 1, 5, 5,  'A Simple Text String', $text_color);
 
+$file = dirname(__FILE__) .'/simpletext.jpg';
+
 // Save the image as 'simpletext.jpg'
-imagejpeg($im, 'simpletext.jpg');
+imagejpeg($im, $file);
 
 // Free up memory
 imagedestroy($im);
 
-jpeg2wbmp('simpletext.jpg', '', 20, 120, 8);
-jpeg2wbmp('simpletext.jpg', null, 20, 120, 8);
-jpeg2wbmp('simpletext.jpg', false, 20, 120, 8);
+jpeg2wbmp($file, '', 20, 120, 8);
+jpeg2wbmp($file, null, 20, 120, 8);
+jpeg2wbmp($file, false, 20, 120, 8);
 ?>
 --EXPECTF--
 Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d
@@ -37,5 +39,5 @@ Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d
 Warning: jpeg2wbmp(): Unable to open '' for writing in %s on line %d
 --CLEAN--
 <?php
-unlink('simpletext.jpg');
-?>
\ No newline at end of file
+unlink(dirname(__FILE__) .'/simpletext.jpg');
+?>
diff --git a/ext/gd/tests/png2wbmp_error1.phpt b/ext/gd/tests/png2wbmp_error1.phpt
index edb5b935c7..1e9d717d94 100755
--- a/ext/gd/tests/png2wbmp_error1.phpt
+++ b/ext/gd/tests/png2wbmp_error1.phpt
@@ -19,14 +19,17 @@ $im = imagecreatetruecolor(120, 20);
 $text_color = imagecolorallocate($im, 255, 255, 255);
 imagestring($im, 1, 5, 5,  'A Simple Text String', $text_color);
 
+$file = dirname(__FILE__) .'/simpletext.png';
+$file2 = dirname(__FILE__) .'/simpletext.wbmp';
+
 // Save the image as 'simpletext.png'
-imagepng($im, 'simpletext.png');
+imagepng($im, $file);
 
 // Free up memory
 imagedestroy($im);
 
-png2wbmp('simpletext.png', 'simpletext.wbmp', 20, 120, 9);
-png2wbmp('simpletext.png', 'simpletext.wbmp', 20, 120, -1);
+png2wbmp($file, $file2, 20, 120, 9);
+png2wbmp($file, $file2, 20, 120, -1);
 ?>
 --EXPECTF--
 Warning: png2wbmp(): Invalid threshold value '9' in %s on line %d
@@ -34,5 +37,6 @@ Warning: png2wbmp(): Invalid threshold value '9' in %s on line %d
 Warning: png2wbmp(): Invalid threshold value '-1' in %s on line %d
 --CLEAN--
 <?php
-unlink('simpletext.png');
-?>
\ No newline at end of file
+unlink(dirname(__FILE__) .'/simpletext.png');
+unlink(dirname(__FILE__) .'/simpletext.wbmp');
+?>
diff --git a/ext/gd/tests/png2wbmp_error2.phpt b/ext/gd/tests/png2wbmp_error2.phpt
index 248ed6e13c..ba8e43e7f0 100755
--- a/ext/gd/tests/png2wbmp_error2.phpt
+++ b/ext/gd/tests/png2wbmp_error2.phpt
@@ -14,9 +14,10 @@ if(!function_exists('png2wbmp')) {
 ?>
 --FILE--
 <?php
-png2wbmp('', 'simpletext.wbmp', 20, 120, 8);
-png2wbmp(null, 'simpletext.wbmp', 20, 120, 8);
-png2wbmp(false, 'simpletext.wbmp', 20, 120, 8);
+$file = dirname(__FILE__) .'/simpletext.wbmp';
+png2wbmp('', $file, 20, 120, 8);
+png2wbmp(null, $file, 20, 120, 8);
+png2wbmp(false, $file, 20, 120, 8);
 ?>
 --EXPECTF--
 Warning: png2wbmp(): Unable to open '' for reading in %s on line %d
@@ -26,5 +27,5 @@ Warning: png2wbmp(): Unable to open '' for reading in %s on line %d
 Warning: png2wbmp(): Unable to open '' for reading in %s on line %d
 --CLEAN--
 <?php
-unlink('simpletext.jpg');
-?>
\ No newline at end of file
+unlink(dirname(__FILE__) .'/simpletext.wbmp');
+?>
diff --git a/ext/gd/tests/png2wbmp_error3.phpt b/ext/gd/tests/png2wbmp_error3.phpt
index 45eb05b041..1e33f59b18 100755
--- a/ext/gd/tests/png2wbmp_error3.phpt
+++ b/ext/gd/tests/png2wbmp_error3.phpt
@@ -19,15 +19,17 @@ $im = imagecreatetruecolor(120, 20);
 $text_color = imagecolorallocate($im, 255, 255, 255);
 imagestring($im, 1, 5, 5,  'A Simple Text String', $text_color);
 
+$file = dirname(__FILE__) .'/simpletext.png';
+
 // Save the image as 'simpletext.png'
-imagepng($im, 'simpletext.png');
+imagepng($im, $file);
 
 // Free up memory
 imagedestroy($im);
 
-png2wbmp('simpletext.png', '', 20, 120, 8);
-png2wbmp('simpletext.png', null, 20, 120, 8);
-png2wbmp('simpletext.png', false, 20, 120, 8);
+png2wbmp($file, '', 20, 120, 8);
+png2wbmp($file, null, 20, 120, 8);
+png2wbmp($file, false, 20, 120, 8);
 ?>
 --EXPECTF--
 Warning: png2wbmp(): Unable to open '' for writing in %s on line %d
@@ -37,5 +39,5 @@ Warning: png2wbmp(): Unable to open '' for writing in %s on line %d
 Warning: png2wbmp(): Unable to open '' for writing in %s on line %d
 --CLEAN--
 <?php
-unlink('simpletext.png');
-?>
\ No newline at end of file
+unlink(dirname(__FILE__) .'/simpletext.png');
+?>
-- 
2.50.0