divide the test into smaller tests

diff --git a/ext/standard/tests/file/rename_variation.phpt b/ext/standard/tests/file/rename_variation.phpt
index cf1c0ff8f7cf7876827a41a2ea093bb39c169f2b..63b47a37a05d9fddcc8e9c4c02ff91d0ab38f412 100644 (file)
--- a/ext/standard/tests/file/rename_variation.phpt
+++ b/ext/standard/tests/file/rename_variation.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Test rename() function: usage variations
+Test rename() function: usage variations-1
 --SKIPIF--
 <?php
 if (substr(PHP_OS, 0, 3) == 'WIN') {
@@ -8,11 +8,6 @@ if (substr(PHP_OS, 0, 3) == 'WIN') {
 ?>
 --FILE--
 <?php
-/* Prototype: bool rename ( string $oldname, string $newname [, resource $context] );
-   Description: Renames a file or directory
-*/
-
-require dirname(__FILE__).'/file.inc';
 
 /* creating directory */
 $file_path = dirname(__FILE__);
@@ -50,160 +45,6 @@ foreach($src_filenames as $src_filename) {
 // clean the temp dir and file
 rmdir("$file_path/rename_variation"); 
 
-// rename dirs across directories
-echo "\n*** Testing rename() : renaming directory across directories ***\n";
-$src_dirs = array (
-  /* Testing simple directory tree */
-  "$file_path/rename_variation/",
-
-  /* Testing a dir with trailing slash */
-  "$file_path/rename_variation/",
-
-  /* Testing dir with double trailing slashes */
-  "$file_path//rename_variation//",
-);
-
-$dest_dir = "$file_path/rename_variation_dir";
-// create the $dest_dir
-mkdir($dest_dir);
-
-$counter = 1;
-/* loop through each $src_dirs and rename it to  $dest_dir */
-foreach($src_dirs as $src_dir) {
-  echo "-- Iteration $counter --\n";
-
-  // create the src dir
-  mkdir("$file_path/rename_variation/");
-  // rename the src dir to a new dir in dest dir
-  var_dump( rename($src_dir, $dest_dir."/new_dir") );
-  // ensure that dir was renamed 
-  var_dump( file_exists($src_dir) );  // expecting false
-  var_dump( file_exists($dest_dir."/new_dir") ); // expecting true
-
-  // remove the new dir
-  rmdir($dest_dir."/new_dir");
-  $counter++;
-}
-
-/* Testing rename() on soft and hard links with different permissions */
-echo "\n*** Testing rename() on soft links ***\n";
-// create the file
-$file_prefix = "rename_variation";
-create_files(dirname(__FILE__), 1, "numeric", 0755, 1, "w", $file_prefix);
-
-// create the soft links to the file
-$filename = $file_prefix."1.tmp";
-create_links(dirname(__FILE__), $filename, 1, "soft", 1024, "rename_variation_soft_link");  
-
-//rename the link to a new name in the same dir
-$src_linkname = "$file_path/rename_variation_soft_link1.tmp";
-$dest_linkname = "$file_path/rename_variation_soft_link2.tmp";
-var_dump( rename( $src_linkname, $dest_linkname) );
-//ensure that link was renamed 
-var_dump( file_exists($src_linkname) );  // expecting false
-var_dump( file_exists($dest_linkname) );  // expecting true
-
-// rename a link across dir
-var_dump( rename($dest_linkname, $dest_dir."/rename_variation_soft_link2.tmp"));
-//ensure that link got renamed
-var_dump( file_exists($dest_linkname) );  // expecting false
-var_dump( file_exists($dest_dir."/rename_variation_soft_link2.tmp") ); // expecting true
-
-// delete the link file now 
-unlink($dest_dir."/rename_variation_soft_link2.tmp");
-
-echo "\n*** Testing rename() on hard links ***\n";
-create_links(dirname(__FILE__), $filename, 1, "hard", 1024, "rename_variation_hard_link");
-
-//rename the link to a new name in the same dir
-$src_linkname = "$file_path/rename_variation_hard_link1.tmp";
-$dest_linkname = "$file_path/rename_variation_hard_link2.tmp";
-var_dump( rename( $src_linkname, $dest_linkname) );
-//ensure that link was renamed
-var_dump( file_exists($src_linkname) );  // expecting false
-var_dump( file_exists($dest_linkname) );  // expecting true
-
-// rename a hard link across dir
-var_dump( rename($dest_linkname, $dest_dir."/rename_variation_hard_link2.tmp") );
-//ensure that link got renamed
-var_dump( file_exists($dest_linkname) );  // expecting false
-var_dump( file_exists($dest_dir."/rename_variation_hard_link2.tmp") ); // expecting true
-
-// delete the link file now
-unlink($dest_dir."/rename_variation_hard_link2.tmp");
-// delete the file
-delete_files(dirname(__FILE__), 1, $file_prefix);
-
-/* Renaming a file, link and directory to numeric name */
-echo "\n*** Testing rename() by renaming a file, link and directory to numeric name ***\n";
-$fp = fopen($file_path."/rename_variation.tmp", "w");
-fclose($fp);
-// renaming existing file to numeric name
-var_dump( rename($file_path."/rename_variation.tmp", $file_path."/12345") );
-// ensure that rename worked fine
-var_dump( file_exists($file_path."/rename_variation.tmp" ) );  // expecting false
-var_dump( file_exists($file_path."/12345" ) );  // expecting true
-// remove the file
-unlink($file_path."/12345");
-
-// renaming a directory to numeric name
-var_dump( rename($file_path."/rename_variation_dir/", $file_path."/12345") );
-// ensure that rename worked fine
-var_dump( file_exists($file_path."/rename_variation_dir" ) );  // expecting false
-var_dump( file_exists($file_path."/12345" ) );  // expecting true
-
-// renaming existing link to numeric name
-create_file( $file_path."/rename_variation.tmp");
-/*
-symlink($file_path."/rename_variation.tmp", $file_path."/rename_variation_link.tmp");
-var_dump( rename($file_path."/rename_variation_link.tmp", $file_path."/1234") );
-// ensure that rename worked fine
-var_dump( file_exists($file_path."/rename_variation_link.tmp" ) );  // expecting false
-var_dump( file_exists($file_path."/1234" ) );  // expecting true
-*/
-// delete the file and dir
-rmdir($file_path."/12345");
-
-/* test rename() by trying to rename an existing file/dir/link to the same name
-  and one another */
-// create a dir 
-$file_path = dirname(__FILE__);
-$dirname = "$file_path/rename_variation_dir"; 
-mkdir($dirname);
-//create a file
-$filename = "$file_path/rename_variation.tmp"; 
-$fp = fopen($filename, "w");
-fclose($fp);
-// create a link
-$linkname = "$file_path/rename_variation_link.tmp";
-symlink($filename, $linkname);
-
-echo "\n-- Renaming link to same link name --\n";
-var_dump( rename($linkname, $linkname) );
-
-echo "\n-- Renaming file to same file name --\n";
-var_dump( rename($filename, $filename) );
-
-echo "\n-- Renaming directory to same directory name --\n";
-var_dump( rename($dirname, $dirname) );
-
-echo "\n-- Renaming existing link to existing directory name --\n";
-var_dump( rename($linkname, $dirname) );
-echo "\n-- Renaming existing link to existing file name --\n";
-var_dump( rename($linkname, $filename) );
-
-echo "\n-- Renaming existing file to existing directory name --\n";
-var_dump( rename($filename, $dirname) );
-echo "\n-- Renaming existing file to existing link name --\n";
-var_dump( rename($filename, $linkname) );
-
-echo "\n-- Renaming existing directory to existing file name --\n";
-$fp = fopen($filename, "w");
-fclose($fp);
-var_dump( rename($dirname, $filename) );
-echo "\n-- Renaming existing directory to existing link name --\n";
-var_dump( rename($dirname, $linkname) );
-
 echo "Done\n";
 ?>
 --CLEAN--
@@ -235,77 +76,4 @@ bool(true)
 bool(true)
 bool(false)
 bool(true)
-
-*** Testing rename() : renaming directory across directories ***
--- Iteration 1 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 2 --
-bool(true)
-bool(false)
-bool(true)
--- Iteration 3 --
-bool(true)
-bool(false)
-bool(true)
-
-*** Testing rename() on soft links ***
-bool(true)
-bool(false)
-bool(true)
-bool(true)
-bool(false)
-bool(true)
-
-*** Testing rename() on hard links ***
-bool(true)
-bool(false)
-bool(true)
-bool(true)
-bool(false)
-bool(true)
-
-*** Testing rename() by renaming a file, link and directory to numeric name ***
-bool(true)
-bool(false)
-bool(true)
-bool(true)
-bool(false)
-bool(true)
-
--- Renaming link to same link name --
-bool(true)
-
--- Renaming file to same file name --
-bool(true)
-
--- Renaming directory to same directory name --
-bool(true)
-
--- Renaming existing link to existing directory name --
-
-Warning: rename(%s,%s): Is a directory in %s on line %d
-bool(false)
-
--- Renaming existing link to existing file name --
-bool(true)
-
--- Renaming existing file to existing directory name --
-
-Warning: rename(%s,%s): Is a directory in %s on line %d
-bool(false)
-
--- Renaming existing file to existing link name --
-bool(true)
-
--- Renaming existing directory to existing file name --
-
-Warning: rename(%s,%s): Not a directory in %s on line %d
-bool(false)
-
--- Renaming existing directory to existing link name --
-
-Warning: rename(%s,%s): Not a directory in %s on line %d
-bool(false)
 Done

diff --git a/ext/standard/tests/file/rename_variation1.phpt b/ext/standard/tests/file/rename_variation1.phpt
new file mode 100644 (file)
index 0000000..4a2f55b
--- /dev/null
+++ b/ext/standard/tests/file/rename_variation1.phpt
@@ -0,0 +1,73 @@
+--TEST--
+Test rename() function: usage variations-2
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip.. only for Linux');
+}
+?>
+--FILE--
+<?php
+
+/* creating directory */
+$file_path = dirname(__FILE__);
+
+// rename dirs across directories
+echo "\n*** Testing rename() : renaming directory across directories ***\n";
+$src_dirs = array (
+  /* Testing simple directory tree */
+  "$file_path/rename_variation/",
+
+  /* Testing a dir with trailing slash */
+  "$file_path/rename_variation/",
+
+  /* Testing dir with double trailing slashes */
+  "$file_path//rename_variation//",
+);
+
+$dest_dir = "$file_path/rename_variation_dir";
+// create the $dest_dir
+mkdir($dest_dir);
+
+$counter = 1;
+/* loop through each $src_dirs and rename it to  $dest_dir */
+foreach($src_dirs as $src_dir) {
+  echo "-- Iteration $counter --\n";
+
+  // create the src dir
+  mkdir("$file_path/rename_variation/");
+  // rename the src dir to a new dir in dest dir
+  var_dump( rename($src_dir, $dest_dir."/new_dir") );
+  // ensure that dir was renamed 
+  var_dump( file_exists($src_dir) );  // expecting false
+  var_dump( file_exists($dest_dir."/new_dir") ); // expecting true
+
+  // remove the new dir
+  rmdir($dest_dir."/new_dir");
+  $counter++;
+}
+
+echo "Done\n";
+?>
+--CLEAN--
+<?php
+$file_path = dirname(__FILE__);
+unlink($file_path."/rename_variation_link.tmp");
+unlink($file_path."/rename_variation.tmp");
+rmdir($file_path."/rename_variation_dir");
+?>
+--EXPECTF--
+*** Testing rename() : renaming directory across directories ***
+-- Iteration 1 --
+bool(true)
+bool(false)
+bool(true)
+-- Iteration 2 --
+bool(true)
+bool(false)
+bool(true)
+-- Iteration 3 --
+bool(true)
+bool(false)
+bool(true)
+Done

diff --git a/ext/standard/tests/file/rename_variation2.phpt b/ext/standard/tests/file/rename_variation2.phpt
new file mode 100644 (file)
index 0000000..350ed65
--- /dev/null
+++ b/ext/standard/tests/file/rename_variation2.phpt
@@ -0,0 +1,65 @@
+--TEST--
+Test rename() function: usage variations-3
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip.. only for Linux');
+}
+?>
+--FILE--
+<?php
+
+$file_path = dirname(__FILE__);
+
+$dest_dir = "$file_path/rename_variation_dir";
+// create the $dest_dir
+mkdir($dest_dir);
+
+/* Testing rename() on soft and hard links with different permissions */
+echo "\n*** Testing rename() on soft links ***\n";
+// create the file
+$filename = $file_path."/rename_variation1.tmp";
+@unlink($filename);
+var_dump(touch($filename));
+
+// create the soft links to the file
+$linkname = $file_path."/rename_variation_soft_link1.tmp";
+var_dump(symlink($filename, $linkname));
+
+//rename the link to a new name in the same dir
+$dest_linkname = $file_path."/rename_variation_soft_link2.tmp";
+var_dump( rename( $linkname, $dest_linkname) );
+//ensure that link was renamed 
+var_dump( file_exists($linkname) );  // expecting false
+var_dump( file_exists($dest_linkname) );  // expecting true
+
+// rename a link across dir
+var_dump( rename($dest_linkname, $dest_dir."/rename_variation_soft_link2.tmp"));
+//ensure that link got renamed
+var_dump( file_exists($dest_linkname) );  // expecting false
+var_dump( file_exists($dest_dir."/rename_variation_soft_link2.tmp") ); // expecting true
+
+// delete the link file now 
+unlink($dest_dir."/rename_variation_soft_link2.tmp");
+
+echo "Done\n";
+?>
+--CLEAN--
+<?php
+$file_path = dirname(__FILE__);
+unlink($file_path."/rename_variation1.tmp");
+unlink($file_path."/rename_variation_link.tmp");
+unlink($file_path."/rename_variation.tmp");
+rmdir($file_path."/rename_variation_dir");
+?>
+--EXPECTF--
+*** Testing rename() on soft links ***
+bool(true)
+bool(true)
+bool(true)
+bool(false)
+bool(true)
+bool(true)
+bool(false)
+bool(true)
+Done

diff --git a/ext/standard/tests/file/rename_variation3.phpt b/ext/standard/tests/file/rename_variation3.phpt
new file mode 100644 (file)
index 0000000..f6565e4
--- /dev/null
+++ b/ext/standard/tests/file/rename_variation3.phpt
@@ -0,0 +1,64 @@
+--TEST--
+Test rename() function: usage variations-4
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip.. only for Linux');
+}
+?>
+--FILE--
+<?php
+
+$file_path = dirname(__FILE__);
+
+$dest_dir = "$file_path/rename_variation_dir";
+// create the $dest_dir
+mkdir($dest_dir);
+
+echo "\n*** Testing rename() on hard links ***\n";
+$filename = $file_path."/rename_variation1.tmp";
+@unlink($filename);
+var_dump(touch($filename));
+
+$linkname = $file_path."/rename_variation_hard_link1.tmp";
+var_dump(link($filename, $linkname));
+
+//rename the link to a new name in the same dir
+$dest_linkname = $file_path."/rename_variation_hard_link2.tmp";
+var_dump( rename( $filename, $dest_linkname) );
+//ensure that link was renamed
+var_dump( file_exists($filename) );  // expecting false
+var_dump( file_exists($dest_linkname) );  // expecting true
+
+// rename a hard link across dir
+var_dump( rename($dest_linkname, $dest_dir."/rename_variation_hard_link2.tmp") );
+//ensure that link got renamed
+var_dump( file_exists($dest_linkname) );  // expecting false
+var_dump( file_exists($dest_dir."/rename_variation_hard_link2.tmp") ); // expecting true
+
+// delete the link file now
+unlink($dest_dir."/rename_variation_hard_link2.tmp");
+
+echo "Done\n";
+?>
+--CLEAN--
+<?php
+$file_path = dirname(__FILE__);
+unlink($file_path."/rename_variation1.tmp");
+unlink($file_path."/rename_variation_link.tmp");
+unlink($file_path."/rename_variation_hard_link1.tmp");
+unlink($file_path."/rename_variation_hard_link2.tmp");
+unlink($file_path."/rename_variation.tmp");
+rmdir($file_path."/rename_variation_dir");
+?>
+--EXPECTF--
+*** Testing rename() on hard links ***
+bool(true)
+bool(true)
+bool(true)
+bool(false)
+bool(true)
+bool(true)
+bool(false)
+bool(true)
+Done

