MDL-20636 Merge branch 'master' into qe2_wip

[moodle.git] / question / format / gift / simpletest / testgiftformat.php

diff --git a/question/format/gift/simpletest/testgiftformat.php b/question/format/gift/simpletest/testgiftformat.php
index 113329a..8f44f32 100644 (file)
--- a/question/format/gift/simpletest/testgiftformat.php
+++ b/question/format/gift/simpletest/testgiftformat.php
@@ -57,8 +57,8 @@ class qformat_gift_test extends UnitTestCase {
             'generalfeedback' => '',
             'generalfeedbackformat' => FORMAT_MOODLE,
             'qtype' => 'essay',
-            'defaultgrade' => 1,
-            'penalty' => 0.1,
+            'defaultmark' => 1,
+            'penalty' => 0.3333333,
             'length' => 1,
             'feedback' => array(
                 'text' => '',
@@ -78,8 +78,8 @@ class qformat_gift_test extends UnitTestCase {
             'questiontextformat' => FORMAT_MOODLE,
             'generalfeedback' => '',
             'generalfeedbackformat' => FORMAT_MOODLE,
-            'defaultgrade' => 1,
-            'penalty' => 0.1,
+            'defaultmark' => 1,
+            'penalty' => 0.3333333,
             'length' => 1,
             'qtype' => 'essay',
             'options' => (object) array(
@@ -129,8 +129,8 @@ class qformat_gift_test extends UnitTestCase {
             'generalfeedback' => '',
             'generalfeedbackformat' => FORMAT_HTML,
             'qtype' => 'match',
-            'defaultgrade' => 1,
-            'penalty' => 0.1,
+            'defaultmark' => 1,
+            'penalty' => 0.3333333,
             'length' => 1,
             'shuffleanswers' => '1',
             'subquestions' => array(
@@ -182,8 +182,8 @@ class qformat_gift_test extends UnitTestCase {
             'questiontextformat' => FORMAT_HTML,
             'generalfeedback' => '',
             'generalfeedbackformat' => FORMAT_HTML,
-            'defaultgrade' => 1,
-            'penalty' => 0.1,
+            'defaultmark' => 1,
+            'penalty' => 0.3333333,
             'length' => 1,
             'qtype' => 'match',
             'options' => (object) array(
@@ -273,8 +273,8 @@ class qformat_gift_test extends UnitTestCase {
             'generalfeedback' => '',
             'generalfeedbackformat' => FORMAT_MOODLE,
             'qtype' => 'multichoice',
-            'defaultgrade' => 1,
-            'penalty' => 0.1,
+            'defaultmark' => 1,
+            'penalty' => 0.3333333,
             'length' => 1,
             'single' => 1,
             'shuffleanswers' => '1',
@@ -345,8 +345,8 @@ class qformat_gift_test extends UnitTestCase {
             'questiontextformat' => FORMAT_MOODLE,
             'generalfeedback' => '',
             'generalfeedbackformat' => FORMAT_MOODLE,
-            'defaultgrade' => 1,
-            'penalty' => 0.1,
+            'defaultmark' => 1,
+            'penalty' => 0.3333333,
             'length' => 1,
             'qtype' => 'multichoice',
             'options' => (object) array(
@@ -419,8 +419,8 @@ class qformat_gift_test extends UnitTestCase {
             'generalfeedback' => '',
             'generalfeedbackformat' => FORMAT_MOODLE,
             'qtype' => 'numerical',
-            'defaultgrade' => 1,
-            'penalty' => 0.1,
+            'defaultmark' => 1,
+            'penalty' => 0.3333333,
             'length' => 1,
             'answer' => array(
                 '3',
@@ -457,7 +457,7 @@ class qformat_gift_test extends UnitTestCase {
             'questiontextformat' => FORMAT_MOODLE,
             'generalfeedback' => '',
             'generalfeedbackformat' => FORMAT_MOODLE,
-            'defaultgrade' => 1,
+            'defaultmark' => 1,
             'penalty' => 1,
             'length' => 1,
             'qtype' => 'numerical',
@@ -528,8 +528,8 @@ class qformat_gift_test extends UnitTestCase {
             'generalfeedback' => '',
             'generalfeedbackformat' => FORMAT_MOODLE,
             'qtype' => 'shortanswer',
-            'defaultgrade' => 1,
-            'penalty' => 0.1,
+            'defaultmark' => 1,
+            'penalty' => 0.3333333,
             'length' => 1,
             'answer' => array(
                 'Frog',
@@ -571,7 +571,7 @@ class qformat_gift_test extends UnitTestCase {
             'questiontextformat' => FORMAT_MOODLE,
             'generalfeedback' => '',
             'generalfeedbackformat' => FORMAT_MOODLE,
-            'defaultgrade' => 1,
+            'defaultmark' => 1,
             'penalty' => 1,
             'length' => 1,
             'qtype' => 'shortanswer',
@@ -640,7 +640,7 @@ FALSE#42 is the Ultimate Answer.#You gave the right answer.}";
             'generalfeedback' => '',
             'generalfeedbackformat' => FORMAT_MOODLE,
             'qtype' => 'truefalse',
-            'defaultgrade' => 1,
+            'defaultmark' => 1,
             'penalty' => 1,
             'length' => 1,
             'correctanswer' => 0,
@@ -674,7 +674,7 @@ FALSE#42 is the Ultimate Answer.#You gave the right answer.}";
             'generalfeedback' => '',
             'generalfeedbackformat' => FORMAT_MOODLE,
             'qtype' => 'truefalse',
-            'defaultgrade' => 1,
+            'defaultmark' => 1,
             'penalty' => 1,
             'length' => 1,
             'correctanswer' => 1,
@@ -708,7 +708,7 @@ FALSE#42 is the Ultimate Answer.#You gave the right answer.}";
             'generalfeedback' => '',
             'generalfeedbackformat' => FORMAT_MOODLE,
             'qtype' => 'truefalse',
-            'defaultgrade' => 1,
+            'defaultmark' => 1,
             'penalty' => 1,
             'length' => 1,
             'correctanswer' => 1,
@@ -735,7 +735,7 @@ FALSE#42 is the Ultimate Answer.#You gave the right answer.}";
             'questiontextformat' => FORMAT_MOODLE,
             'generalfeedback' => '',
             'generalfeedbackformat' => FORMAT_MOODLE,
-            'defaultgrade' => 1,
+            'defaultmark' => 1,
             'penalty' => 1,
             'length' => 1,
             'qtype' => 'truefalse',