BUG: Refs #212. Moved recursiveRemoveDirectory calls as it moved to KWUtils.

Author: Michael Grauer

modules/batchmake/tests/controllers/components/KWBatchmakeComponentTest.php

@@ -24,58 +24,6 @@ class KWBatchmakeComponentTest extends BatchmakeControllerTest
   protected $applicationConfig;
 
 
-  /** Helper function to recursively delete a directory
-   * @TODO temporary usage of this function, this should
-   * get into KWUtils
-   *
-   * @param type $directorypath Directory to be deleted
-   * @return bool Success or not
-   */
-  private function _recursiveRemoveDirectory($directorypath)
-    {
-    // if the path has a slash at the end, remove it here
-    $directorypath = rtrim($directorypath, '/');
-    // open the directory
-    $handle = opendir($directorypath);
-
-    if(!is_readable($directorypath))
-      {
-      return false;
-      }
-    // and scan through the items inside
-    while(false !== ($item = readdir($handle)))
-      {
-      // if the filepointer is not the current directory or the parent directory
-      if($item != '.' && $item != '..')
-        {
-        // build the new path to delete
-        $path = $directorypath.'/'.$item;
-        // if the new path is a directory
-        if(is_dir($path))
-          {
-          // call this function with the new path
-          $this->_recursiveRemoveDirectory($path);
-          // if the new path is a file
-          }
-        else
-          {
-          // remove the file
-          unlink($path);
-          }
-        }
-      }
-    closedir($handle);
-    // try to delete the now empty directory
-    if(!rmdir($directorypath))
-      {
-      return false;
-      }
-    return true;
-    }
-
-
-
-
   /** set up tests*/
   public function setUp()
     {
@@ -97,7 +45,7 @@ public function tearDown()
     {
     // remove the temporary tests dir
     $testTmpDir = $this->getTempDirectory() . '/batchmake/tests';
-    $this->_recursiveRemoveDirectory($testTmpDir);
+    KWUtils::recursiveRemoveDirectory($testTmpDir);
     }
 
 
@@ -147,7 +95,6 @@ protected function clearDirFiles($dirToClear)
       }
     }
 
-
   /**
    * helper function to run a test case
    */

tests/library/KWUtilsTest.php

@@ -38,7 +38,7 @@ public function testMkDir()
     $tmpDir = $this->getTempDirectory() . '/KWUtilsTest';
     $this->assertTrue(KWUtils::mkDir($tmpDir));
     // now clean up
-    rmdir($tmpDir);
+    KWUtils::recursiveRemoveDirectory($tmpDir);
     }
 
   /** tests createSubDirectories function */
@@ -66,15 +66,8 @@ public function testCreateSubDirectories()
       $this->assertTrue(is_dir($currDir));
       }
 
-    // now walk back up the tree and clean up these tmp dirs
-    foreach($subDirs as $subdir)
-      {
-      // we aren't doing anything with $subdir, just iterating once per subdir
-      rmdir($currDir);
-      $parts = explode('/', $currDir);
-      $parts = array_slice($parts, 0, count($parts)-1);
-      $currDir = implode('/', $parts);
-      }
+    $topDir = $this->getTempDirectory() . '/KWUtilsTest';
+    KWUtils::recursiveRemoveDirectory($topDir);
     }