[PHP-CVS] cvs: php-src(PHP_5_2) /ext/standard/tests/file file_basic.phpt file_variation.phpt

[Raghubansh Kumar]

kraghuba                Fri Nov  2 03:54:06 2007 UTC

  Modified files:              (Branch: PHP_5_2)
    /php-src/ext/standard/tests/file    file_variation.phpt 
                                        file_basic.phpt 
  Log:
  fix tests: proper temp file names
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_variation.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/file/file_variation.phpt
diff -u php-src/ext/standard/tests/file/file_variation.phpt:1.1.2.2 
php-src/ext/standard/tests/file/file_variation.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/file_variation.phpt:1.1.2.2 Wed Jun  6 
12:53:58 2007
+++ php-src/ext/standard/tests/file/file_variation.phpt Fri Nov  2 03:54:05 2007
@@ -10,7 +10,7 @@
 
 $file_path = dirname(__FILE__);
 require($file_path."/file.inc");
-$filename = $file_path."/file.tmp";
+$filename = $file_path."/file_variation.tmp";
 
 $data_array = array( "Garbage data", "Gar\nba\nge d\nata", "Gar\n\nbage \n\n 
data" );
 
@@ -27,18 +27,18 @@
 }
 
 echo "*** Testing with variation in use_include_path argument ***\n";
-$dir = "/file";
+$dir = "/file_variation";
 $file_path = dirname(__FILE__).$dir;
 
 mkdir($file_path);
 ini_set( 'include_path', $file_path );
-$filename = $file_path."/file1.tmp";
+$filename = $file_path."/file1_variation.tmp";
 
 $buffer_types = array("text", "numeric", "alphanumeric", "text_with_new_line");
 foreach( $buffer_types as $type) {
   fill_buffer($buffer, $type, 100);
   file_put_contents($filename, $buffer );
-  var_dump( file("file1.tmp", FILE_USE_INCLUDE_PATH) );
+  var_dump( file("file1_variation.tmp", FILE_USE_INCLUDE_PATH) );
   var_dump( file($filename, FILE_IGNORE_NEW_LINES) );
   var_dump( file($filename, FILE_SKIP_EMPTY_LINES) );
    
@@ -52,11 +52,11 @@
 // Removing the temporary files and directory
 
 $file_path = dirname(__FILE__);
-unlink($file_path."/file.tmp");
+unlink($file_path."/file_variation.tmp");
 
-$dir = "/file";
+$dir = "/file_variation";
 $file_path = dirname(__FILE__).$dir;
-unlink($file_path."/file1.tmp");
+unlink($file_path."/file1_variation.tmp");
 rmdir($file_path);
 
 ?>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/file/file_basic.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/standard/tests/file/file_basic.phpt
diff -u php-src/ext/standard/tests/file/file_basic.phpt:1.1.2.2 
php-src/ext/standard/tests/file/file_basic.phpt:1.1.2.3
--- php-src/ext/standard/tests/file/file_basic.phpt:1.1.2.2     Wed Jun  6 
12:53:58 2007
+++ php-src/ext/standard/tests/file/file_basic.phpt     Fri Nov  2 03:54:05 2007
@@ -13,17 +13,17 @@
 $filetypes = array("numeric", "text", "empty", "text_with_new_line");
 
 foreach( $filetypes as $type ) {
-  create_files($file_path, 1, $type, 0755, 100, "w", "file", 1, "byte");
-  print_r( file($file_path."/file1.tmp") );
-  delete_files($file_path, 1);
+  create_files($file_path, 1, $type, 0755, 100, "w", "file_basic", 1, "byte");
+  print_r( file($file_path."/file_basic1.tmp") );
+  delete_files($file_path, 1, "file_basic");
 }
 
 echo "*** Testing for return type of file function ***\n";
 foreach( $filetypes as $type ) {
-  create_files($file_path, 1, $type);
-  $ret_arr =  file($file_path."/file1.tmp");
+  create_files($file_path, 1, $type, 0755, 1, "w", "file_basic");
+  $ret_arr =  file($file_path."/file_basic1.tmp");
   var_dump( is_array($ret_arr) );
-  delete_files($file_path, 1);
+  delete_files($file_path, 1, "file_basic");
 }
 
 echo "\n--- Done ---";

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php