L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-38542 shortanswer qtype: was broken for responses of '0'.

Browse Source 
This was a regression caused by MDL-37157 & MDL-37746.
This commit is contained in:
Tim Hunt
2013-03-19 13:55:41 +00:00
parent 29f8c0937a
commit 708c1b7fc8
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/type/shortanswer/question.php
+2 -2
View File
@@ -117,7 +117,7 @@ class qtype_shortanswer_question extends question_graded_by_strategy
* @return string the normalised string.
*/
protected static function safe_normalize($string) {
if (!$string) {
if ($string === '') {
return '';
}
@@ -126,7 +126,7 @@ class qtype_shortanswer_question extends question_graded_by_strategy
}
$normalised = normalizer_normalize($string, Normalizer::FORM_C);
if (!$normalised) {
if (is_null($normalised)) {
// An error occurred in normalizer_normalize, but we have no idea what.
debugging('Failed to normalise string: ' . $string, DEBUG_DEVELOPER);
return $string; // Return the original string, since it is the best we have.
question/type/shortanswer/tests/question_test.php
+12
View File
@@ -120,6 +120,18 @@ class qtype_shortanswer_question_test extends advanced_testcase {
}
}
public function test_compare_0_with_wildcard() {
// Test the classic PHP problem case with '0'.
$this->assertTrue((bool)qtype_shortanswer_question::compare_string_with_wildcard(
'0', '0', false));
$this->assertTrue((bool)qtype_shortanswer_question::compare_string_with_wildcard(
'0', '0*', false));
$this->assertTrue((bool)qtype_shortanswer_question::compare_string_with_wildcard(
'0', '*0', false));
$this->assertTrue((bool)qtype_shortanswer_question::compare_string_with_wildcard(
'0', '*0*', false));
}
public function test_is_complete_response() {
$question = test_question_maker::make_question('shortanswer');