Changeset 100

Timestamp:

12/19/07 11:09:29 (13 months ago)

Author:

iteman

Message:

- Fixed the defect that an unexpected class to be marked as a target.
- Refactored.

Files:

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

trunk/src/Stagehand/TestRunner/Common.php

@@ -231 +231 @@
 
     // }}}
-    // {{{ _exclude()
-
-    /**
-     * Returns whether the class should be exclude or not.
-     *
-     * @param string $class
-     * @return boolean
-     */
-    private function _exclude($class)
-    {
-        if (!is_null($this->_excludePattern) && preg_match($this->_excludePattern, $class)) {
-            return true;
-        }
-
-        return !is_subclass_of($class, $this->_baseClass);
-    }
-
-    // }}}
     // {{{ _collectTestCases()
 
@@ -294 +276 @@
             $newClasses = array_values(array_diff(get_declared_classes(), $currentClasses));
             for ($j = 0, $jCount = count($newClasses); $j < $jCount; ++$j) {
-                if ($this->_exclude($newClasses[$j])) {
+                if (!is_subclass_of($newClasses[$j], $this->_baseClass)) {
                     continue;
                 }
 
-                if (!$this->_include($newClasses[$j])) {
+                if (!is_null($this->_excludePattern)
+                    && preg_match($this->_excludePattern, $newClasses[$j])
+                    ) {
+                    continue;
+                }
+
+                if (!is_null($this->_includePattern)
+                    && !preg_match($this->_includePattern, $newClasses[$j])
+                    ) {
                     continue;
                 }
@@ -344 +334 @@
 
         return $directories;
-    }
-
-    // }}}
-    // {{{ _include()
-
-    /**
-     * Returns whether the class should be include or not.
-     *
-     * @param string $class
-     * @return boolean
-     */
-    private function _include($class)
-    {
-        if (!is_null($this->_includePattern) && preg_match($this->_includePattern, $class)) {
-            return true;
-        }
-
-        return is_subclass_of($class, $this->_baseClass);
     }