mirror of
https://github.com/moodle/moodle.git
synced 2025-03-18 22:50:19 +01:00
MDL-9866 reverting previous incorrect fix for include() in simpletest library; patching grade unit tests instead
This commit is contained in:
parent
09c442620d
commit
02e6a9731f
1279
lib/simpletest/fixtures/gradetest.php
Normal file
1279
lib/simpletest/fixtures/gradetest.php
Normal file
File diff suppressed because it is too large
Load Diff
@ -30,11 +30,11 @@
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
|
||||
* @package moodlecore
|
||||
*/
|
||||
require_once(dirname(__FILE__) . '/../../../../config.php');
|
||||
global $CFG;
|
||||
require_once($CFG->libdir . '/simpletest/testgradelib.php');
|
||||
|
||||
class grade_calculation_test extends gradelib_test {
|
||||
global $CFG;
|
||||
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
|
||||
|
||||
class grade_calculation_test extends grade_test {
|
||||
|
||||
function test_grade_calculation_construct() {
|
||||
$params = new stdClass();
|
||||
|
@ -30,11 +30,11 @@
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
|
||||
* @package moodlecore
|
||||
*/
|
||||
require_once(dirname(__FILE__) . '/../../../../config.php');
|
||||
global $CFG;
|
||||
require_once($CFG->libdir . '/simpletest/testgradelib.php');
|
||||
|
||||
class grade_category_test extends gradelib_test {
|
||||
global $CFG;
|
||||
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
|
||||
|
||||
class grade_category_test extends grade_test {
|
||||
|
||||
function test_grade_category_construct() {
|
||||
$params = new stdClass();
|
||||
|
@ -30,11 +30,11 @@
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
|
||||
* @package moodlecore
|
||||
*/
|
||||
require_once(dirname(__FILE__) . '/../../../../config.php');
|
||||
global $CFG;
|
||||
require_once($CFG->libdir . '/simpletest/testgradelib.php');
|
||||
|
||||
class grade_final_test extends gradelib_test {
|
||||
global $CFG;
|
||||
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
|
||||
|
||||
class grade_final_test extends grade_test {
|
||||
|
||||
function test_grade_grades_final_construct() {
|
||||
$params = new stdClass();
|
||||
|
@ -30,11 +30,11 @@
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
|
||||
* @package moodlecore
|
||||
*/
|
||||
require_once(dirname(__FILE__) . '/../../../../config.php');
|
||||
global $CFG;
|
||||
require_once($CFG->libdir . '/simpletest/testgradelib.php');
|
||||
|
||||
class grade_history_test extends gradelib_test {
|
||||
global $CFG;
|
||||
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
|
||||
|
||||
class grade_history_test extends grade_test {
|
||||
|
||||
function test_grade_history_construct() {
|
||||
$params = new stdClass();
|
||||
|
@ -22,7 +22,7 @@
|
||||
// http://www.gnu.org/copyleft/gpl.html //
|
||||
// //
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
@set_time_limit(0);
|
||||
|
||||
/**
|
||||
* Unit tests for grade_item object.
|
||||
*
|
||||
@ -30,11 +30,13 @@
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
|
||||
* @package moodlecore
|
||||
*/
|
||||
require_once(dirname(__FILE__) . '/../../../../config.php');
|
||||
global $CFG;
|
||||
require_once($CFG->libdir . '/simpletest/testgradelib.php');
|
||||
|
||||
class grade_item_test extends gradelib_test {
|
||||
global $CFG;
|
||||
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
|
||||
|
||||
@set_time_limit(0);
|
||||
|
||||
class grade_item_test extends grade_test {
|
||||
|
||||
function test_grade_item_construct() {
|
||||
$params = new stdClass();
|
||||
|
@ -30,11 +30,11 @@
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
|
||||
* @package moodlecore
|
||||
*/
|
||||
require_once(dirname(__FILE__) . '/../../../../config.php');
|
||||
global $CFG;
|
||||
require_once($CFG->libdir . '/simpletest/testgradelib.php');
|
||||
|
||||
class grade_outcome_test extends gradelib_test {
|
||||
global $CFG;
|
||||
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
|
||||
|
||||
class grade_outcome_test extends grade_test {
|
||||
|
||||
function test_grade_outcome_construct() {
|
||||
$params = new stdClass();
|
||||
|
@ -30,11 +30,11 @@
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
|
||||
* @package moodlecore
|
||||
*/
|
||||
require_once(dirname(__FILE__) . '/../../../../config.php');
|
||||
global $CFG;
|
||||
require_once($CFG->libdir . '/simpletest/testgradelib.php');
|
||||
|
||||
class grade_raw_test extends gradelib_test {
|
||||
global $CFG;
|
||||
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
|
||||
|
||||
class grade_raw_test extends grade_test {
|
||||
|
||||
function test_grade_grades_raw_construct() {
|
||||
$params = new stdClass();
|
||||
|
@ -30,11 +30,11 @@
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
|
||||
* @package moodlecore
|
||||
*/
|
||||
require_once(dirname(__FILE__) . '/../../../../config.php');
|
||||
global $CFG;
|
||||
require_once($CFG->libdir . '/simpletest/testgradelib.php');
|
||||
|
||||
class grade_scale_test extends gradelib_test {
|
||||
global $CFG;
|
||||
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
|
||||
|
||||
class grade_scale_test extends grade_test {
|
||||
|
||||
function test_scale_construct() {
|
||||
$params = new stdClass();
|
||||
|
@ -30,11 +30,11 @@
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
|
||||
* @package moodlecore
|
||||
*/
|
||||
require_once(dirname(__FILE__) . '/../../../../config.php');
|
||||
global $CFG;
|
||||
require_once($CFG->libdir . '/simpletest/testgradelib.php');
|
||||
|
||||
class grade_text_test extends gradelib_test {
|
||||
global $CFG;
|
||||
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
|
||||
|
||||
class grade_text_test extends grade_test {
|
||||
|
||||
function test_grade_grades_text_construct() {
|
||||
$params = new stdClass();
|
||||
|
@ -30,11 +30,11 @@
|
||||
* @license http://www.gnu.org/copyleft/gpl.html GNU Public License
|
||||
* @package moodlecore
|
||||
*/
|
||||
require_once(dirname(__FILE__) . '/../../../../config.php');
|
||||
global $CFG;
|
||||
require_once($CFG->libdir . '/simpletest/testgradelib.php');
|
||||
|
||||
class grade_tree_test extends gradelib_test {
|
||||
global $CFG;
|
||||
require_once($CFG->libdir.'/simpletest/fixtures/gradetest.php');
|
||||
|
||||
class grade_tree_test extends grade_test {
|
||||
|
||||
function test_grade_tree_move_element() {
|
||||
/* 0.
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,7 @@
|
||||
Description of Simpletest 1.0.1beta library import into Moodle
|
||||
|
||||
Changes:
|
||||
* test_case.php - include() changed to include_once() in _requireWithError() MDL-9866
|
||||
* none
|
||||
|
||||
skodak
|
||||
|
||||
|
@ -458,7 +458,7 @@
|
||||
*/
|
||||
function _requireWithError($file) {
|
||||
$this->_enableErrorReporting();
|
||||
include_once($file); // moodle change - include prevents inheritance of test classes MDL-9866
|
||||
include($file);
|
||||
$error = isset($php_errormsg) ? $php_errormsg : false;
|
||||
$this->_disableErrorReporting();
|
||||
$self_inflicted_errors = array(
|
||||
|
Loading…
x
Reference in New Issue
Block a user