mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-75746_master' of https://github.com/marxjohnson/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2023-03-21 12:01:15 +08:00 committed by Sara Arjona
commit 3be6f5c941
2 changed files with 77 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mod/quiz/backup/moodle2/backup_quiz_stepslib.php
View File

@ -49,8 +49,7 @@ class backup_quiz_activity_structure_step extends backup_questions_activity_stru
$qinstances = new backup_nested_element('question_instances');
$qinstance = new backup_nested_element('question_instance', ['id'],
['slot', 'page', 'displaynumber', 'requireprevious', 'questionid',
'questioncategoryid', 'includingsubcategories', 'maxmark']);
['quizid', 'slot', 'page', 'displaynumber', 'requireprevious', 'maxmark']);
$this->add_question_references($qinstance, 'mod_quiz', 'slot');
@ -146,7 +145,6 @@ class backup_quiz_activity_structure_step extends backup_questions_activity_stru
$attempt->set_source_alias('attempt', 'attemptnum');
// Define id annotations.
$qinstance->annotate_ids('question', 'questionid');
$override->annotate_ids('user', 'userid');
$override->annotate_ids('group', 'groupid');
$grade->annotate_ids('user', 'userid');

76
mod/quiz/tests/quiz_question_restore_test.php
View File

@ -379,4 +379,80 @@ class quiz_question_restore_test extends \advanced_testcase {
}
}
/**
* Ensure that question slots are correctly backed up and restored with all properties.
*
* @covers \backup_quiz_activity_structure_step::define_structure()
* @return void
*/
public function test_backup_restore_question_slots(): void {
$this->resetAfterTest(true);
$course1 = $this->getDataGenerator()->create_course();
$course2 = $this->getDataGenerator()->create_course();
$user1 = $this->getDataGenerator()->create_and_enrol($course1, 'editingteacher');
$this->getDataGenerator()->enrol_user($user1->id, $course2->id, 'editingteacher');
// Make a quiz.
$quizgenerator = $this->getDataGenerator()->get_plugin_generator('mod_quiz');
$quiz = $quizgenerator->create_instance(['course' => $course1->id, 'questionsperpage' => 0, 'grade' => 100.0,
'sumgrades' => 3]);
// Create some fixed and random questions.
$questiongenerator = $this->getDataGenerator()->get_plugin_generator('core_question');
$cat = $questiongenerator->create_question_category();
$saq = $questiongenerator->create_question('shortanswer', null, ['category' => $cat->id]);
$numq = $questiongenerator->create_question('numerical', null, ['category' => $cat->id]);
$matchq = $questiongenerator->create_question('match', null, ['category' => $cat->id]);
$randomcat = $questiongenerator->create_question_category();
$questiongenerator->create_question('shortanswer', null, ['category' => $randomcat->id]);
$questiongenerator->create_question('numerical', null, ['category' => $randomcat->id]);
$questiongenerator->create_question('match', null, ['category' => $randomcat->id]);
// Add them to the quiz.
quiz_add_quiz_question($saq->id, $quiz, 1, 3);
quiz_add_quiz_question($numq->id, $quiz, 2, 2);
quiz_add_quiz_question($matchq->id, $quiz, 3, 1);
quiz_add_random_questions($quiz, 3, $randomcat->id, 2, false);
$quizobj = quiz_settings::create($quiz->id, $user1->id);
$originalstructure = \mod_quiz\structure::create_for_quiz($quizobj);
// Set one slot to a non-default display number.
$originalslots = $originalstructure->get_slots();
$firstslot = reset($originalslots);
$originalstructure->update_slot_display_number($firstslot->id, rand(5, 10));
// Set one slot to requireprevious.
$lastslot = end($originalslots);
$originalstructure->update_question_dependency($lastslot->id, true);
// Backup and restore the quiz.
$backupid = $this->backup_quiz($quiz, $user1);
$this->restore_quiz($backupid, $course2, $user1);
// Ensure the restored slots match the original slots.
$modinfo = get_fast_modinfo($course2);
$quizzes = $modinfo->get_instances_of('quiz');
$restoredquiz = reset($quizzes);
$restoredquizobj = quiz_settings::create($restoredquiz->instance, $user1->id);
$restoredstructure = \mod_quiz\structure::create_for_quiz($restoredquizobj);
$restoredslots = array_values($restoredstructure->get_slots());
$originalstructure = \mod_quiz\structure::create_for_quiz($quizobj);
$originalslots = array_values($originalstructure->get_slots());
foreach ($restoredslots as $key => $restoredslot) {
$originalslot = $originalslots[$key];
$this->assertEquals($originalslot->quizid, $quiz->id);
$this->assertEquals($restoredslot->quizid, $restoredquiz->instance);
$this->assertEquals($originalslot->slot, $restoredslot->slot);
$this->assertEquals($originalslot->page, $restoredslot->page);
$this->assertEquals($originalslot->displaynumber, $restoredslot->displaynumber);
$this->assertEquals($originalslot->requireprevious, $restoredslot->requireprevious);
$this->assertEquals($originalslot->maxmark, $restoredslot->maxmark);
}
}
}