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

MDL-41570 fixes match qtype's prepare_simulated_post_data

Browse Source 
And converts more unit tests to use the method
This commit is contained in:
Jamie Pratt 2013-09-03 18:55:26 +07:00
parent f09119e1e5
commit f8f37f1edc
2 changed files with 44 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
question/type/match/question.php
View File

@ -190,11 +190,20 @@ class qtype_match_question extends question_graded_automatically_with_countback
public function prepare_simulated_post_data($simulatedresponse) {
$postdata = array();
$stemnos = array_flip($this->stemorder);
$stemids = array_keys($this->stems);
$choicetochoiceno = array_flip($this->choices);
$choicenotochoiceselectvalue = array_flip($this->choiceorder);
foreach ($simulatedresponse as $subquestion => $choice) {
$postdata[$this->field($stemnos[$subquestion + 1])] = $choicenotochoiceselectvalue[$choicetochoiceno[$choice]];
foreach ($simulatedresponse as $stemno => $choice) {
$stemid = $stemids[$stemno];
$shuffledstemno = array_search($stemid, $this->stemorder);
if (empty($choice)) {
$choiceselectvalue = 0;
} else if ($choicetochoiceno[$choice]) {
$choiceselectvalue = $choicenotochoiceselectvalue[$choicetochoiceno[$choice]];
} else {
throw new coding_exception("Unknown choice $choice in matching question - {$this->name}.");
}
$postdata[$this->field($shuffledstemno)] = $choiceselectvalue;
}
return $postdata;
}

66
question/type/match/tests/question_test.php
View File

@ -98,35 +98,33 @@ class qtype_match_question_test extends advanced_testcase {
public function test_grading() {
$question = test_question_maker::make_a_matching_question();
$question->shufflestems = false;
$question->start_attempt(new question_attempt_step(), 1);
$choiceorder = $question->get_choice_order();
$orderforchoice = array_combine(array_values($choiceorder), array_keys($choiceorder));
$this->assertEquals(array(1, question_state::$gradedright),
$question->grade_response(array('sub0' => $orderforchoice[1],
'sub1' => $orderforchoice[2], 'sub2' => $orderforchoice[2],
'sub3' => $orderforchoice[1])));
$this->assertEquals(array(0.25, question_state::$gradedpartial),
$question->grade_response(array('sub0' => $orderforchoice[1])));
$this->assertEquals(array(0, question_state::$gradedwrong),
$question->grade_response(array('sub0' => $orderforchoice[2],
'sub1' => $orderforchoice[3], 'sub2' => $orderforchoice[1],
'sub3' => $orderforchoice[2])));
$correctreponse = $question->prepare_simulated_post_data(
array(0 => 'Mammal', 1 => 'Amphibian', 2 => 'Amphibian', 3 => 'Mammal'));
$this->assertEquals(array(1, question_state::$gradedright), $question->grade_response($correctreponse));
$partialresponse = $question->prepare_simulated_post_data(array(0 => 'Mammal'));
$this->assertEquals(array(0.25, question_state::$gradedpartial), $question->grade_response($partialresponse));
$partiallycorrectresponse = $question->prepare_simulated_post_data(
array(0 => 'Mammal', 1 => 'Insect', 2 => 'Insect', 3 => 'Amphibian'));
$this->assertEquals(array(0.25, question_state::$gradedpartial), $question->grade_response($partiallycorrectresponse));
$wrongresponse = $question->prepare_simulated_post_data(
array(0 => 'Amphibian', 1 => 'Insect', 2 => 'Insect', 3 => 'Amphibian'));
$this->assertEquals(array(0, question_state::$gradedwrong), $question->grade_response($wrongresponse));
}
public function test_get_correct_response() {
$question = test_question_maker::make_a_matching_question();
$question->shufflestems = false;
$question->start_attempt(new question_attempt_step(), 1);
$choiceorder = $question->get_choice_order();
$orderforchoice = array_combine(array_values($choiceorder), array_keys($choiceorder));
$this->assertEquals(array('sub0' => $orderforchoice[1], 'sub1' => $orderforchoice[2],
'sub2' => $orderforchoice[2], 'sub3' => $orderforchoice[1]),
$question->get_correct_response());
$correct = $question->prepare_simulated_post_data(array(0 => 'Mammal', 1 => 'Amphibian', 2 => 'Amphibian', 3 => 'Mammal'));
$this->assertEquals($correct, $question->get_correct_response());
}
public function test_get_question_summary() {
@ -144,40 +142,40 @@ class qtype_match_question_test extends advanced_testcase {
public function test_summarise_response() {
$match = test_question_maker::make_a_matching_question();
$match->shufflestems = false;
$match->start_attempt(new question_attempt_step(), 1);
$summary = $match->summarise_response(array('sub0' => 2, 'sub1' => 1));
$summary = $match->summarise_response($match->prepare_simulated_post_data(array(0 => 'Amphibian', 1 => 'Mammal')));
$this->assertRegExp('/Dog -> \w+; Frog -> \w+/', $summary);
$this->assertRegExp('/Dog -> Amphibian/', $summary);
$this->assertRegExp('/Frog -> Mammal/', $summary);
}
public function test_classify_response() {
$match = test_question_maker::make_a_matching_question();
$match->shufflestems = false;
$match->start_attempt(new question_attempt_step(), 1);
$choiceorder = $match->get_choice_order();
$orderforchoice = array_combine(array_values($choiceorder), array_keys($choiceorder));
$choices = array(0 => get_string('choose') . '...');
foreach ($choiceorder as $key => $choice) {
$choices[$key] = $match->choices[$choice];
}
$response = $match->prepare_simulated_post_data(array(0 => 'Amphibian', 1 => 'Insect', 2 => '', 3 => ''));
$this->assertEquals(array(
1 => new question_classified_response(2, 'Amphibian', 0),
2 => new question_classified_response(3, 'Insect', 0),
3 => question_classified_response::no_response(),
4 => question_classified_response::no_response(),
), $match->classify_response(array('sub0' => $orderforchoice[2],
'sub1' => $orderforchoice[3], 'sub2' => 0, 'sub3' => 0)));
), $match->classify_response($response));
$response = $match->prepare_simulated_post_data(array(0 => 'Mammal', 1 => 'Amphibian', 2 => 'Amphibian', 3 => 'Mammal'));
$this->assertEquals(array(
1 => new question_classified_response(1, 'Mammal', 0.25),
2 => new question_classified_response(2, 'Amphibian', 0.25),
3 => new question_classified_response(2, 'Amphibian', 0.25),
4 => new question_classified_response(1, 'Mammal', 0.25),
), $match->classify_response(array('sub0' => $orderforchoice[1],
'sub1' => $orderforchoice[2], 'sub2' => $orderforchoice[2],
'sub3' => $orderforchoice[1])));
), $match->classify_response($response));
}
public function test_prepare_simulated_post_data() {
$m = test_question_maker::make_a_matching_question();
$m->start_attempt(new question_attempt_step(), 1);
$postdata = $m->prepare_simulated_post_data(array(0 => 'Mammal', 1 => 'Amphibian', 2 => 'Amphibian', 3 => 'Mammal'));
$this->assertEquals(array(4, 4), $m->get_num_parts_right($postdata));
}
}