MDL-17843 - db unit tests are now always included again; lang string not needed anymore

diff --git a/admin/report/unittest/index.php b/admin/report/unittest/index.php
index f8ccc9386c20495b8d560aca6bcd6a4aeedcf3db..5aae637eff8e57abe7658b24a37c2ba757f5724e 100644 (file)
--- a/admin/report/unittest/index.php
+++ b/admin/report/unittest/index.php
@@ -20,7 +20,6 @@ require_once('ex_reporter.php');
 $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);
 $addconfigprefix = optional_param('addconfigprefix', false, PARAM_RAW);
 $setuptesttables = optional_param('setuptesttables', false, PARAM_BOOL);
 $upgradetesttables = optional_param('upgradetesttables', false, PARAM_BOOL);
@@ -201,8 +200,6 @@ if (!is_null($path)) {
     // keep in CVS, but which is not really relevant. It does no harm
     // to leave this here.
     $test->addIgnoreFolder($CFG->dirroot . '/_nonproject');
-    $test->addIgnoreFolder($CFG->libdir . '/ddl');
-    $test->addIgnoreFolder($CFG->libdir . '/dml');
 
     // Make the reporter, which is what displays the results.
     $reporter = new ExHtmlReporter($showpasses);
@@ -231,16 +228,6 @@ if (!is_null($path)) {
         $ok = false;
     }
 
-    // Add ddl and dml tests if requested
-    if ($rundbtests) {
-        if (!strstr($path, $CFG->libdir . '/ddl')) {
-            $test->addTestFile($CFG->libdir . '/ddl/simpletest/testddl.php');
-        }
-        if (!strstr($path, $CFG->libdir . '/dml')) {
-            $test->addTestFile($CFG->libdir . '/dml/simpletest/testdml.php');
-        }
-    }
-
     // If we have something to test, do it.
     if ($ok) {
         if ($path == $CFG->dirroot) {
@@ -268,7 +255,6 @@ echo '<p>';
     echo '<label for="path">', get_string('onlytest', $langfile), '</label> ';
     echo '<input type="text" id="path" name="path" value="', $displaypath, '" size="40" />';
 echo '</p>';
-echo '<p>'; print_checkbox('rundbtests', 1, $rundbtests, get_string('rundbtests', $langfile)); echo '</p>'; // TODO: localise
 echo '<input type="submit" value="' . get_string('runtests', $langfile) . '" />';
 echo '</fieldset>';
 echo '</form>';

diff --git a/lang/en_utf8/simpletest.php b/lang/en_utf8/simpletest.php
index a0db5f772361a8a0d394c8fb63fe367f563896a6..57ebef927fd2258721952352c129e89e046426a3 100644 (file)
--- a/lang/en_utf8/simpletest.php
+++ b/lang/en_utf8/simpletest.php
@@ -26,7 +26,6 @@ $string['retest'] = 'Re-run the tests';
 $string['retestonlythisfile'] = 'Re-run only this test file.';
 $string['runall'] = 'Run the tests from all the test files.';
 $string['runat'] = 'Run at $a.';
-$string['rundbtests'] = 'Run the database tests too.';
 $string['runonlyfile'] = 'Run only the tests in this file';
 $string['runonlyfolder'] = 'Run only the tests in this folder';
 $string['runtests'] = 'Run tests';