MDL-14905 towards functional DB tests

diff --git a/admin/report/simpletest/dbtest.php b/admin/report/simpletest/dbtest.php
index ac3bb689b3ac37fa9a781cca63fcdf6782487c93..b123cea95fffcc34f1541e9ff7cfeb51e7025af4 100644 (file)
--- a/admin/report/simpletest/dbtest.php
+++ b/admin/report/simpletest/dbtest.php
@@ -118,7 +118,7 @@ echo '<p>External databases are configured in config.php, add lines:
 $CFG->func_test_db_1 = array("adodb", "postgres7", "localhost", "moodleuser", "password", "moodle", false, "test", null);
 $CFG->func_test_db_2 = array("adodb", "mssql", "localhost", "moodleuser", "password", "moodle", false, "test", null);
 </pre>
-where order of parameters is: $library, $driver, $dbhost, $dbuser, $dbpass, $dbname, $dbpersist, $prefix, $dboptions
+where order of parameters is: dblibrary, dbtype, dbhost, dbuser, dbpass, dbname, dbpersist, prefix, dboptions
 </p>';
 echo '<p><input type="submit" value="' . get_string('runtests', 'simpletest') . '" /></p>';
 echo '</div>';

diff --git a/admin/report/simpletest/index.php b/admin/report/simpletest/index.php
index a03628b8e4fde03fb9a540dd4270400e60d02ecd..b3ce593dd2c0c347e0b1b177e78e71f63878b4ef 100644 (file)
--- a/admin/report/simpletest/index.php
+++ b/admin/report/simpletest/index.php
@@ -92,9 +92,6 @@ if (!is_null($path)) {
             $title = get_string('moodleunittests', $langfile, $displaypath);
         }
         print_heading($title);
-        /* The UNITTEST constant can be checked elsewhere if you need to know
-         * when your code is being run as part of a unit test. */
-        define('UNITTEST', true);
         $test->run($reporter);
     }
 

diff --git a/admin/report/simpletest/settings.php b/admin/report/simpletest/settings.php
index 7c8c3f90e612b3aeec2f2959ce57dcbc9236c756..437a2788d445f5ff6246f3916cbc75073073112c 100644 (file)
--- a/admin/report/simpletest/settings.php
+++ b/admin/report/simpletest/settings.php
@@ -7,4 +7,4 @@ if ($reportname[1] == '[') {
 $ADMIN->add('reports', new admin_externalpage('reportsimpletest', $reportname, "$CFG->wwwroot/$CFG->admin/report/simpletest/index.php",'moodle/site:config'));
 
 //TODO: localise
-$ADMIN->add('reports', new admin_externalpage('reportdbtest', 'Functional DB tests', "$CFG->wwwroot/$CFG->admin/report/simpletest/dbtest.php",'moodle/site:config', true));
+$ADMIN->add('reports', new admin_externalpage('reportdbtest', 'Functional DB tests', "$CFG->wwwroot/$CFG->admin/report/simpletest/dbtest.php",'moodle/site:config'));