Changeset 119

Timestamp:

02/29/08 22:47:35 (11 months ago)

Author:

iteman

Message:

- Refactored.

Files:

• trunk/src/Stagehand/TestRunner/Common.php (modified) (2 diffs)

trunk/src/Stagehand/TestRunner/Common.php

@@ -76 +76 @@
      */
 
-    private $_targetPath;
-    private $_isRecursive;
+    private $_suite;
 
     /**#@-*/
@@ -113 +112 @@
         }
 
-        $this->_targetPath = $absoluteTargetPath;
-        $this->_color = $color;
-        $this->_isRecursive = is_dir($absoluteTargetPath) && $isRecursive;
-    }
-
-    // }}}
-    // {{{ run()
-
-    /**
-     * Runs tests in the directory.
-     *
-     * @return stdClass
-     */
-    public function run()
-    {
-        if ($this->_isRecursive) {
+        if (is_dir($absoluteTargetPath) && $isRecursive) {
             $suite = $this->_createTestSuite();
-            $directories = $this->_getDirectories($this->_targetPath);
+            $directories = $this->_getDirectories($absoluteTargetPath);
             for ($i = 0, $count = count($directories); $i < $count; ++$i) {
                 $this->_buildTestSuite($suite, $directories[$i]);
             }
         } else {
-            $suite = $this->_buildTestSuite($this->_createTestSuite(), $this->_targetPath);
-        }
-
-        return $this->_doRun($suite);
+            $suite = $this->_buildTestSuite($this->_createTestSuite(), $absoluteTargetPath);
+        }
+
+        $this->_suite = $suite;
+        $this->_color = $color;
+    }
+
+    // }}}
+    // {{{ run()
+
+    /**
+     * Runs tests in the directory.
+     *
+     * @return stdClass
+     */
+    public function run()
+    {
+        return $this->_doRun($this->_suite);
     }