MDL-47673 quiz generator: default grade 100 & fix review options

The review option defaults need to be like what you get from the editing
form, no what is stored in the database, or they don't work!

diff --git a/mod/quiz/tests/generator/lib.php b/mod/quiz/tests/generator/lib.php
index c13fc2f..d3448a9 100644 (file)
--- a/mod/quiz/tests/generator/lib.php
+++ b/mod/quiz/tests/generator/lib.php
@@ -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,