From: skodak <skodak>
Date: Sat, 9 Jun 2007 16:17:33 +0000 (+0000)
Subject: MDL-10063 simpletestlib.php included from majority of unit tests - let's include... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=52f81103d3aecbb106d231f4dc65cfbb2630d87f;p=moodle.git

MDL-10063 simpletestlib.php included from majority of unit tests - let's include it once from the test runner itself
---

diff --git a/admin/report/simpletest/ex_reporter.php b/admin/report/simpletest/ex_reporter.php
index 6bae1fba1c..771ae9b645 100644
--- 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 72b8d6197e..b6f85f2fee 100644
--- 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 806b1cecf0..974966e419 100644
--- 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 fb55d2e2fe..83dc63ca0a 100644
--- 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 1cbf4d6e70..7fbe6666ab 100644
--- 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 ebb0f572bc..881e18f8b9 100644
--- 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 f1ae71676c..2c5867906a 100644
--- 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 74d5f9abfe..7686138720 100644
--- 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 f12ed0ecce..965e54225b 100644
--- 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 ae21794f07..91eb087586 100644
--- 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 a0b4088e7e..f6e6f47da0 100755
--- 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 4f6d02e16b..3e34be810e 100755
--- 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 2e70d54a41..7e9e6abfc3 100644
--- 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 373544a02d..407fb571dc 100644
--- 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 025209ee5f..a434e44f5f 100644
--- 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 14d7a717ea..5368db1384 100644
--- 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 302ac749df..60cc635b85 100644
--- 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 {