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

MDL-78056 mod_h5pactivity: Fix incorrect attempt report

Browse Source 
* Fix interpretation of the results on the attempt report whenever case
sensitive option is enabled.
This commit is contained in:
Laurent David
2023-06-19 06:10:29 +02:00
parent 1b1a15a308
commit 2144bdf06c
3 changed files with 139 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/h5pactivity/classes/output/result/fillin.php
+4 -3
View File
@@ -54,8 +54,9 @@ class fillin extends result {
// There are two way in which H5P could force case sensitivity, with extensions
// or using options in the correctpatterns. By default it is case sensible.
$casesensitive = $extensions['https://h5p.org/x-api/case-sensitivity'] ?? true;
if (!empty($this->result->correctpattern) && strpos($this->result->correctpattern, '{case_matters=false}') !== null) {
$casesensitive = false;
if ((!empty($this->result->correctpattern)
&& strpos($this->result->correctpattern, '{case_matters=false}') !== false)) {
$casesensitive = false;
}
$values = [];
@@ -101,7 +102,7 @@ class fillin extends result {
} else {
$state = parent::INCORRECT;
}
$option->useranswer = $this->get_answer($state, $gapresponse);
$option->useranswer = $this->get_answer($state, $this->response[$key]);
$option->correctanswer = $this->get_answer(parent::TEXT, implode(' / ', $value));
mod/h5pactivity/tests/behat/result_fillin.feature
+6 -6
View File
@@ -40,10 +40,10 @@ Feature: View fill the blanks attempt report
When I navigate to "Attempts report" in current page administration
And I follow "View report"
Then I should see "Of which countries are Berlin, Washington, Beijing, Canberra and Brasilia the capitals?"
And I should see "brigadoon" in the "brasilia" "table_row"
And "Your answer is incorrect" "icon" should exist in the "brasilia" "table_row"
And I should see "emerald city" in the "washington" "table_row"
And I should see "narnia" in the "berlin" "table_row"
And "Your answer is incorrect" "icon" should exist in the "berlin" "table_row"
And "Your answer is correct" "icon" should exist in the "canberra" "table_row"
And I should see "Brigadoon" in the "Brasilia" "table_row"
And "Your answer is incorrect" "icon" should exist in the "Brasilia" "table_row"
And I should see "Emerald city" in the "Washington" "table_row"
And I should see "Narnia" in the "Berlin" "table_row"
And "Your answer is incorrect" "icon" should exist in the "Berlin" "table_row"
And "Your answer is correct" "icon" should exist in the "Canberra" "table_row"
And I should not see "<p>"
mod/h5pactivity/tests/output/result/result_test.php
+129
View File
@@ -0,0 +1,129 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
namespace mod_h5pactivity\output\result;
use core_xapi\local\statement\item_result;
use core_xapi\xapi_exception;
use mod_h5pactivity\local\manager;
/**
* Result test class for H5P activity.
*
* @package mod_h5pactivity
* @covers \mod_h5pactivity\output\result
* @category test
* @copyright 2023 Laurent David <[email protected]>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class result_test extends \advanced_testcase {
/**
* Test result export_options
*
* @param array $providedresultdata
* @param array $expecteduseranswers
* @return void
* @dataProvider result_data_provider
* @covers \mod_h5pactivity\output\result::export_options
*/
public function test_result_options(array $providedresultdata, array $expecteduseranswers): void {
$this->resetAfterTest();
$this->setAdminUser();
$course = $this->getDataGenerator()->create_course();
$activity = $this->getDataGenerator()->create_module('h5pactivity',
['course' => $course]);
$manager = manager::create_from_instance($activity);
$cm = $manager->get_coursemodule();
$student = $this->getDataGenerator()->create_and_enrol($course, 'student');
$generator = $this->getDataGenerator()->get_plugin_generator('mod_h5pactivity');
$params = ['cmid' => $cm->id, 'userid' => $student->id];
$attempt = $generator->create_content($activity, $params);
$resultdata = [
'attemptid' => $attempt->id,
'subcontent' => '',
'timecreated' => time(),
'completion' => true,
'success' => true,
'score' => (object) ['min' => 0, 'max' => 2, 'raw' => 2, 'scaled' => 1],
'duration' => 'PT25S',
];
$resultdata = array_merge($resultdata, $providedresultdata);
$result = item_result::create_from_data((object) $resultdata);
$classname = "mod_h5pactivity\\output\\result\\{$providedresultdata['interactiontype']}";
$classname = str_replace('-', '', $classname);
$reflectionoutput = new \ReflectionClass($classname);
$constructor = $reflectionoutput->getConstructor();
$constructor->setAccessible(true);
$resultoutput = $reflectionoutput->newInstanceWithoutConstructor();
$constructor->invoke($resultoutput, $result->get_data());
$exportoptions = $reflectionoutput->getMethod('export_options');
$exportoptions->setAccessible(true);
$data = $exportoptions->invoke($resultoutput);
$useranswersdata = array_map(function($item) {
return $item->useranswer;
}, $data);
$this->assertEquals($expecteduseranswers, $useranswersdata);
}
/**
* Data provider for result export_options test
* @return array[]
*/
public function result_data_provider(): array {
return [
'fill-in with case sensitive' => [
'result' => [
'interactiontype' => 'fill-in',
'description' => '<p>Fill in the missing words</p>
<p>Meow .... this is a __________</p>
<p>Bark... this is a __________</p>',
'correctpattern' => '["{case_matters=true}cat[,]dog"]',
'response' => 'Cat[,]dog',
'additionals' => '{"extensions":{"http:\\/\\/h5p.org\\/x-api\\/h5p-local-content-id":31,'
. '"https:\\/\\/h5p.org\\/x-api\\/case-sensitivity":true,'
. '"https:\\/\\/h5p.org\\/x-api\\/alternatives":[["cat"],["dog"]]},"contextExtensions":{}}',
],
'useranswers' => [
(object) ['answer' => 'Cat', 'incorrect' => true],
(object) ['answer' => 'dog', 'correct' => true],
],
],
'fill-in with case insensitive' => [
'result' => [
'interactiontype' => 'fill-in',
'description' => '<p>Fill in the missing words</p>
<p>Meow .... this is a __________</p>
<p>Bark... this is a __________</p>',
'correctpattern' => '["{case_matters=false}cat[,]dog"]',
'response' => 'Cat[,]dog',
'additionals' => '{"extensions":{"http:\\/\\/h5p.org\\/x-api\\/h5p-local-content-id":31,'
. '"https:\\/\\/h5p.org\\/x-api\\/case-sensitivity":false,'
. '"https:\\/\\/h5p.org\\/x-api\\/alternatives":[["cat"],["dog"]]},"contextExtensions":{}}',
],
'useranswers' => [
(object) ['answer' => 'Cat', 'correct' => true],
(object) ['answer' => 'dog', 'correct' => true],
],
]
];
}
}