diff options
21 files changed, 34 insertions, 94 deletions
diff --git a/ext/standard/tests/strings/fprintf_variation_001.phpt b/ext/standard/tests/strings/fprintf_variation_001.phpt index 3a935107a7..df81c249b6 100644 --- a/ext/standard/tests/strings/fprintf_variation_001.phpt +++ b/ext/standard/tests/strings/fprintf_variation_001.phpt @@ -1,12 +1,5 @@ --TEST-- Test fprintf() function (variation - 1) ---SKIPIF-- -<?php -$data_file = dirname(__FILE__) . '/dump.txt'; -if (!($fp = fopen($data_file, 'w'))) { - die('skip File dump.txt could not be created'); -} -?> --FILE-- <?php @@ -14,7 +7,7 @@ $float_variation = array( "%f","%-f", "%+f", "%7.2f", "%-7.2f", "%07.2f", "%-07. $float_numbers = array( 0, 1, -1, 0.32, -0.32, 3.4. -3.4, 2.54, -2.54 ); /* creating dumping file */ -$data_file = dirname(__FILE__) . '/dump.txt'; +$data_file = dirname(__FILE__) . '/fprintf_variation_001.txt'; if (!($fp = fopen($data_file, 'wt'))) return; diff --git a/ext/standard/tests/strings/fprintf_variation_002.phpt b/ext/standard/tests/strings/fprintf_variation_002.phpt index 49e62e2b74..1cc1a4ddd7 100644 --- a/ext/standard/tests/strings/fprintf_variation_002.phpt +++ b/ext/standard/tests/strings/fprintf_variation_002.phpt @@ -1,12 +1,5 @@ --TEST-- Test fprintf() function (variation - 2) ---SKIPIF-- -<?php -$data_file = dirname(__FILE__) . '/dump.txt'; -if (!($fp = fopen($data_file, 'w'))) { - die('skip File dump.txt could not be created'); -} -?> --FILE-- <?php @@ -14,7 +7,7 @@ $int_variation = array( "%d", "%-d", "%+d", "%7.2d", "%-7.2d", "%07.2d", "%-07.2 $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" ); /* creating dumping file */ -$data_file = dirname(__FILE__) . '/dump.txt'; +$data_file = dirname(__FILE__) . '/fprintf_variation_002.txt'; if (!($fp = fopen($data_file, 'wt'))) return; diff --git a/ext/standard/tests/strings/fprintf_variation_003.phpt b/ext/standard/tests/strings/fprintf_variation_003.phpt index b4860879b0..1e8eb4706f 100644 --- a/ext/standard/tests/strings/fprintf_variation_003.phpt +++ b/ext/standard/tests/strings/fprintf_variation_003.phpt @@ -2,10 +2,6 @@ Test fprintf() function (variation - 3) --SKIPIF-- <?php -$data_file = dirname(__FILE__) . '/dump.txt'; -if (!($fp = fopen($data_file, 'w'))) { - die('skip File dump.txt could not be created'); -} if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> --FILE-- @@ -14,7 +10,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" ); /* creating dumping file */ -$data_file = dirname(__FILE__) . '/dump.txt'; +$data_file = dirname(__FILE__) . '/fprintf_variation_003.txt'; if (!($fp = fopen($data_file, 'wt'))) return; diff --git a/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt index ba8e525c3f..26db7ab18b 100644 --- a/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt +++ b/ext/standard/tests/strings/fprintf_variation_003_64bit.phpt @@ -2,10 +2,6 @@ Test fprintf() function (variation - 3) --SKIPIF-- <?php -$data_file = dirname(__FILE__) . '/dump.txt'; -if (!($fp = fopen($data_file, 'w'))) { - die('skip File dump.txt could not be created'); -} if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- @@ -14,7 +10,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" ); /* creating dumping file */ -$data_file = dirname(__FILE__) . '/dump.txt'; +$data_file = dirname(__FILE__) . '/fprintf_variation_003_64bit.txt'; if (!($fp = fopen($data_file, 'wt'))) return; diff --git a/ext/standard/tests/strings/fprintf_variation_004.phpt b/ext/standard/tests/strings/fprintf_variation_004.phpt Binary files differindex 5502b6d7c0..aa47a298d8 100644 --- a/ext/standard/tests/strings/fprintf_variation_004.phpt +++ b/ext/standard/tests/strings/fprintf_variation_004.phpt diff --git a/ext/standard/tests/strings/fprintf_variation_005.phpt b/ext/standard/tests/strings/fprintf_variation_005.phpt index 0967b77cd8..0be2cb6847 100644 --- a/ext/standard/tests/strings/fprintf_variation_005.phpt +++ b/ext/standard/tests/strings/fprintf_variation_005.phpt @@ -1,19 +1,12 @@ --TEST-- Test fprintf() function (variation - 5) ---SKIPIF-- -<?php -$data_file = dirname(__FILE__) . '/dump.txt'; -if (!($fp = fopen($data_file, 'w'))) { - die('skip File dump.txt could not be created'); -} -?> --FILE-- <?php $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" ); /* creating dumping file */ -$data_file = dirname(__FILE__) . '/dump.txt'; +$data_file = dirname(__FILE__) . '/fprintf_variation_005.txt'; if (!($fp = fopen($data_file, 'wt'))) return; diff --git a/ext/standard/tests/strings/fprintf_variation_006.phpt b/ext/standard/tests/strings/fprintf_variation_006.phpt index 8a66fb9fb4..b48720c2d5 100644 --- a/ext/standard/tests/strings/fprintf_variation_006.phpt +++ b/ext/standard/tests/strings/fprintf_variation_006.phpt @@ -2,10 +2,6 @@ Test fprintf() function (variation - 6) --SKIPIF-- <?php -$data_file = dirname(__FILE__) . '/dump.txt'; -if (!($fp = fopen($data_file, 'w'))) { - die('skip File dump.txt could not be created'); -} if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> --FILE-- @@ -14,7 +10,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" ); /* creating dumping file */ -$data_file = dirname(__FILE__) . '/dump.txt'; +$data_file = dirname(__FILE__) . '/fprintf_variation_006.txt'; if (!($fp = fopen($data_file, 'wt'))) return; diff --git a/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt index fe4cc91dd7..92ab010d03 100644 --- a/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt +++ b/ext/standard/tests/strings/fprintf_variation_006_64bit.phpt @@ -2,10 +2,6 @@ Test fprintf() function (variation - 6) --SKIPIF-- <?php -$data_file = dirname(__FILE__) . '/dump.txt'; -if (!($fp = fopen($data_file, 'w'))) { - die('skip File dump.txt could not be created'); -} if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- @@ -14,7 +10,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" ); /* creating dumping file */ -$data_file = dirname(__FILE__) . '/dump.txt'; +$data_file = dirname(__FILE__) . '/fprintf_variation_006_64bit.txt'; if (!($fp = fopen($data_file, 'wt'))) return; diff --git a/ext/standard/tests/strings/fprintf_variation_007.phpt b/ext/standard/tests/strings/fprintf_variation_007.phpt index 16d39bbde3..f2653a1ee1 100644 --- a/ext/standard/tests/strings/fprintf_variation_007.phpt +++ b/ext/standard/tests/strings/fprintf_variation_007.phpt @@ -2,10 +2,6 @@ Test fprintf() function (variation - 7) --SKIPIF-- <?php -$data_file = dirname(__FILE__) . '/dump.txt'; -if (!($fp = fopen($data_file, 'w'))) { - die('skip File dump.txt could not be created'); -} if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> --FILE-- @@ -14,7 +10,7 @@ if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" ); /* creating dumping file */ -$data_file = dirname(__FILE__) . '/dump.txt'; +$data_file = dirname(__FILE__) . '/fprintf_variation_007.txt'; if (!($fp = fopen($data_file, 'wt'))) return; diff --git a/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt index 55cd946a3b..9e30f91639 100644 --- a/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt +++ b/ext/standard/tests/strings/fprintf_variation_007_64bit.phpt @@ -2,10 +2,6 @@ Test fprintf() function (variation - 7) --SKIPIF-- <?php -$data_file = dirname(__FILE__) . '/dump.txt'; -if (!($fp = fopen($data_file, 'w'))) { - die('skip File dump.txt could not be created'); -} if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- @@ -14,7 +10,7 @@ if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" ); /* creating dumping file */ -$data_file = dirname(__FILE__) . '/dump.txt'; +$data_file = dirname(__FILE__) . '/fprintf_variation_007_64bit.txt'; if (!($fp = fopen($data_file, 'wt'))) return; diff --git a/ext/standard/tests/strings/fprintf_variation_008.phpt b/ext/standard/tests/strings/fprintf_variation_008.phpt index d2187c7ccd..e8c0a9e412 100644 --- a/ext/standard/tests/strings/fprintf_variation_008.phpt +++ b/ext/standard/tests/strings/fprintf_variation_008.phpt @@ -2,10 +2,6 @@ Test fprintf() function (variation - 8) --SKIPIF-- <?php -$data_file = dirname(__FILE__) . '/dump.txt'; -if (!($fp = fopen($data_file, 'w'))) { - die('skip File dump.txt could not be created'); -} if (PHP_INT_SIZE != 4) die("skip this test is for 32bit platform only"); ?> --FILE-- @@ -15,7 +11,7 @@ $int_variation = array( "%d", "%-d", "%+d", "%7.2d", "%-7.2d", "%07.2d", "%-07.2 $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" ); /* creating dumping file */ -$data_file = dirname(__FILE__) . '/dump.txt'; +$data_file = dirname(__FILE__) . '/fprintf_variation_008.txt'; if (!($fp = fopen($data_file, 'wt'))) return; diff --git a/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt b/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt index 9d326a91c1..661f2711f3 100644 --- a/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt +++ b/ext/standard/tests/strings/fprintf_variation_008_64bit.phpt @@ -2,10 +2,6 @@ Test fprintf() function (variation - 8) --SKIPIF-- <?php -$data_file = dirname(__FILE__) . '/dump.txt'; -if (!($fp = fopen($data_file, 'w'))) { - die('skip File dump.txt could not be created'); -} if (PHP_INT_SIZE != 8) die("skip this test is for 64bit platform only"); ?> --FILE-- @@ -15,7 +11,7 @@ $int_variation = array( "%d", "%-d", "%+d", "%7.2d", "%-7.2d", "%07.2d", "%-07.2 $int_numbers = array( 0, 1, -1, 2.7, -2.7, 23333333, -23333333, "1234" ); /* creating dumping file */ -$data_file = dirname(__FILE__) . '/dump.txt'; +$data_file = dirname(__FILE__) . '/fprintf_variation_008_64bit.txt'; if (!($fp = fopen($data_file, 'wt'))) return; diff --git a/ext/standard/tests/strings/fprintf_variation_009.phpt b/ext/standard/tests/strings/fprintf_variation_009.phpt index e36c0e8c0f..c16623ba8f 100644 --- a/ext/standard/tests/strings/fprintf_variation_009.phpt +++ b/ext/standard/tests/strings/fprintf_variation_009.phpt @@ -1,12 +1,5 @@ --TEST-- Test fprintf() function (variation - 9) ---SKIPIF-- -<?php -$data_file = dirname(__FILE__) . '/dump.txt'; -if (!($fp = fopen($data_file, 'w'))) { - die('skip File dump.txt could not be created'); -} -?> --FILE-- <?php @@ -14,7 +7,7 @@ $string_variation = array( "%5s", "%-5s", "%05s", "%'#5s" ); $strings = array( NULL, "abc", 'aaa' ); /* creating dumping file */ -$data_file = dirname(__FILE__) . '/dump.txt'; +$data_file = dirname(__FILE__) . '/fprintf_variation_009.txt'; if (!($fp = fopen($data_file, 'wt'))) return; diff --git a/ext/standard/tests/strings/md5_file.phpt b/ext/standard/tests/strings/md5_file.phpt Binary files differindex 3e996eccd3..45009669f4 100644 --- a/ext/standard/tests/strings/md5_file.phpt +++ b/ext/standard/tests/strings/md5_file.phpt diff --git a/ext/standard/tests/strings/sha1_file.phpt b/ext/standard/tests/strings/sha1_file.phpt index 83a191b172..102dab75ff 100644 --- a/ext/standard/tests/strings/sha1_file.phpt +++ b/ext/standard/tests/strings/sha1_file.phpt @@ -10,15 +10,15 @@ Test sha1_file() function with ASCII output and raw binary output. Based on ext/ echo "*** Testing sha1_file() : basic functionality ***\n"; /* Creating an empty file */ -if (($handle = fopen( "EmptyFile.txt", "w+")) == FALSE) +if (($handle = fopen( "EmptyFileSHA1.txt", "w+")) == FALSE) return false; /* Creating a data file */ -if (($handle2 = fopen( "DataFile.txt", "w+")) == FALSE) +if (($handle2 = fopen( "DataFileSHA1.txt", "w+")) == FALSE) return false; /* Writing into file */ -$filename = "DataFile.txt"; +$filename = "DataFileSHA1.txt"; $content = "Add this to the file\n"; if (is_writable($filename)) { if (fwrite($handle2, $content) === FALSE) { @@ -50,23 +50,23 @@ echo "\n-- Zero arguments --\n"; var_dump ( sha1_file() ); echo "\n-- More than valid number of arguments ( valid is 2) --\n"; -var_dump ( sha1_file("EmptyFile.txt", true, NULL) ); +var_dump ( sha1_file("EmptyFileSHA1.txt", true, NULL) ); echo "\n-- Hexadecimal Output for Empty file as Argument --\n"; -var_dump( sha1_file("EmptyFile.txt") ); +var_dump( sha1_file("EmptyFileSHA1.txt") ); echo "\n-- Raw Binary Output for Empty file as Argument --\n"; -var_dump( bin2hex(sha1_file("EmptyFile.txt", true))); +var_dump( bin2hex(sha1_file("EmptyFileSHA1.txt", true))); echo "\n-- Hexadecimal Output for a valid file with some contents --\n"; -var_dump( sha1_file("DataFile.txt") ); +var_dump( sha1_file("DataFileSHA1.txt") ); echo "\n-- Raw Binary Output for a valid file with some contents --\n"; -var_dump ( bin2hex(sha1_file("DataFile.txt", true))); +var_dump ( bin2hex(sha1_file("DataFileSHA1.txt", true))); // remove temp files -unlink("DataFile.txt"); -unlink("EmptyFile.txt"); +unlink("DataFileSHA1.txt"); +unlink("EmptyFileSHA1.txt"); ?> ===DONE=== diff --git a/ext/standard/tests/strings/vfprintf_basic.phpt b/ext/standard/tests/strings/vfprintf_basic.phpt index 2843e33af5..30cd5348bf 100644 --- a/ext/standard/tests/strings/vfprintf_basic.phpt +++ b/ext/standard/tests/strings/vfprintf_basic.phpt @@ -25,7 +25,7 @@ function writeAndDump($fp, $format, $args) echo "*** Testing vfprintf() : basic functionality ***\n"; // Open handle -$file = 'vfprintf_test.txt'; +$file = 'vfprintf_basic.txt'; $fp = fopen( $file, "a+" ); // Test vfprintf() @@ -46,7 +46,7 @@ fclose( $fp ); --CLEAN-- <?php -$file = 'vfprintf_test.txt'; +$file = 'vfprintf_basic.txt'; unlink( $file ); ?> diff --git a/ext/standard/tests/strings/vfprintf_error1.phpt b/ext/standard/tests/strings/vfprintf_error1.phpt index c3c869bb4d..c56631ecd7 100644 --- a/ext/standard/tests/strings/vfprintf_error1.phpt +++ b/ext/standard/tests/strings/vfprintf_error1.phpt @@ -13,7 +13,7 @@ precision=14 */ // Open handle -$file = 'vfprintf_test.txt'; +$file = 'vfprintf_error1.txt'; $fp = fopen( $file, "a+" ); echo "\n-- Testing vfprintf() function with more than expected no. of arguments --\n"; @@ -31,7 +31,7 @@ fclose($fp); --CLEAN-- <?php -$file = 'vfprintf_test.txt'; +$file = 'vfprintf_error1.txt'; unlink( $file ); ?> diff --git a/ext/standard/tests/strings/vfprintf_error2.phpt b/ext/standard/tests/strings/vfprintf_error2.phpt index 1eb89694ec..7da28468b3 100644 --- a/ext/standard/tests/strings/vfprintf_error2.phpt +++ b/ext/standard/tests/strings/vfprintf_error2.phpt @@ -13,7 +13,7 @@ precision=14 */ // Open handle -$file = 'vfprintf_test.txt'; +$file = 'vfprintf_error2.txt'; $fp = fopen( $file, "a+" ); echo "\n-- Testing vfprintf() function with less than expected no. of arguments --\n"; @@ -30,7 +30,7 @@ fclose($fp); --CLEAN-- <?php -$file = 'vfprintf_test.txt'; +$file = 'vfprintf_error2.txt'; unlink( $file ); ?> diff --git a/ext/standard/tests/strings/vfprintf_error3.phpt b/ext/standard/tests/strings/vfprintf_error3.phpt index dbc0d08897..8be51e1798 100644 --- a/ext/standard/tests/strings/vfprintf_error3.phpt +++ b/ext/standard/tests/strings/vfprintf_error3.phpt @@ -13,7 +13,7 @@ precision=14 */ // Open handle -$file = 'vfprintf_test.txt'; +$file = 'vfprintf_error3.txt'; $fp = fopen( $file, "a+" ); echo "\n-- Testing vfprintf() function with wrong variable types as argument --\n"; @@ -39,7 +39,7 @@ fclose( $fp ); --CLEAN-- <?php -$file = 'vfprintf_test.txt'; +$file = 'vfprintf_error3.txt'; unlink( $file ); ?> diff --git a/ext/standard/tests/strings/vfprintf_error4.phpt b/ext/standard/tests/strings/vfprintf_error4.phpt index 589d82c3d6..2865d42a9e 100644 --- a/ext/standard/tests/strings/vfprintf_error4.phpt +++ b/ext/standard/tests/strings/vfprintf_error4.phpt @@ -13,7 +13,7 @@ precision=14 */ // Open handle -$file = 'vfprintf_test.txt'; +$file = 'vfprintf_error4.txt'; $fp = fopen( $file, "a+" ); echo "\n-- Testing vfprintf() function with other strangeties --\n"; @@ -28,7 +28,7 @@ fclose( $fp ); --CLEAN-- <?php -$file = 'vfprintf_test.txt'; +$file = 'vfprintf_error4.txt'; unlink( $file ); ?> diff --git a/ext/standard/tests/strings/vfprintf_variation1.phpt b/ext/standard/tests/strings/vfprintf_variation1.phpt index 6358bccd1c..76422011c2 100644 --- a/ext/standard/tests/strings/vfprintf_variation1.phpt +++ b/ext/standard/tests/strings/vfprintf_variation1.phpt @@ -15,7 +15,7 @@ precision=14 echo "*** Testing vfprintf() : variation functionality ***\n"; // Open handle -$file = 'vfprintf_test.txt'; +$file = 'vfprintf_variation1.txt'; $fp = fopen( $file, 'a+' ); $funset = fopen( __FILE__, 'r' ); @@ -59,7 +59,7 @@ fclose( $fp ); --CLEAN-- <?php -$file = 'vfprintf_test.txt'; +$file = 'vfprintf_variation1.txt'; unlink( $file ); ?> |