diff --git a/ext/standard/tests/file/rename_variation4.phpt b/ext/standard/tests/file/rename_variation4.phpt
new file mode 100644 (file)
index 0000000..10061c6
--- /dev/null
+++ b/ext/standard/tests/file/rename_variation4.phpt
@@ -0,0 +1,54 @@
+--TEST--
+Test rename() function: usage variations-5
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip.. only for Linux');
+}
+?>
+--FILE--
+<?php
+
+$file_path = dirname(__FILE__);
+
+require dirname(__FILE__).'/file.inc';
+
+/* Renaming a file, link and directory to numeric name */
+echo "\n*** Testing rename() by renaming a file, link and directory to numeric name ***\n";
+$fp = fopen($file_path."/rename_variation.tmp", "w");
+fclose($fp);
+// renaming existing file to numeric name
+var_dump( rename($file_path."/rename_variation.tmp", $file_path."/12345") );
+// ensure that rename worked fine
+var_dump( file_exists($file_path."/rename_variation.tmp" ) );  // expecting false
+var_dump( file_exists($file_path."/12345" ) );  // expecting true
+// remove the file
+unlink($file_path."/12345");
+
+mkdir($file_path."/rename_variation_dir");
+
+// renaming a directory to numeric name
+var_dump( rename($file_path."/rename_variation_dir/", $file_path."/12345") );
+// ensure that rename worked fine
+var_dump( file_exists($file_path."/rename_variation_dir" ) );  // expecting false
+var_dump( file_exists($file_path."/12345" ) );  // expecting true
+
+echo "Done\n";
+?>
+--CLEAN--
+<?php
+$file_path = dirname(__FILE__);
+unlink($file_path."/rename_variation_link.tmp");
+unlink($file_path."/rename_variation.tmp");
+rmdir($file_path."/rename_variation_dir");
+rmdir($file_path."/12345");
+?>
+--EXPECTF--
+*** Testing rename() by renaming a file, link and directory to numeric name ***
+bool(true)
+bool(false)
+bool(true)
+bool(true)
+bool(false)
+bool(true)
+Done

