Changeset 118

Timestamp:

02/29/08 19:14:02 (11 months ago)

Author:

iteman

Message:

- Added support for specifying a target directory.

Location:

trunk/src/Stagehand

Files:

• TestRunner.php (modified) (5 diffs)
• TestRunner/Common.php (modified) (4 diffs)
• TestRunner/Exception.php (added)

trunk/src/Stagehand/TestRunner.php

@@ -104 +104 @@
         $isRecursive = false;
         $color = false;
-        $isFile = false;
         foreach ($allOptions as $options) {
             if (!count($options)) {
@@ -130 +129 @@
                 } else {
                     $directory = $option;
-                    $isFile = true;
                 }
             }
@@ -137 +135 @@
         include_once "Stagehand/TestRunner/$testRunnerName.php";
         $className = "Stagehand_TestRunner_$testRunnerName";
-        $testRunner = new $className($color, $isFile, $directory, $isRecursive);
+        try {
+            $testRunner = new $className($color, $directory, $isRecursive);
+        } catch (Stagehand_TestRunner_Exception $e) {
+            echo 'ERROR: ' . $e->getMessage() . "\n";
+            self::_displayUsage();
+            return 1;
+        }
+
         $testRunner->run();
 
@@ -164 +169 @@
     private static function _displayUsage()
     {
-        echo "Usage: {$_SERVER['SCRIPT_NAME']} [options] [testcase]
+        echo "Usage: {$_SERVER['SCRIPT_NAME']} [options] [directory or file]
 
 Options:
@@ -173 +178 @@
   -p <file> preload <file> as a PHP script
 
-With no [testcase], run all tests in the current directory.
+With no [directory or file], run all tests in the current directory.
 ";
     }

trunk/src/Stagehand/TestRunner/Common.php

@@ -36 +36 @@
  */
 
+require_once 'Stagehand/TestRunner/Exception.php';
+
 // {{{ Stagehand_TestRunner_Common
 
@@ -74 +76 @@
      */
 
-    private $_isFile;
-    private $_directory;
+    private $_targetPath;
     private $_isRecursive;
 
@@ -89 +90 @@
     /**
      * @param boolean $color
-     * @param boolean $isFile
-     * @param string  $directory
+     * @param string  $targetPath
      * @param boolean $isRecursive
-     */
-    public function __construct($color, $isFile, $directory, $isRecursive)
-    {
-        if ($isRecursive || is_null($directory)) {
-            $directory = getcwd();
-        }
-
-        if ($isFile) {
-            if (!preg_match("/{$this->_suffix}\.php\$/", $directory)) {
-                $directory = "$directory{$this->_suffix}.php";
-            }
-        }
-
-        $this->_directory = $directory;
+     * @throws Stagehand_TestRunner_Exception
+     */
+    public function __construct($color, $targetPath, $isRecursive)
+    {
+        if (is_null($targetPath)) {
+            $absoluteTargetPath = getcwd();
+        } else {
+            if (!file_exists($targetPath)) {
+                if (preg_match("/{$this->_suffix}\.php\$/", $targetPath)) {
+                    throw new Stagehand_TestRunner_Exception("The directory or file [ $targetPath ] is not found.");
+                }
+
+                $targetPath = "$targetPath{$this->_suffix}.php";
+            }
+
+            $absoluteTargetPath = realpath($targetPath);
+            if ($absoluteTargetPath === false) {
+                throw new Stagehand_TestRunner_Exception("The directory or file [ $targetPath ] is not found.");
+            }
+        }
+
+        $this->_targetPath = $absoluteTargetPath;
         $this->_color = $color;
-        $this->_isRecursive = $isRecursive;
+        $this->_isRecursive = is_dir($absoluteTargetPath) && $isRecursive;
     }
 
@@ -122 +130 @@
         if ($this->_isRecursive) {
             $suite = $this->_createTestSuite();
-            $directories = $this->_getDirectories($this->_directory);
+            $directories = $this->_getDirectories($this->_targetPath);
             for ($i = 0, $count = count($directories); $i < $count; ++$i) {
                 $this->_buildTestSuite($suite, $directories[$i]);
             }
         } else {
-            $suite = $this->_buildTestSuite($this->_createTestSuite(), $this->_directory);
+            $suite = $this->_buildTestSuite($this->_createTestSuite(), $this->_targetPath);
         }