MINOR: Don't use test manifest for dev/startsession and dev/endsession (from r93528) (from r94431)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@94432 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2009-12-06 02:49:12 +00:00
parent 1eb9fe83c1
commit 974b25920d

View File

@ -65,7 +65,6 @@ class TestRunner extends Controller {
$canAccess = (Director::isDev() || Director::is_cli() || Permission::check("ADMIN")); $canAccess = (Director::isDev() || Director::is_cli() || Permission::check("ADMIN"));
if(!$canAccess) return Security::permissionFailure($this); if(!$canAccess) return Security::permissionFailure($this);
ManifestBuilder::load_test_manifest();
if (!self::$default_reporter) self::set_reporter(Director::is_cli() ? 'CliDebugView' : 'DebugView'); if (!self::$default_reporter) self::set_reporter(Director::is_cli() ? 'CliDebugView' : 'DebugView');
if(!hasPhpUnit()) { if(!hasPhpUnit()) {
@ -82,6 +81,7 @@ class TestRunner extends Controller {
* Currently excludes PhpSyntaxTest * Currently excludes PhpSyntaxTest
*/ */
function all() { function all() {
ManifestBuilder::load_test_manifest();
$tests = ClassInfo::subclassesFor('SapphireTest'); $tests = ClassInfo::subclassesFor('SapphireTest');
array_shift($tests); array_shift($tests);
unset($tests['FunctionalTest']); unset($tests['FunctionalTest']);
@ -101,6 +101,7 @@ class TestRunner extends Controller {
* Run test classes that should be run before build - i.e., everything possible. * Run test classes that should be run before build - i.e., everything possible.
*/ */
function build() { function build() {
ManifestBuilder::load_test_manifest();
$tests = ClassInfo::subclassesFor('SapphireTest'); $tests = ClassInfo::subclassesFor('SapphireTest');
array_shift($tests); array_shift($tests);
unset($tests['FunctionalTest']); unset($tests['FunctionalTest']);
@ -118,6 +119,7 @@ class TestRunner extends Controller {
* Browse all enabled test cases in the environment * Browse all enabled test cases in the environment
*/ */
function browse() { function browse() {
ManifestBuilder::load_test_manifest();
self::$default_reporter->writeHeader(); self::$default_reporter->writeHeader();
self::$default_reporter->writeInfo('Available Tests', false); self::$default_reporter->writeInfo('Available Tests', false);
if(Director::is_cli()) { if(Director::is_cli()) {
@ -146,6 +148,9 @@ class TestRunner extends Controller {
} }
function coverage() { function coverage() {
ManifestBuilder::load_test_manifest();
ManifestBuilder::load_all_classes();
$tests = ClassInfo::subclassesFor('SapphireTest'); $tests = ClassInfo::subclassesFor('SapphireTest');
array_shift($tests); array_shift($tests);
unset($tests['FunctionalTest']); unset($tests['FunctionalTest']);
@ -161,6 +166,7 @@ class TestRunner extends Controller {
* Run only a single test class or a comma-separated list of tests * Run only a single test class or a comma-separated list of tests
*/ */
function only($request) { function only($request) {
ManifestBuilder::load_test_manifest();
if($request->param('TestCase') == 'all') { if($request->param('TestCase') == 'all') {
$this->all(); $this->all();
} else { } else {
@ -180,6 +186,7 @@ class TestRunner extends Controller {
* A module is generally a toplevel folder, e.g. "mysite" or "sapphire". * A module is generally a toplevel folder, e.g. "mysite" or "sapphire".
*/ */
function module($request) { function module($request) {
ManifestBuilder::load_test_manifest();
$classNames = array(); $classNames = array();
$moduleNames = explode(',', $request->param('ModuleName')); $moduleNames = explode(',', $request->param('ModuleName'));
foreach($moduleNames as $moduleName) { foreach($moduleNames as $moduleName) {