Changeset 134

Timestamp:

03/04/08 23:12:35 (10 months ago)

Author:

iteman

Message:

- Refactored.

Location:

trunk/src/Stagehand

Files:

• TestRunner.php (modified) (5 diffs)
• TestRunner/AlterationMonitor.php (modified) (7 diffs)
• TestRunner/Collector/Common.php (modified) (6 diffs)
• TestRunner/DirectoryScanner.php (added)

trunk/src/Stagehand/TestRunner.php

@@ -222 +222 @@
         $options[] = '-R';
 
-        if ($config->preload) {
+        if (!is_null($config->preloadFile)) {
             $options[] = "-p {$config->preloadFile}";
         }
@@ -260 +260 @@
         $color = false;
         $enableAutotest = false;
-        $preload = false;
         $preloadFile = null;
-        $useTargetDirectories = false;
         $targetDirectories = array();
         foreach ($allOptions as $options) {
@@ -287 +285 @@
                         break;
                     case 'p':
-                        $preload = true;
                         $preloadFile = $option[1];
                         break;
@@ -294 +291 @@
                         break;
                     case 'w':
-                        $useTargetDirectories = true;
                         $targetDirectories = explode(',', $option[1]);
                         break;
@@ -308 +304 @@
                              'color' => $color,
                              'enableAutotest' => $enableAutotest,
-                             'preload' => $preload,
                              'preloadFile' => $preloadFile,
-                             'useTargetDirectories' => $useTargetDirectories,
                              'targetDirectories' => $targetDirectories
                              );

trunk/src/Stagehand/TestRunner/AlterationMonitor.php

@@ -33 +33 @@
  * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License (revised)
  * @version    SVN: $Id$
- * @link       http://winbinder.org/
  * @since      File available since Release 2.1.0
  */
 
 require_once 'Stagehand/TestRunner/Exception.php';
+require_once 'Stagehand/TestRunner/DirectoryScanner.php';
 
 // {{{ Stagehand_TestRunner_AlterationMonitor
@@ -48 +48 @@
  * @license    http://www.opensource.org/licenses/bsd-license.php  BSD License (revised)
  * @version    Release: @package_version@
- * @link       http://winbinder.org/
  * @since      Class available since Release 2.1.0
  */
@@ -82 +81 @@
     private $_previousElements;
     private $_isFirstTime = true;
-    private $_excludePatterns = array('!^CVS$!',
-                                      '!^.svn!',
-                                      '!\.swp$!',
-                                      '!~$!',
-                                      '!\.bak$!',
-                                      '!^#.+#$!'
-                                      );
     private $_scanInterval = self::SCAN_INTERVAL_MIN;
+    private $_directoryScanner;
 
     /**#@-*/
@@ -110 +103 @@
         $this->_directories = $directories;
         $this->_command = $command;
+        $this->_directoryScanner = new Stagehand_TestRunner_DirectoryScanner(array($this, 'detectChanges'));
     }
 
@@ -138 +132 @@
     }
 
+    // }}}
+    // {{{ detectChanges()
+
+    /**
+     * Detects any changes of a file or directory immediately.
+     *
+     * @param string $element
+     * @throws Stagehand_TestRunner_Exception
+     */
+    public function detectChanges($element)
+    {
+        if (!$this->_isFirstTime) {
+            if (!array_key_exists($element, $this->_previousElements)) {
+                throw new Stagehand_TestRunner_Exception();
+            }
+
+            if (!is_dir($element)) {
+                $mtime = filemtime($element);
+                if ($this->_previousElements[$element]['mtime'] != $mtime) {
+                    throw new Stagehand_TestRunner_Exception();
+                }
+            }
+
+            $perms = fileperms($element);
+            if ($this->_previousElements[$element]['perms'] != $perms) {
+                throw new Stagehand_TestRunner_Exception();
+            }
+        }
+
+        if (!is_dir($element)) {
+            $this->_currentElements[$element]['mtime'] = filemtime($element);
+        }
+
+        $this->_currentElements[$element]['perms'] = fileperms($element);
+    }
+
     /**#@-*/
 
@@ -181 +211 @@
                 $startTime = time();
                 foreach ($this->_directories as $directory) {
-                    $this->_collectElements($directory);
+                    $this->_directoryScanner->scan($directory);
                 }
                 $endTime = time();
@@ -203 +233 @@
             $this->_previousElements = $this->_currentElements;
             $this->_isFirstTime = false;
