MDL-10063 simpletestlib.php included from majority of unit tests - let's include...

diff --git a/admin/report/simpletest/ex_reporter.php b/admin/report/simpletest/ex_reporter.php
index 6bae1fba1c6f768209eb4472a4bd591d31a98998..771ae9b645d7fbdeef7a194003a784ce229170b5 100644 (file)
--- a/admin/report/simpletest/ex_reporter.php
+++ b/admin/report/simpletest/ex_reporter.php
@@ -10,8 +10,6 @@
  */
 
 /** */
-require_once(dirname(__FILE__) . '/../../../config.php');
-require_once($CFG->libdir . '/moodlelib.php');
 require_once($CFG->libdir . '/simpletestlib/reporter.php');
 
 /**

diff --git a/admin/report/simpletest/ex_simple_test.php b/admin/report/simpletest/ex_simple_test.php
index 72b8d6197e0d396985371179f63aea2c18ae564f..b6f85f2feeee5d167d2bcb91994ddb12012f00d1 100644 (file)
--- a/admin/report/simpletest/ex_simple_test.php
+++ b/admin/report/simpletest/ex_simple_test.php
@@ -11,7 +11,6 @@
  */
 
 /** */
-require_once(dirname(__FILE__) . '/../../../config.php');
 require_once($CFG->libdir . '/simpletestlib/test_case.php');
 
 /**

diff --git a/admin/report/simpletest/index.php b/admin/report/simpletest/index.php
index 806b1cecf01cda34fe6e0eb61bd64b72912b5465..974966e419605bd0398a7a5640b66431ac02ca42 100644 (file)
--- a/admin/report/simpletest/index.php
+++ b/admin/report/simpletest/index.php
@@ -10,9 +10,9 @@
  */
 
 /** */
