Merge branch 'MDL-47673' of git://github.com/timhunt/moodle

This commit is contained in:
Dan Poltawski
2014-10-20 17:20:26 +01:00
+30 -11
View File
@@ -27,12 +27,10 @@ class mod_quiz_generator extends testing_module_generator {
public function create_instance($record = null, array $options = null) {
global $CFG;
require_once($CFG->dirroot.'/mod/quiz/locallib.php');
$record = (object)(array)$record;
$alwaysvisible = mod_quiz_display_options::DURING | mod_quiz_display_options::IMMEDIATELY_AFTER |
mod_quiz_display_options::LATER_WHILE_OPEN | mod_quiz_display_options::AFTER_CLOSE;
$defaultquizsettings = array(
'timeopen' => 0,
'timeclose' => 0,
@@ -42,18 +40,39 @@ class mod_quiz_generator extends testing_module_generator {
'grademethod' => QUIZ_GRADEHIGHEST,
'decimalpoints' => 2,
'questiondecimalpoints' => -1,
'reviewattempt' => $alwaysvisible,
'reviewcorrectness' => $alwaysvisible,
'reviewmarks' => $alwaysvisible,
'reviewspecificfeedback' => $alwaysvisible,
'reviewgeneralfeedback' => $alwaysvisible,
'reviewrightanswer' => $alwaysvisible,
'reviewoverallfeedback' => $alwaysvisible,
'attemptduring' => 1,
'correctnessduring' => 1,
'marksduring' => 1,
'specificfeedbackduring' => 1,
'generalfeedbackduring' => 1,
'rightanswerduring' => 1,
'overallfeedbackduring' => 0,
'attemptimmediately' => 1,
'correctnessimmediately' => 1,
'marksimmediately' => 1,
'specificfeedbackimmediately' => 1,
'generalfeedbackimmediately' => 1,
'rightanswerimmediately' => 1,
'overallfeedbackimmediately' => 1,
'attemptopen' => 1,
'correctnessopen' => 1,
'marksopen' => 1,
'specificfeedbackopen' => 1,
'generalfeedbackopen' => 1,
'rightansweropen' => 1,
'overallfeedbackopen' => 1,
'attemptclosed' => 1,
'correctnessclosed' => 1,
'marksclosed' => 1,
'specificfeedbackclosed' => 1,
'generalfeedbackclosed' => 1,
'rightanswerclosed' => 1,
'overallfeedbackclosed' => 1,
'questionsperpage' => 1,
'shufflequestions' => 0,
'shuffleanswers' => 1,
'sumgrades' => 0,
'grade' => 0,
'grade' => 100,
'timecreated' => time(),
'timemodified' => time(),
'timelimit' => 0,