mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 00:12:56 +02:00
Code Issues Projects Releases Wiki Activity

MDL-77378 qtype_multianswer: Fix division by zero errors

Browse Source
This commit is contained in:
Tomo Tsuyuki 2023-07-18 11:52:26 +10:00
parent 13553c25da
commit 2ba3b8b27e
3 changed files with 73 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
question/type/multianswer/question.php
View File

@ -147,6 +147,9 @@ class qtype_multianswer_question extends question_graded_automatically_with_coun
$fractionmax += $subq->defaultmark;
$fractionsum += $subq->defaultmark * $subq->get_min_fraction();
}
if (empty($fractionsum)) {
return 0;
}
return $fractionsum / (!empty($this->subquestions) ? $fractionmax : 1);
}
@ -157,6 +160,9 @@ class qtype_multianswer_question extends question_graded_automatically_with_coun
$fractionmax += $subq->defaultmark;
$fractionsum += $subq->defaultmark * $subq->get_max_fraction();
}
if (empty($fractionsum)) {
return 1;
}
return $fractionsum / (!empty($this->subquestions) ? $fractionmax : 1);
}
@ -299,6 +305,9 @@ class qtype_multianswer_question extends question_graded_automatically_with_coun
$overallstate = $this->combine_states($overallstate, $newstate);
}
}
if (empty($fractionmax)) {
return array(null, $overallstate ?? question_state::$finished);
}
return array($fractionsum / $fractionmax, $overallstate);
}

46
question/type/multianswer/tests/helper.php
View File

@ -37,7 +37,7 @@ require_once($CFG->dirroot . '/question/type/multianswer/question.php');
*/
class qtype_multianswer_test_helper extends question_test_helper {
public function get_test_questions() {
return array('twosubq', 'fourmc', 'numericalzero', 'dollarsigns', 'multiple');
return array('twosubq', 'fourmc', 'numericalzero', 'dollarsigns', 'multiple', 'zeroweight');
}
/**
@ -486,4 +486,48 @@ class qtype_multianswer_test_helper extends question_test_helper {
return $q;
}
/**
* Makes a multianswer question with zero weight.
* This is used for testing the MDL-77378 bug.
* @return qtype_multianswer_question
*/
public function make_multianswer_question_zeroweight() {
question_bank::load_question_definition_classes('multianswer');
$q = new qtype_multianswer_question();
test_question_maker::initialise_a_question($q);
$q->name = 'Zero weight';
$q->questiontext =
'Optional question: {#1}.';
$q->generalfeedback = '';
$q->qtype = question_bank::get_qtype('multianswer');
$q->textfragments = array(
'Optional question: ',
'.',
);
$q->places = array('1' => '1');
// Shortanswer subquestion.
question_bank::load_question_definition_classes('shortanswer');
$sa = new qtype_shortanswer_question();
test_question_maker::initialise_a_question($sa);
$sa->name = 'Zero weight';
$sa->questiontext = '{0:SHORTANSWER:~%0%Input box~%100%*}';
$sa->questiontextformat = FORMAT_HTML;
$sa->generalfeedback = '';
$sa->generalfeedbackformat = FORMAT_HTML;
$sa->usecase = true;
$sa->answers = array(
13 => new question_answer(13, 'Input box', 0.0, '', FORMAT_HTML),
14 => new question_answer(14, '*', 1.0, '', FORMAT_HTML),
);
$sa->qtype = question_bank::get_qtype('shortanswer');
$sa->defaultmark = 0;
$q->subquestions = array(
1 => $sa,
);
return $q;
}
}

19
question/type/multianswer/tests/question_test.php
View File

@ -350,4 +350,23 @@ class question_test extends \advanced_testcase {
$newquestion->update_attempt_state_data_for_new_version($oldstep, $question));
}
/**
* Test functions work with zero weight.
* This is used for testing the MDL-77378 bug.
*/
public function test_zeroweight() {
$this->resetAfterTest();
/** @var \qtype_multianswer_question $question */
$question = \test_question_maker::make_question('multianswer', 'zeroweight');
$question->start_attempt(new question_attempt_step(), 1);
$this->assertEquals([null, question_state::$gradedright], $question->grade_response(
['sub1_answer' => 'Something']));
$this->assertEquals([null, question_state::$gradedwrong], $question->grade_response(
['sub1_answer' => 'Input box']));
$this->assertEquals(1, $question->get_max_fraction());
$this->assertEquals(0, $question->get_min_fraction());
}
}