L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-10064 global $CFG in unit test files is non standard, it is recommended to use MOODLE_INTERNAL test in all library files

Browse Source
This commit is contained in:
skodak
2007-06-09 16:32:36 +00:00
parent 52f81103d3
commit cdbbd26f80
29 changed files with 93 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/report/simpletest/ex_reporter.php
+4 -1
View File
@@ -9,7 +9,10 @@
* @package SimpleTestEx
*/
/** */
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
require_once($CFG->libdir . '/simpletestlib/reporter.php');
/**
admin/report/simpletest/ex_simple_test.php
+4 -1
View File
@@ -10,7 +10,10 @@
* @package SimpleTestEx
*/
/** */
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
require_once($CFG->libdir . '/simpletestlib/test_case.php');
/**
group/simpletest/test_basicgrouplib.php
+4 -2
View File
@@ -11,9 +11,11 @@
*
* Window - Preferences - PHPeclipse - PHP - Code Templates
*/
require_once(dirname(__FILE__) . '/../../config.php');
global $CFG;
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
require_once($CFG->dirroot . '/group/lib/basicgrouplib.php');
require_once($CFG->dirroot . '/group/lib/utillib.php');
group/simpletest/test_groupinglib.php
+4 -2
View File
@@ -7,9 +7,11 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package groups
*/
require_once(dirname(__FILE__) . '/../../config.php');
global $CFG;
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
require_once($CFG->dirroot . '/group/lib/groupinglib.php');
class groupinglib_test extends UnitTestCase {
lib/simpletest/fixtures/gradetest.php
+4 -2
View File
@@ -23,6 +23,10 @@
// //
///////////////////////////////////////////////////////////////////////////
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
/**
* Shared code for all grade related tests.
*
@@ -30,8 +34,6 @@
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
* @package moodlecore
*/
global $CFG;
require_once($CFG->libdir . '/gradelib.php');
require_once($CFG->libdir . '/dmllib.php');
require_once($CFG->libdir . '/ddllib.php');
lib/simpletest/grade/simpletest/testgradecalculation.php
+4 -1
View File
@@ -31,7 +31,10 @@
* @package moodlecore
*/
global $CFG;
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
class grade_calculation_test extends grade_test {
lib/simpletest/grade/simpletest/testgradecategory.php
+4 -1
View File
@@ -31,7 +31,10 @@
* @package moodlecore
*/
global $CFG;
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
class grade_category_test extends grade_test {
lib/simpletest/grade/simpletest/testgradefinal.php
+4 -1
View File
@@ -31,7 +31,10 @@
* @package moodlecore
*/
global $CFG;
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
class grade_final_test extends grade_test {
lib/simpletest/grade/simpletest/testgradehistory.php
+4 -1
View File
@@ -31,7 +31,10 @@
* @package moodlecore
*/
global $CFG;
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
class grade_history_test extends grade_test {
lib/simpletest/grade/simpletest/testgradeitem.php
+4 -1
View File
@@ -31,7 +31,10 @@
* @package moodlecore
*/
global $CFG;
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
@set_time_limit(0);
lib/simpletest/grade/simpletest/testgradeoutcome.php
+4 -1
View File
@@ -31,7 +31,10 @@
* @package moodlecore
*/
global $CFG;
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
class grade_outcome_test extends grade_test {
lib/simpletest/grade/simpletest/testgraderaw.php
+4 -1
View File
@@ -31,7 +31,10 @@
* @package moodlecore
*/
global $CFG;
global $CFG;if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
class grade_raw_test extends grade_test {
lib/simpletest/grade/simpletest/testgradescale.php
+4 -1
View File
@@ -31,7 +31,10 @@
* @package moodlecore
*/
global $CFG;
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
class grade_scale_test extends grade_test {
lib/simpletest/grade/simpletest/testgradetext.php
+4 -1
View File
@@ -31,7 +31,10 @@
* @package moodlecore
*/
global $CFG;
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
class grade_text_test extends grade_test {
lib/simpletest/grade/simpletest/testgradetree.php
+4 -1
View File
@@ -31,7 +31,10 @@
* @package moodlecore
*/
global $CFG;
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
class grade_tree_test extends grade_test {
lib/simpletest/slowtestcode.php
+3 -4
View File
@@ -8,10 +8,9 @@
* @package SimpleTestEx
*/
/** */
require_once(dirname(__FILE__) . '/../../config.php');
global $CFG;
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
class slow_code_test extends UnitTestCase {
var $php_code_extensions = array('php', 'html', 'php\.inc');
lib/simpletest/testajaxlib.php
+3 -3
View File
@@ -32,10 +32,10 @@
* @package moodlecore
*/
/** $Id */
require_once(dirname(__FILE__) . '/../../config.php');
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
global $CFG;
require_once($CFG->libdir . '/moodlelib.php');
require_once($CFG->libdir . '/ajax/ajaxlib.php');
lib/simpletest/testcode.php
+3 -4
View File
@@ -8,10 +8,9 @@
* @package SimpleTestEx
*/
/** */
require_once(dirname(__FILE__) . '/../../config.php');
global $CFG;
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
class code_test extends UnitTestCase {
var $allok = array();
lib/simpletest/testdmllib.php
+3 -3
View File
@@ -8,10 +8,10 @@
* @package moodlecore
*/
/** */
require_once(dirname(__FILE__) . '/../../config.php');
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
global $CFG;
require_once($CFG->libdir . '/simpletestlib/web_tester.php');
require_once($CFG->libdir . '/dmllib.php');
lib/simpletest/testeventslib.php
-2
View File
@@ -6,8 +6,6 @@ if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
global $CFG;
// test handler function
function sample_function_handler($eventdata) {
static $called = 0;
lib/simpletest/testgradelib.php
+4 -1
View File
@@ -31,7 +31,10 @@
* @package moodlecore
*/
global $CFG;
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
/**
lib/simpletest/testmathslib.php
-1
View File
@@ -4,7 +4,6 @@ if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
global $CFG;
require_once($CFG->libdir . '/mathslib.php');
/**
lib/simpletest/testmodforumlib.php
+3 -3
View File
@@ -33,10 +33,10 @@
* @package moodlecore
*/
/** $Id */
require_once(dirname(__FILE__) . '/../../config.php');
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
global $CFG;
require_once($CFG->dirroot . '/mod/forum/lib.php');
class modforumlib_test extends UnitTestCase {
lib/simpletest/testmoodlelib.php
+3 -3
View File
@@ -33,10 +33,10 @@
* @package moodlecore
*/
/** $Id */
require_once(dirname(__FILE__) . '/../../config.php');
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
global $CFG;
require_once($CFG->libdir . '/moodlelib.php');
class moodlelib_test extends UnitTestCase {
lib/simpletest/testweblib.php
+3 -4
View File
@@ -8,10 +8,9 @@
* @package moodlecore
*/
/** */
require_once(dirname(__FILE__) . '/../../config.php');
global $CFG;
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
class web_test extends UnitTestCase {
lib/simpletestlib/readme_moodle.txt
+1 -1
View File
@@ -1,7 +1,7 @@
Description of Simpletest 1.0.1beta library import into Moodle
Changes:
* none
* test_case.php - added our global $CFG before include() MDL-10064
skodak
lib/simpletestlib/test_case.php
+1
View File
@@ -458,6 +458,7 @@
*/
function _requireWithError($file) {
$this->_enableErrorReporting();
global $CFG; // Moodle patch for $CFG global in unit test files
include($file);
$error = isset($php_errormsg) ? $php_errormsg : false;
$this->_disableErrorReporting();
mod/data/simpletest/testpreset.php
+3 -3
View File
@@ -31,10 +31,10 @@
* @package mod_data
*/
/** $Id */
require_once(dirname(__FILE__) . '/../../../config.php');
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
global $CFG;
require_once($CFG->dirroot . '/mod/data/preset_class.php');
class data_preset_test extends UnitTestCase {
question/type/numerical/simpletest/testquestiontype.php
+3 -3
View File
@@ -8,10 +8,10 @@
* @package question
*/
/** */
require_once(dirname(__FILE__) . '/../../../../config.php');
if (!defined('MOODLE_INTERNAL')) {
die('Direct access to this script is forbidden.'); /// It must be included from a Moodle page
}
global $CFG;
require_once($CFG->dirroot . '/question/type/numerical/questiontype.php');
class question_numerical_qtype_test extends UnitTestCase {