-        }
-    }
-
-    // }}}
-    // {{{ _collectElements()
-
-    /**
-     * Collects all files and directories in a target directory and detects any
-     * changes of a file or directory immediately.
-     *
-     * @param string $directory
-     * @throws Stagehand_TestRunner_Exception
-     */
-    private function _collectElements($directory)
-    {
-        $files = scandir($directory);
-        for ($i = 0, $count = count($files); $i < $count; ++$i) {
-            if ($files[$i] == '.' || $files[$i] == '..') {
-                continue;
-            }
-
-            foreach ($this->_excludePatterns as $excludePattern) {
-                if (preg_match($excludePattern, $files[$i])) {
-                    continue 2;
-                }
-            }
-
-            $element = $directory . DIRECTORY_SEPARATOR . $files[$i];
-            if (!$this->_isFirstTime) {
-                if (!array_key_exists($element, $this->_previousElements)) {
-                    throw new Stagehand_TestRunner_Exception();
-                }
-
-                if (!is_dir($element)) {
-                    $mtime = filemtime($element);
-                    if ($this->_previousElements[$element]['mtime'] != $mtime) {
-                        throw new Stagehand_TestRunner_Exception();
-                    }
-                }
-
-                $perms = fileperms($element);
-                if ($this->_previousElements[$element]['perms'] != $perms) {
-                    throw new Stagehand_TestRunner_Exception();
-                }
-            }
-
-            if (!is_dir($element)) {
-                $this->_currentElements[$element]['mtime'] = filemtime($element);
-            }
-
-            $this->_currentElements[$element]['perms'] = fileperms($element);
-
-            if (is_dir($element)) {
-                $this->_collectElements($element);
-            }
         }
     }

trunk/src/Stagehand/TestRunner/Collector/Common.php

@@ -37 +37 @@
 
 require_once 'Stagehand/TestRunner/Exception.php';
+require_once 'Stagehand/TestRunner/DirectoryScanner.php';
 
 // {{{ Stagehand_TestRunner_Collector_Common
@@ -77 +78 @@
     private $_targetPath;
     private $_isRecursive;
-    private $_excludePatterns = array('!^CVS$!',
-                                      '!^.svn!',
-                                      '!\.swp$!',
-                                      '!~$!',
-                                      '!\.bak$!',
-                                      '!^#.+#$!'
-                                      );
     private $_testCases = array();
 
@@ -111 +105 @@
 
     /**
-     * Collects test cases.
+     * Collects tests.
      *
      * @return mixed
@@ -136 +130 @@
 
         if (is_dir($absoluteTargetPath)) {
-            $this->_collectTestCases($absoluteTargetPath);
+            $directoryScanner = new Stagehand_TestRunner_DirectoryScanner(array($this, 'collectTestCases'), $this->_isRecursive);
+            $directoryScanner->scan($absoluteTargetPath);
         } else {
-            $this->_collectTestCaseFromFile($absoluteTargetPath);
+            $this->_collectTestCasesFromFile($absoluteTargetPath);
         }
 
         return $this->_buildTestSuite();
+    }
+
+    // }}}
+    // {{{ collectTestCases()
+
+    /**
+     * Collects all test cases included in the specified directory.
+     *
+     * @param string $element
+     */
+    public function collectTestCases($element)
+    {
+        if (is_file($element)) {
+            $this->_collectTestCasesFromFile($element);
+        }
     }
 
@@ -226 +236 @@
 
     // }}}
-    // {{{ _collectTestCases()
-
-    /**
-     * Collects all test cases included in the specified directory.
-     *
-     * @param string $directory
-     */
-    private function _collectTestCases($directory)
-    {
-        $files = scandir($directory);
-        for ($i = 0, $count = count($files); $i < $count; ++$i) {
-            if ($files[$i] == '.' || $files[$i] == '..') {
-                continue;
-            }
-
-            foreach ($this->_excludePatterns as $excludePattern) {
-                if (preg_match($excludePattern, $files[$i])) {
-                    continue 2;
-                }
-            }
-
-            $element = $directory . DIRECTORY_SEPARATOR . $files[$i];
-            if (is_dir($element) && $this->_isRecursive) {
-                $this->_collectTestCases($element);
-                continue;
-            }
-
-            $this->_collectTestCaseFromFile($element);
-        }
-    }
-
-    // }}}
-    // {{{ _collectTestCaseFromFile()
+    // {{{ _collectTestCasesFromFile()
 
     /**
@@ -265 +243 @@
      * @param string $file
      */
-    private function _collectTestCaseFromFile($file)
+    private function _collectTestCasesFromFile($file)
     {
         if (!preg_match("/{$this->_suffix}\.php\$/", $file)) {