Changeset 141

Timestamp:

03/06/08 12:05:24 (10 months ago)

Author:

iteman

Message:

- Fixed a defect that caused a target directory for autotest to be empty if a test directory is not specified.

Location:

trunk/src/Stagehand

Files:

• TestRunner.php (modified) (1 diff)
• TestRunner/Collector/Common.php (modified) (1 diff)

trunk/src/Stagehand/TestRunner.php

@@ -258 +258 @@
         }
 
-        $directory = null;
+        $directory = getcwd();
         $isRecursive = false;
         $color = false;

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

@@ -112 +112 @@
     public function collect()
     {
-        if (is_null($this->_targetPath)) {
-            $absoluteTargetPath = getcwd();
-        } else {
-            if (!file_exists($this->_targetPath)) {
-                if (preg_match("/{$this->_suffix}\.php\$/", $this->_targetPath)) {
-                    throw new Stagehand_TestRunner_Exception("The directory or file [ {$this->_targetPath} ] is not found.");
-                }
-
-                $this->_targetPath = "{$this->_targetPath}{$this->_suffix}.php";
-            }
-
-            $absoluteTargetPath = realpath($this->_targetPath);
-            if ($absoluteTargetPath === false) {
+        if (!file_exists($this->_targetPath)) {
+            if (preg_match("/{$this->_suffix}\.php\$/", $this->_targetPath)) {
                 throw new Stagehand_TestRunner_Exception("The directory or file [ {$this->_targetPath} ] is not found.");
             }
+
+            $this->_targetPath = "{$this->_targetPath}{$this->_suffix}.php";
+        }
+
+        $absoluteTargetPath = realpath($this->_targetPath);
+        if ($absoluteTargetPath === false) {
+            throw new Stagehand_TestRunner_Exception("The directory or file [ {$this->_targetPath} ] is not found.");
         }