moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing unit test failures

Browse source
This commit is contained in:
nicolasconnault 2007-10-27 10:13:25 +00:00
parent 96aad15ced
commit 1994d890c9
8 changed files with 263 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/grade/grade_category.php
View file

@ -364,7 +364,7 @@ class grade_category extends grade_object {
/** /**
* Generates and saves raw_grades in associated category grade item. * Generates and saves raw_grades in associated category grade item.
* These immediate children must alrady have their own final grades. * These immediate children must already have their own final grades.
* The category's aggregation method is used to generate raw grades. * The category's aggregation method is used to generate raw grades.
* *
* Please note that category grade is either calculated or aggregated - not both at the same time. * Please note that category grade is either calculated or aggregated - not both at the same time.
@ -446,6 +446,13 @@ class grade_category extends grade_object {
/** /**
* internal function for category grades aggregation * internal function for category grades aggregation
*
* @param int $userid
* @param array $items
* @param array $grade_values
* @param float $oldgrade
* @param bool $excluded
* @return boolean (just plain return;)
*/ */
function aggregate_grades($userid, $items, $grade_values, $oldgrade, $excluded) { function aggregate_grades($userid, $items, $grade_values, $oldgrade, $excluded) {
global $CFG; global $CFG;

8
lib/grade/grade_item.php
View file

@ -1250,7 +1250,7 @@ class grade_item extends grade_object {
} }
/** /**
* Refetch grades from moudles, plugins. * Refetch grades from modules, plugins.
* @param int $userid optional, one user only * @param int $userid optional, one user only
*/ */
function refresh_grades($userid=0) { function refresh_grades($userid=0) {
@ -1261,12 +1261,12 @@ class grade_item extends grade_object {
} }
if (!$activity = get_record($this->itemmodule, 'id', $this->iteminstance)) { if (!$activity = get_record($this->itemmodule, 'id', $this->iteminstance)) {
debugging('Can not find activity'); debugging("Can not find $this->itemmodule activity with id $this->iteminstance");
return; return;
} }
if (! $cm = get_coursemodule_from_instance($this->itemmodule, $activity->id, $this->courseid)) { if (!$cm = get_coursemodule_from_instance($this->itemmodule, $activity->id, $this->courseid)) {
debuggin('Can not find course module'); debugging('Can not find course module');
return; return;
} }

11
lib/grade/simpletest/testgradecategory.php
View file

@ -223,14 +223,15 @@ class grade_category_test extends grade_test {
$grades = get_records('grade_grades', 'itemid', $category->grade_item->id); $grades = get_records('grade_grades', 'itemid', $category->grade_item->id);
$this->assertEqual(3, count($grades)); $this->assertEqual(3, count($grades));
$rawvalues = array(); // Category grades do not have raw values
$finalvalues = array();
foreach ($grades as $grade) { foreach ($grades as $grade) {
$this->assertWithinMargin($grade->rawgrade, $grade->rawgrademin, $grade->rawgrademax); $this->assertWithinMargin($grade->finalgrade, $grade->rawgrademin, $grade->rawgrademax);
$rawvalues[] = (int)$grade->rawgrade; $finalvalues[] = (int)$grade->finalgrade;
} }
sort($rawvalues); sort($finalvalues);
// calculated mean results // calculated mean results
$this->assertEqual($rawvalues, array(20,50,100)); $this->assertEqual($finalvalues, array(20,50,100));
} }
function test_grade_category_aggregate_grades() { function test_grade_category_aggregate_grades() {

7
lib/grade/simpletest/testgradegrades.php
View file

@ -123,16 +123,19 @@ class grade_grade_test extends grade_test {
$this->assertTrue(empty($grade_item->locked)); $this->assertTrue(empty($grade_item->locked));
$this->assertTrue(empty($grade->locked)); $this->assertTrue(empty($grade->locked));
// Test locking the grade
$this->assertTrue($grade->set_locked(true)); $this->assertTrue($grade->set_locked(true));
$this->assertFalse(empty($grade->locked)); $this->assertFalse(empty($grade->locked));
$this->assertTrue($grade->set_locked(false)); $this->assertTrue($grade->set_locked(false));
$this->assertTrue(empty($grade->locked)); $this->assertTrue(empty($grade->locked));
$this->assertTrue($grade_item->set_locked(true)); // Test locking the grade item with cascading on
$this->assertTrue($grade_item->set_locked(true, true, false));
$grade = new grade_grade($grade_item->get_final(1)); $grade = new grade_grade($grade_item->get_final(1));
// Grade should already be locked
$this->assertFalse(empty($grade->locked)); $this->assertFalse(empty($grade->locked));
$this->assertFalse($grade->set_locked(false)); $this->assertTrue($grade->set_locked(false));
$this->assertTrue($grade_item->set_locked(false)); $this->assertTrue($grade_item->set_locked(false));
$grade = new grade_grade($grade_item->get_final(1)); $grade = new grade_grade($grade_item->get_final(1));

2
lib/grade/simpletest/testgradeitem.php
View file

@ -355,7 +355,7 @@ class grade_item_test extends grade_test {
$this->assertTrue(empty($grade_item->locked)); $this->assertTrue(empty($grade_item->locked));
$this->assertTrue(empty($grade->locked)); $this->assertTrue(empty($grade->locked));
$this->assertTrue($grade_item->set_locked(true)); $this->assertTrue($grade_item->set_locked(true, true));
$grade = new grade_grade($grade_item->get_final(1)); $grade = new grade_grade($grade_item->get_final(1));
$this->assertFalse(empty($grade_item->locked)); $this->assertFalse(empty($grade_item->locked));

292
lib/simpletest/fixtures/gradetest.php
View file

@ -51,19 +51,29 @@ class grade_test extends UnitTestCase {
* every test has access to these test data. The order of the following array is * every test has access to these test data. The order of the following array is
* crucial, because of the interrelationships between objects. * crucial, because of the interrelationships between objects.
*/ */
var $tables = array('grade_categories', var $tables = array('modules',
'quiz',
'assignment',
'forum',
'course_modules',
'grade_categories',
'scale', 'scale',
'grade_items', 'grade_items',
'grade_grades', 'grade_grades',
'grade_outcomes'); 'grade_outcomes'
);
var $grade_items = array(); var $grade_items = array();
var $grade_categories = array(); var $grade_categories = array();
var $grade_grades = array(); var $grade_grades = array();
var $grade_outcomes = array(); var $grade_outcomes = array();
var $scale = array(); var $scale = array();
var $modules = array();
var $course_modules = array();
var $activities = array(); var $assignments = array();
var $quizzes = array();
var $forums = array();
var $courseid = 1; var $courseid = 1;
var $userid = 1; var $userid = 1;
@ -381,6 +391,105 @@ class grade_test extends UnitTestCase {
delete_records($table->name); delete_records($table->name);
} }
/// Define table quiz_grades to be created
$table = new XMLDBTable('quiz_grades');
if ($result && !table_exists($table)) {
/// Adding fields to table quiz_grades
$table->addFieldInfo('id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, XMLDB_SEQUENCE, null, null, null);
$table->addFieldInfo('quiz', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('userid', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('grade', XMLDB_TYPE_FLOAT, null, null, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('timemodified', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
/// Adding keys to table quiz_grades
$table->addKeyInfo('primary', XMLDB_KEY_PRIMARY, array('id'));
$table->addKeyInfo('quiz', XMLDB_KEY_FOREIGN, array('quiz'), 'quiz', array('id'));
/// Adding indexes to table quiz_grades
$table->addIndexInfo('userid', XMLDB_INDEX_NOTUNIQUE, array('userid'));
/// Launch create table for quiz_grades
$result = $result && create_table($table);
} else {
delete_records($table->name);
}
/// Define table assignment to be created
$table = new XMLDBTable('assignment');
if ($result && !table_exists($table)) {
/// Adding fields to table assignment
$table->addFieldInfo('id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, XMLDB_SEQUENCE, null, null, null);
$table->addFieldInfo('course', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('name', XMLDB_TYPE_CHAR, '255', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, null);
$table->addFieldInfo('description', XMLDB_TYPE_TEXT, 'small', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, null);
$table->addFieldInfo('format', XMLDB_TYPE_INTEGER, '4', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('assignmenttype', XMLDB_TYPE_CHAR, '50', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, null);
$table->addFieldInfo('resubmit', XMLDB_TYPE_INTEGER, '2', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('preventlate', XMLDB_TYPE_INTEGER, '2', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('emailteachers', XMLDB_TYPE_INTEGER, '2', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('var1', XMLDB_TYPE_INTEGER, '10', null, null, null, null, null, '0');
$table->addFieldInfo('var2', XMLDB_TYPE_INTEGER, '10', null, null, null, null, null, '0');
$table->addFieldInfo('var3', XMLDB_TYPE_INTEGER, '10', null, null, null, null, null, '0');
$table->addFieldInfo('var4', XMLDB_TYPE_INTEGER, '10', null, null, null, null, null, '0');
$table->addFieldInfo('var5', XMLDB_TYPE_INTEGER, '10', null, null, null, null, null, '0');
$table->addFieldInfo('maxbytes', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '100000');
$table->addFieldInfo('timedue', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('timeavailable', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('grade', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('timemodified', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
/// Adding keys to table assignment
$table->addKeyInfo('primary', XMLDB_KEY_PRIMARY, array('id'));
/// Adding indexes to table assignment
$table->addIndexInfo('course', XMLDB_INDEX_NOTUNIQUE, array('course'));
/// Launch create table for assignment
$result = $result && create_table($table);
} else {
delete_records($table->name);
}
/// Define table forum to be created
$table = new XMLDBTable('forum');
if ($result && !table_exists($table)) {
/// Adding fields to table forum
$table->addFieldInfo('id', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, XMLDB_SEQUENCE, null, null, null);
$table->addFieldInfo('course', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('type', XMLDB_TYPE_CHAR, '20', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, XMLDB_ENUM, array('single', 'news', 'general', 'social', 'eachuser', 'teacher', 'qanda'), 'general');
$table->addFieldInfo('name', XMLDB_TYPE_CHAR, '255', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, null);
$table->addFieldInfo('intro', XMLDB_TYPE_TEXT, 'small', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, null);
$table->addFieldInfo('assessed', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('assesstimestart', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('assesstimefinish', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('scale', XMLDB_TYPE_INTEGER, '10', null, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('maxbytes', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('forcesubscribe', XMLDB_TYPE_INTEGER, '1', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('trackingtype', XMLDB_TYPE_INTEGER, '2', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '1');
$table->addFieldInfo('rsstype', XMLDB_TYPE_INTEGER, '2', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('rssarticles', XMLDB_TYPE_INTEGER, '2', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('timemodified', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('warnafter', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('blockafter', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
$table->addFieldInfo('blockperiod', XMLDB_TYPE_INTEGER, '10', XMLDB_UNSIGNED, XMLDB_NOTNULL, null, null, null, '0');
/// Adding keys to table forum
$table->addKeyInfo('primary', XMLDB_KEY_PRIMARY, array('id'));
/// Adding indexes to table forum
$table->addIndexInfo('course', XMLDB_INDEX_NOTUNIQUE, array('course'));
/// Launch create table for forum
$result = $result && create_table($table);
} else {
delete_records($table->name);
}
return $result; return $result;
} }
@ -812,70 +921,19 @@ class grade_test extends UnitTestCase {
} }
} }
/**
* Load module instance entries in course_modules table
*/
function load_course_modules() {
$course_module = new stdClass();
$course_module->course = $this->courseid;
$quiz->module = 1;
$quiz->instance = 2;
if ($course_module->id = insert_record('course_modules', $course_module)) {
$this->course_module[0] = $course_module;
}
$course_module = new stdClass();
$course_module->course = $this->courseid;
$quiz->module = 2;
$quiz->instance = 1;
if ($course_module->id = insert_record('course_modules', $course_module)) {
$this->course_module[0] = $course_module;
}
$course_module = new stdClass();
$course_module->course = $this->courseid;
$quiz->module = 2;
$quiz->instance = 5;
if ($course_module->id = insert_record('course_modules', $course_module)) {
$this->course_module[0] = $course_module;
}
$course_module = new stdClass();
$course_module->course = $this->courseid;
$quiz->module = 3;
$quiz->instance = 3;
if ($course_module->id = insert_record('course_modules', $course_module)) {
$this->course_module[0] = $course_module;
}
$course_module = new stdClass();
$course_module->course = $this->courseid;
$quiz->module = 3;
$quiz->instance = 7;
if ($course_module->id = insert_record('course_modules', $course_module)) {
$this->course_module[0] = $course_module;
}
$course_module = new stdClass();
$course_module->course = $this->courseid;
$quiz->module = 3;
$quiz->instance = 9;
if ($course_module->id = insert_record('course_modules', $course_module)) {
$this->course_module[0] = $course_module;
}
}
/** /**
* Load test quiz data into the database * Load test quiz data into the database
*/ */
function load_quiz_activities() { function load_quiz() {
$quiz = new stdClass(); $quiz = new stdClass();
$quiz->course = $this->courseid; $quiz->course = $this->courseid;
$quiz->name = 'test quiz'; $quiz->name = 'test quiz';
$quiz->intro = 'let us quiz you!'; $quiz->intro = 'let us quiz you!';
$quiz->questions = '1,2'; $quiz->questions = '1,2';
if ($quiz->id = insert_record('quiz', $quiz)) { if ($quiz->id = insert_record('quiz', $quiz)) {
$this->activities[0] = $quiz; $this->quizzes[0] = $quiz;
} else {
die("Can't create a test quiz!!!");
} }
$quiz = new stdClass(); $quiz = new stdClass();
@ -884,9 +942,113 @@ class grade_test extends UnitTestCase {
$quiz->intro = 'let us quiz you again!'; $quiz->intro = 'let us quiz you again!';
$quiz->questions = '1,3'; $quiz->questions = '1,3';
if ($quiz->id = insert_record('quiz', $quiz)) { if ($quiz->id = insert_record('quiz', $quiz)) {
$this->activities[1] = $quiz; $this->quizzes[1] = $quiz;
} else {
die("Can't create a test quiz!!!");
}
} }
/**
* Load test assignment data into the database
*/
function load_assignment() {
$assignment = new stdClass();
$assignment->course = $this->courseid;
$assignment->name = 'test assignment';
$assignment->description = 'What is the purpose of life?';
if ($assignment->id = insert_record('assignment', $assignment)) {
$this->assignments[0] = $assignment;
} else {
die("Can't create a test assignment!!!");
}
}
/**
* Load test forum data into the database
*/
function load_forum() {
$forum = new stdClass();
$forum->course = $this->courseid;
$forum->name = 'test forum 1';
$forum->intro = 'Another test forum';
if ($forum->id = insert_record('forum', $forum)) {
$this->forums[0] = $forum;
} else {
die("Can't create a test forum!!!");
}
$forum = new stdClass();
$forum->course = $this->courseid;
$forum->name = 'test forum 2';
$forum->intro = 'Another test forum';
if ($forum->id = insert_record('forum', $forum)) {
$this->forums[1] = $forum;
} else {
die("Can't create a test forum!!!");
}
$forum = new stdClass();
$forum->course = $this->courseid;
$forum->name = 'test forum 3';
$forum->intro = 'Another test forum';
if ($forum->id = insert_record('forum', $forum)) {
$this->forums[2] = $forum;
} else {
die("Can't create a test forum!!!");
}
}
/**
* Load module instance entries in course_modules table
*/
function load_course_modules() {
$course_module = new stdClass();
$course_module->course = $this->courseid;
$course_module->module = $this->modules[0]->id;
$course_module->instance = $this->assignments[0]->id;
if ($course_module->id = insert_record('course_modules', $course_module)) {
$this->course_modules[0] = $course_module;
}
$course_module = new stdClass();
$course_module->course = $this->courseid;
$course_module->module = $this->modules[1]->id;
$course_module->instance = $this->quizzes[0]->id;
if ($course_module->id = insert_record('course_modules', $course_module)) {
$this->course_modules[1] = $course_module;
}
$course_module = new stdClass();
$course_module->course = $this->courseid;
$course_module->module = $this->modules[1]->id;
$course_module->instance = $this->quizzes[1]->id;
if ($course_module->id = insert_record('course_modules', $course_module)) {
$this->course_modules[2] = $course_module;
}
$course_module = new stdClass();
$course_module->course = $this->courseid;
$course_module->module = $this->modules[2]->id;
$course_module->instance = $this->forums[0]->id;
if ($course_module->id = insert_record('course_modules', $course_module)) {
$this->course_modules[3] = $course_module;
}
$course_module = new stdClass();
$course_module->course = $this->courseid;
$course_module->module = $this->modules[2]->id;
$course_module->instance = $this->forums[1]->id;
if ($course_module->id = insert_record('course_modules', $course_module)) {
$this->course_modules[4] = $course_module;
}
$course_module = new stdClass();
$course_module->course = $this->courseid;
$course_module->module = $this->modules[2]->id;
$course_module->instance = $this->forums[2]->id;
if ($course_module->id = insert_record('course_modules', $course_module)) {
$this->course_modules[5] = $course_module;
}
} }
/** /**
@ -904,7 +1066,7 @@ class grade_test extends UnitTestCase {
$grade_item->itemname = 'unittestgradeitem1'; $grade_item->itemname = 'unittestgradeitem1';
$grade_item->itemtype = 'mod'; $grade_item->itemtype = 'mod';
$grade_item->itemmodule = 'quiz'; $grade_item->itemmodule = 'quiz';
$grade_item->iteminstance = 1; $grade_item->iteminstance = $this->quizzes[0]->id;
$grade_item->gradetype = GRADE_TYPE_VALUE; $grade_item->gradetype = GRADE_TYPE_VALUE;
$grade_item->grademin = 30; $grade_item->grademin = 30;
$grade_item->grademax = 110; $grade_item->grademax = 110;
@ -929,7 +1091,7 @@ class grade_test extends UnitTestCase {
$grade_item->itemmodule = 'assignment'; $grade_item->itemmodule = 'assignment';
$grade_item->calculation = '= ##gi'.$this->grade_items[0]->id.'## + 30 + [[item id 0]] - [[item id 0]]'; $grade_item->calculation = '= ##gi'.$this->grade_items[0]->id.'## + 30 + [[item id 0]] - [[item id 0]]';
$grade_item->gradetype = GRADE_TYPE_VALUE; $grade_item->gradetype = GRADE_TYPE_VALUE;
$grade_item->iteminstance = 2; $grade_item->iteminstance = $this->assignments[0]->id;
$grade_item->itemnumber = null; $grade_item->itemnumber = null;
$grade_item->grademin = 0; $grade_item->grademin = 0;
$grade_item->grademax = 100; $grade_item->grademax = 100;
@ -950,7 +1112,7 @@ class grade_test extends UnitTestCase {
$grade_item->itemname = 'unittestgradeitem3'; $grade_item->itemname = 'unittestgradeitem3';
$grade_item->itemtype = 'mod'; $grade_item->itemtype = 'mod';
$grade_item->itemmodule = 'forum'; $grade_item->itemmodule = 'forum';
$grade_item->iteminstance = 3; $grade_item->iteminstance = $this->forums[0]->id;
$grade_item->gradetype = GRADE_TYPE_SCALE; $grade_item->gradetype = GRADE_TYPE_SCALE;
$grade_item->scaleid = $this->scale[0]->id; $grade_item->scaleid = $this->scale[0]->id;
$grade_item->grademin = 0; $grade_item->grademin = 0;
@ -1034,7 +1196,7 @@ class grade_test extends UnitTestCase {
$grade_item->itemname = 'unittestorphangradeitem1'; $grade_item->itemname = 'unittestorphangradeitem1';
$grade_item->itemtype = 'mod'; $grade_item->itemtype = 'mod';
$grade_item->itemmodule = 'quiz'; $grade_item->itemmodule = 'quiz';
$grade_item->iteminstance = 5; $grade_item->iteminstance = $this->quizzes[1]->id;
$grade_item->itemnumber = 0; $grade_item->itemnumber = 0;
$grade_item->gradetype = GRADE_TYPE_VALUE; $grade_item->gradetype = GRADE_TYPE_VALUE;
$grade_item->grademin = 10; $grade_item->grademin = 10;
@ -1058,7 +1220,7 @@ class grade_test extends UnitTestCase {
$grade_item->itemname = 'singleparentitem1'; $grade_item->itemname = 'singleparentitem1';
$grade_item->itemtype = 'mod'; $grade_item->itemtype = 'mod';
$grade_item->itemmodule = 'forum'; $grade_item->itemmodule = 'forum';
$grade_item->iteminstance = 7; $grade_item->iteminstance = $this->forums[1]->id;
$grade_item->gradetype = GRADE_TYPE_SCALE; $grade_item->gradetype = GRADE_TYPE_SCALE;
$grade_item->scaleid = $this->scale[0]->id; $grade_item->scaleid = $this->scale[0]->id;
$grade_item->grademin = 0; $grade_item->grademin = 0;
@ -1080,7 +1242,7 @@ class grade_test extends UnitTestCase {
$grade_item->itemname = 'singleparentitem2'; $grade_item->itemname = 'singleparentitem2';
$grade_item->itemtype = 'mod'; $grade_item->itemtype = 'mod';
$grade_item->itemmodule = 'forum'; $grade_item->itemmodule = 'forum';
$grade_item->iteminstance = 9; $grade_item->iteminstance = $this->forums[2]->id;
$grade_item->gradetype = GRADE_TYPE_VALUE; $grade_item->gradetype = GRADE_TYPE_VALUE;
$grade_item->grademin = 0; $grade_item->grademin = 0;
$grade_item->grademax = 100; $grade_item->grademax = 100;

6
lib/simpletest/testbackuplib.php
View file

@ -102,14 +102,16 @@ class backuplib_test extends UnitTestCase {
backup_copy_user_files($preferences); backup_copy_user_files($preferences);
// Check for the existence of the backup file // Check for the existence of the backup file
$this->assertTrue(file_exists("$CFG->dataroot/temp/backup/$preferences->backup_unique_code/user_files")); $backupfile = "$CFG->dataroot/temp/backup/$preferences->backup_unique_code/user_files";
$this->assertTrue(file_exists($backupfile));
// Check for the existence of the user files in the backup file // Check for the existence of the user files in the backup file
foreach ($this->testfiles as $file) { foreach ($this->testfiles as $file) {
$parts = explode('/', $file); $parts = explode('/', $file);
$section = $parts[0]; $section = $parts[0];
$userid = $parts[1]; $userid = $parts[1];
$this->assertTrue(file_exists("$CFG->dataroot/temp/backup/$preferences->backup_unique_code/user_files/$section/$userid/f1.gif")); $userimage = "$CFG->dataroot/temp/backup/$preferences->backup_unique_code/user_files/$section/$userid/f1.gif";
$this->assertTrue(file_exists($userimage));
} }
} }