From dbff568ed647116aae229a6190dbdbee0fe247ae Mon Sep 17 00:00:00 2001 From: skodak Date: Sat, 10 Jan 2009 14:02:31 +0000 Subject: [PATCH] MDL-17842 removed slowtest support from unittest report - never used, not needed --- admin/report/unittest/ex_simple_test.php | 9 +++------ admin/report/unittest/index.php | 6 ++---- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/admin/report/unittest/ex_simple_test.php b/admin/report/unittest/ex_simple_test.php index 49093e6b29..de1504d654 100644 --- a/admin/report/unittest/ex_simple_test.php +++ b/admin/report/unittest/ex_simple_test.php @@ -24,13 +24,11 @@ require_once($CFG->libdir . '/simpletestlib/test_case.php'); */ class AutoGroupTest extends GroupTest { - var $thorough; var $showsearch; - function AutoGroupTest($showsearch, $thorough, $test_name = null) { + function AutoGroupTest($showsearch, $test_name = null) { $this->GroupTest($test_name); $this->showsearch = $showsearch; - $this->thorough = $thorough; } function run(&$reporter) { @@ -68,8 +66,7 @@ class AutoGroupTest extends GroupTest { if ($file != 'CVS' && !in_array($file_path, $this->ignorefolders)) { $this->_recurseFolders($file_path); } - } elseif (preg_match('/simpletest(\/|\\\\)test.*\.php$/', $file_path) || - ($this->thorough && preg_match('/simpletest(\/|\\\\)slowtest.*\.php$/', $file_path))) { + } elseif (preg_match('/simpletest(\/|\\\\)test.*\.php$/', $file_path)) { $s_count++; // OK, found: this shows as a 'Notice' for any 'simpletest/test*.php' file. @@ -216,4 +213,4 @@ class BadAutoGroupTest extends BadTest { } class AutoGroupTestNotice extends Notice { } class FindFileNotice extends Notice { } -?> \ No newline at end of file +?> diff --git a/admin/report/unittest/index.php b/admin/report/unittest/index.php index fffc4006d2..f8ccc9386c 100644 --- a/admin/report/unittest/index.php +++ b/admin/report/unittest/index.php @@ -21,7 +21,6 @@ $path = optional_param('path', null, PARAM_PATH); $showpasses = optional_param('showpasses', false, PARAM_BOOL); $showsearch = optional_param('showsearch', false, PARAM_BOOL); $rundbtests = optional_param('rundbtests', false, PARAM_BOOL); -$thorough = optional_param('thorough', false, PARAM_BOOL); $addconfigprefix = optional_param('addconfigprefix', false, PARAM_RAW); $setuptesttables = optional_param('setuptesttables', false, PARAM_BOOL); $upgradetesttables = optional_param('upgradetesttables', false, PARAM_BOOL); @@ -34,7 +33,7 @@ if ($setuptesttables || $continuesetuptesttables || $upgradetesttables) { $CFG->xmlstrictheaders = false; } admin_externalpage_setup('reportsimpletest', '', array('showpasses' => $showpasses, - 'showsearch' => $showsearch, 'thorough' => $thorough)); + 'showsearch' => $showsearch)); admin_externalpage_print_header(); $langfile = 'simpletest'; @@ -196,7 +195,7 @@ $CFG = $real_cfg; if (!is_null($path)) { // Create the group of tests. - $test = new AutoGroupTest($showsearch, $thorough); + $test = new AutoGroupTest($showsearch); // OU specific. We use the _nonproject folder for stuff we want to // keep in CVS, but which is not really relevant. It does no harm @@ -265,7 +264,6 @@ echo '
'; echo '
'; echo '

'; print_checkbox('showpasses', 1, $showpasses, get_string('showpasses', $langfile)); echo '

'; echo '

'; print_checkbox('showsearch', 1, $showsearch, get_string('showsearch', $langfile)); echo '

'; -echo '

'; print_checkbox('thorough', 1, $thorough, get_string('thorough', $langfile)); echo '

'; echo '

'; echo ' '; echo ''; -- 2.39.5