-require_once(dirname(__FILE__) . '/../../../config.php');
-require_once($CFG->libdir . '/moodlelib.php');
+require_once(dirname(__FILE__).'/../../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
+require_once($CFG->libdir.'/simpletestlib.php');
 require_once('ex_simple_test.php');
 require_once('ex_reporter.php');
 

diff --git a/group/simpletest/test_basicgrouplib.php b/group/simpletest/test_basicgrouplib.php
index fb55d2e2fed5aa243ca42f617bc671f53bb7a6a9..83dc63ca0a1e9ab568cfd4ef8b710e3a1409b661 100644 (file)
--- a/group/simpletest/test_basicgrouplib.php
+++ b/group/simpletest/test_basicgrouplib.php
@@ -14,7 +14,6 @@
 require_once(dirname(__FILE__) . '/../../config.php');
 
 global $CFG;
-require_once($CFG->libdir . '/simpletestlib.php');
 require_once($CFG->dirroot . '/group/lib/basicgrouplib.php');
 require_once($CFG->dirroot . '/group/lib/utillib.php');
 

diff --git a/group/simpletest/test_groupinglib.php b/group/simpletest/test_groupinglib.php
index 1cbf4d6e7097b492a9e4382d604f2ef2a740360c..7fbe6666ab73575322c8d7d1525956bd2f2c3008 100644 (file)
--- a/group/simpletest/test_groupinglib.php
+++ b/group/simpletest/test_groupinglib.php
@@ -10,7 +10,6 @@
 require_once(dirname(__FILE__) . '/../../config.php');
 
 global $CFG;
-require_once($CFG->libdir . '/simpletestlib.php');
 require_once($CFG->dirroot . '/group/lib/groupinglib.php');
 
 class groupinglib_test extends UnitTestCase {

diff --git a/lib/simpletest/fixtures/gradetest.php b/lib/simpletest/fixtures/gradetest.php
index ebb0f572bc321259cbe1714d6c01385cbf237ae0..881e18f8b97f2bd27435340844b43b89b0815912 100644 (file)
--- a/lib/simpletest/fixtures/gradetest.php
+++ b/lib/simpletest/fixtures/gradetest.php
@@ -32,7 +32,6 @@
  */
 
 global $CFG;
-require_once($CFG->libdir . '/simpletestlib.php');
 require_once($CFG->libdir . '/gradelib.php');
 require_once($CFG->libdir . '/dmllib.php');
 require_once($CFG->libdir . '/ddllib.php');

diff --git a/lib/simpletest/slowtestcode.php b/lib/simpletest/slowtestcode.php
index f1ae71676cc04b7c17bf9611286df7b17d31349b..2c5867906a22332fbdb2f8b178a9de699db59c3e 100644 (file)
--- a/lib/simpletest/slowtestcode.php
+++ b/lib/simpletest/slowtestcode.php
@@ -12,7 +12,6 @@
 require_once(dirname(__FILE__) . '/../../config.php');
 
 global $CFG;
-require_once($CFG->libdir . '/simpletestlib.php');
 
 class slow_code_test extends UnitTestCase {
     var $php_code_extensions = array('php', 'html', 'php\.inc');

diff --git a/lib/simpletest/testajaxlib.php b/lib/simpletest/testajaxlib.php
index 74d5f9abfe0b08e81ed39037cdaa48c1f4fcddca..768613872095049ce81bdc4731f30b4767c6893f 100644 (file)
--- a/lib/simpletest/testajaxlib.php
+++ b/lib/simpletest/testajaxlib.php
@@ -36,7 +36,6 @@
 require_once(dirname(__FILE__) . '/../../config.php');
 
 global $CFG;
-require_once($CFG->libdir . '/simpletestlib.php');
 require_once($CFG->libdir . '/moodlelib.php');
 require_once($CFG->libdir . '/ajax/ajaxlib.php');
 

diff --git a/lib/simpletest/testcode.php b/lib/simpletest/testcode.php
index f12ed0ecce945a9cff6d95ec676141895fec8ab1..965e54225ba0a2dc05a017242c6d18f99913a751 100644 (file)
--- a/lib/simpletest/testcode.php
+++ b/lib/simpletest/testcode.php
@@ -12,7 +12,6 @@
 require_once(dirname(__FILE__) . '/../../config.php');
 
 global $CFG;
-require_once($CFG->libdir . '/simpletestlib.php');
 
 class code_test extends UnitTestCase {
     var $allok = array();

diff --git a/lib/simpletest/testdmllib.php b/lib/simpletest/testdmllib.php
index ae21794f0770e783cbc30a40eee57f5137f48748..91eb087586af6234bad79fc589b3545192466ee7 100644 (file)
--- a/lib/simpletest/testdmllib.php
+++ b/lib/simpletest/testdmllib.php
@@ -12,7 +12,6 @@
 require_once(dirname(__FILE__) . '/../../config.php');
 
 global $CFG;
-require_once($CFG->libdir . '/simpletestlib.php');
 require_once($CFG->libdir . '/simpletestlib/web_tester.php');
 require_once($CFG->libdir . '/dmllib.php');
 

diff --git a/lib/simpletest/testeventslib.php b/lib/simpletest/testeventslib.php
index a0b4088e7e4ee53b55c52e6c2ba11c87c8ef6ad4..f6e6f47da081909e226fa2bf623866c41b4810fc 100755 (executable)
--- a/lib/simpletest/testeventslib.php
+++ b/lib/simpletest/testeventslib.php
@@ -7,7 +7,6 @@ if (!defined('MOODLE_INTERNAL')) {
 }
 
 global $CFG;
-require_once($CFG->libdir . '/simpletestlib.php');
 
 // test handler function
 function sample_function_handler($eventdata) {

diff --git a/lib/simpletest/testmathslib.php b/lib/simpletest/testmathslib.php
index 4f6d02e16b49846c6a080d3496e188972c923773..3e34be810e28d2a361fb85d54d62d3588df84435 100755 (executable)
--- a/lib/simpletest/testmathslib.php
+++ b/lib/simpletest/testmathslib.php
@@ -5,7 +5,6 @@ if (!defined('MOODLE_INTERNAL')) {
 }
 
 global $CFG;
-require_once($CFG->libdir . '/simpletestlib.php');
 require_once($CFG->libdir . '/mathslib.php');
 
 /**

diff --git a/lib/simpletest/testmodforumlib.php b/lib/simpletest/testmodforumlib.php
index 2e70d54a416b271e50864b5fd59a9af1a0ca9e1d..7e9e6abfc3c39e4c7bd36f51fb83252237f8723a 100644 (file)
--- a/lib/simpletest/testmodforumlib.php
+++ b/lib/simpletest/testmodforumlib.php
@@ -37,7 +37,6 @@
 require_once(dirname(__FILE__) . '/../../config.php');
 
 global $CFG;
-require_once($CFG->libdir . '/simpletestlib.php');
 require_once($CFG->dirroot . '/mod/forum/lib.php');
 
 class modforumlib_test extends UnitTestCase {

diff --git a/lib/simpletest/testmoodlelib.php b/lib/simpletest/testmoodlelib.php
index 373544a02df3cb6615197ce8f6ae6c523c4ebbe9..407fb571dc542a3b1ca139ed5051e41800f53a3b 100644 (file)
--- a/lib/simpletest/testmoodlelib.php
+++ b/lib/simpletest/testmoodlelib.php
@@ -37,7 +37,6 @@
 require_once(dirname(__FILE__) . '/../../config.php');
 
 global $CFG;
-require_once($CFG->libdir . '/simpletestlib.php');
 require_once($CFG->libdir . '/moodlelib.php');
 
 class moodlelib_test extends UnitTestCase {

diff --git a/lib/simpletest/testweblib.php b/lib/simpletest/testweblib.php
index 025209ee5fd4f89d7065190daf556691e0612b5c..a434e44f5fe41ad7d3df6d6c69da3a91f670fc70 100644 (file)
--- a/lib/simpletest/testweblib.php
+++ b/lib/simpletest/testweblib.php
@@ -12,8 +12,6 @@
 require_once(dirname(__FILE__) . '/../../config.php');
 
 global $CFG;
-require_once($CFG->libdir . '/simpletestlib.php');
-require_once($CFG->libdir . '/weblib.php');
 
 class web_test extends UnitTestCase {
 

diff --git a/mod/data/simpletest/testpreset.php b/mod/data/simpletest/testpreset.php
index 14d7a717ea7a48312287d4e02f68865424e41354..5368db1384622635d9f379096d5a8e8a9a86de73 100644 (file)
--- a/mod/data/simpletest/testpreset.php
+++ b/mod/data/simpletest/testpreset.php
@@ -35,7 +35,6 @@
 require_once(dirname(__FILE__) . '/../../../config.php');
 
 global $CFG;
-require_once($CFG->libdir . '/simpletestlib.php');
 require_once($CFG->dirroot . '/mod/data/preset_class.php');
 
 class data_preset_test extends UnitTestCase {

diff --git a/question/type/numerical/simpletest/testquestiontype.php b/question/type/numerical/simpletest/testquestiontype.php
index 302ac749df12d6e65abd9275dd1710193bd7105e..60cc635b85b5f2624534868ce2aedf8dd8401b74 100644 (file)
--- a/question/type/numerical/simpletest/testquestiontype.php
+++ b/question/type/numerical/simpletest/testquestiontype.php
@@ -12,7 +12,6 @@
 require_once(dirname(__FILE__) . '/../../../../config.php');
 
 global $CFG;
-require_once($CFG->libdir . '/simpletestlib.php');
 require_once($CFG->dirroot . '/question/type/numerical/questiontype.php');
 
 class question_numerical_qtype_test extends UnitTestCase {