diff --git a/ext/standard/tests/file/rename_variation5.phpt b/ext/standard/tests/file/rename_variation5.phpt
new file mode 100644 (file)
index 0000000..bf43e49
--- /dev/null
+++ b/ext/standard/tests/file/rename_variation5.phpt
@@ -0,0 +1,96 @@
+--TEST--
+Test rename() function: usage variations-6
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') {
+    die('skip.. only for Linux');
+}
+?>
+--FILE--
+<?php
+
+/* test rename() by trying to rename an existing file/dir/link to the same name
+  and one another */
+// create a dir 
+$file_path = dirname(__FILE__);
+$dirname = "$file_path/rename_variation_dir"; 
+mkdir($dirname);
+//create a file
+$filename = "$file_path/rename_variation.tmp"; 
+$fp = fopen($filename, "w");
+fclose($fp);
+// create a link
+$linkname = "$file_path/rename_variation_link.tmp";
+symlink($filename, $linkname);
+
+echo "\n-- Renaming link to same link name --\n";
+var_dump( rename($linkname, $linkname) );
+
+echo "\n-- Renaming file to same file name --\n";
+var_dump( rename($filename, $filename) );
+
+echo "\n-- Renaming directory to same directory name --\n";
+var_dump( rename($dirname, $dirname) );
+
+echo "\n-- Renaming existing link to existing directory name --\n";
+var_dump( rename($linkname, $dirname) );
+echo "\n-- Renaming existing link to existing file name --\n";
+var_dump( rename($linkname, $filename) );
+
+echo "\n-- Renaming existing file to existing directory name --\n";
+var_dump( rename($filename, $dirname) );
+echo "\n-- Renaming existing file to existing link name --\n";
+var_dump( rename($filename, $linkname) );
+
+echo "\n-- Renaming existing directory to existing file name --\n";
+$fp = fopen($filename, "w");
+fclose($fp);
+var_dump( rename($dirname, $filename) );
+echo "\n-- Renaming existing directory to existing link name --\n";
+var_dump( rename($dirname, $linkname) );
+
+echo "Done\n";
+?>
+--CLEAN--
+<?php
+$file_path = dirname(__FILE__);
+unlink($file_path."/rename_variation_link.tmp");
+unlink($file_path."/rename_variation.tmp");
+rmdir($file_path."/rename_variation_dir");
+?>
+--EXPECTF--
+-- Renaming link to same link name --
+bool(true)
+
+-- Renaming file to same file name --
+bool(true)
+
+-- Renaming directory to same directory name --
+bool(true)
+
+-- Renaming existing link to existing directory name --
+
+Warning: rename(%s,%s): Is a directory in %s on line %d
+bool(false)
+
+-- Renaming existing link to existing file name --
+bool(true)
+
+-- Renaming existing file to existing directory name --
+
+Warning: rename(%s,%s): Is a directory in %s on line %d
+bool(false)
+
+-- Renaming existing file to existing link name --
+bool(true)
+
+-- Renaming existing directory to existing file name --
+
+Warning: rename(%s,%s): Not a directory in %s on line %d
+bool(false)
+
+-- Renaming existing directory to existing link name --
+
+Warning: rename(%s,%s): Not a directory in %s on line %d
+bool(false)
+Done