MINOR: exclude functional tests when running just framework module tests

This commit is contained in:
Will Rossiter 2012-06-19 22:33:19 +12:00 committed by Ingo Schommer
parent 3eff92ad40
commit eb2a0427cc

View File

@ -129,7 +129,7 @@ class TestRunner extends Controller {
$reflection = new ReflectionClass($class); $reflection = new ReflectionClass($class);
if(!$reflection->isInstantiable()) unset($tests[$class]); if(!$reflection->isInstantiable()) unset($tests[$class]);
} }
$this->runTests($tests, $coverage); $this->runTests($tests, $coverage);
} }
@ -236,18 +236,21 @@ class TestRunner extends Controller {
$classNames = array(); $classNames = array();
$moduleNames = explode(',', $request->param('ModuleName')); $moduleNames = explode(',', $request->param('ModuleName'));
$ignored = array('functionaltest', 'phpsyntaxtest');
foreach($moduleNames as $moduleName) { foreach($moduleNames as $moduleName) {
$classesForModule = ClassInfo::classes_for_folder($moduleName); $classesForModule = ClassInfo::classes_for_folder($moduleName);
if($classesForModule) { if($classesForModule) {
foreach($classesForModule as $className) { foreach($classesForModule as $className) {
if(class_exists($className) && is_subclass_of($className, 'SapphireTest')) { if(class_exists($className) && is_subclass_of($className, 'SapphireTest')) {
$classNames[] = $className; if(!in_array($className, $ignored))
$classNames[] = $className;
} }
} }
} }
} }
$this->runTests($classNames, $coverage); $this->runTests($classNames, $coverage);
} }