diff options
| -rw-r--r-- | mobile_src/addon.js | 21 | ||||
| -rw-r--r-- | mobile_src/directive.js | 27 | ||||
| -rw-r--r-- | mobile_src/handlers.js | 27 | ||||
| -rw-r--r-- | mobile_src/main.js | 27 | ||||
| -rw-r--r-- | tests/questiontype_test.php | 165 |
5 files changed, 237 insertions, 30 deletions
diff --git a/mobile_src/addon.js b/mobile_src/addon.js index e85412d..6177522 100644 --- a/mobile_src/addon.js +++ b/mobile_src/addon.js @@ -1,3 +1,24 @@ +// 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/>. + +/** + * @package qtype_algebra + * @copyright 2017 Jean-Michel Vedrine + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + angular.module('mm.addons.qtype_algebra', ['mm.core']) .config(["$mmQuestionDelegateProvider", function($mmQuestionDelegateProvider) { $mmQuestionDelegateProvider.registerHandler('mmaQtypeAlgebra', 'qtype_algebra', '$mmaQtypeAlgebraHandler'); diff --git a/mobile_src/directive.js b/mobile_src/directive.js index 2281142..ef9bddf 100644 --- a/mobile_src/directive.js +++ b/mobile_src/directive.js @@ -1,16 +1,23 @@ -// (C) Copyright 2015 Martin Dougiamas +// This file is part of Moodle - http://moodle.org/ // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at +// 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. // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// You should have received a copy of the GNU General Public License +// along with Moodle. If not, see <http://www.gnu.org/licenses/>. + +/** + * @package qtype_algebra + * @copyright 2017 Jean-Michel Vedrine + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ angular.module('mm.addons.qtype_algebra') diff --git a/mobile_src/handlers.js b/mobile_src/handlers.js index a898ccb..d50f76f 100644 --- a/mobile_src/handlers.js +++ b/mobile_src/handlers.js @@ -1,16 +1,23 @@ -// (C) Copyright 2015 Martin Dougiamas +// This file is part of Moodle - http://moodle.org/ // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at +// 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. // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// You should have received a copy of the GNU General Public License +// along with Moodle. If not, see <http://www.gnu.org/licenses/>. + +/** + * @package qtype_algebra + * @copyright 2017 Jean-Michel Vedrine + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ angular.module('mm.addons.qtype_algebra') diff --git a/mobile_src/main.js b/mobile_src/main.js index 29254ed..962ae64 100644 --- a/mobile_src/main.js +++ b/mobile_src/main.js @@ -1,16 +1,23 @@ -// (C) Copyright 2015 Martin Dougiamas +// This file is part of Moodle - http://moodle.org/ // -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at +// 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. // -// http://www.apache.org/licenses/LICENSE-2.0 +// 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. // -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +// You should have received a copy of the GNU General Public License +// along with Moodle. If not, see <http://www.gnu.org/licenses/>. + +/** + * @package qtype_algebra + * @copyright 2017 Jean-Michel Vedrine + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ angular.module('mm.addons.qtype_algebra', ['mm.core']) diff --git a/tests/questiontype_test.php b/tests/questiontype_test.php new file mode 100644 index 0000000..7a4cf4b --- /dev/null +++ b/tests/questiontype_test.php @@ -0,0 +1,165 @@ +<?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/>. + +/** + * Unit tests for the algebra question type class. + * + * @package qtype_algebra + * @copyright 2017 Jean-Michel Vedrine + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + + +defined('MOODLE_INTERNAL') || die(); + +global $CFG; +require_once($CFG->dirroot . '/question/type/algebra/questiontype.php'); +require_once($CFG->dirroot . '/question/engine/tests/helpers.php'); +require_once($CFG->dirroot . '/question/type/edit_question_form.php'); +require_once($CFG->dirroot . '/question/type/algebra/edit_algebra_form.php'); + +/** + * Unit tests for the algebra question type class. + * + * @copyright 2007 The Open University + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ +class qtype_algebra_test extends advanced_testcase { + public static $includecoverage = array( + 'question/type/questiontypebase.php', + 'question/type/algebra/questiontype.php', + ); + + protected $qtype; + + protected function setUp() { + $this->qtype = new qtype_algebra(); + } + + protected function tearDown() { + $this->qtype = null; + } + + protected function get_test_question_data() { + return test_question_maker::get_question_data('algebra', 'simplemath'); + } + + public function test_name() { + $this->assertEquals($this->qtype->name(), 'algebra', 'simplemath'); + } + + public function test_can_analyse_responses() { + $this->assertTrue($this->qtype->can_analyse_responses()); + } + + public function test_get_random_guess_score() { + $q = test_question_maker::get_question_data('algebra', 'simplemath'); + $q->options->answers[15]->fraction = 0.1; + $this->assertEquals(0.1, $this->qtype->get_random_guess_score($q)); + } + + public function test_get_possible_responses() { + $q = test_question_maker::get_question_data('algebra', 'derive'); + + $this->assertEquals(array( + $q->id => array( + 13 => new question_possible_response('2*x', 1), + 14 => new question_possible_response('x', 0.2), + null => question_possible_response::no_response() + ), + ), $this->qtype->get_possible_responses($q)); + } + + public function test_question_saving_frogtoad() { + $this->resetAfterTest(true); + $this->setAdminUser(); + + $questiondata = test_question_maker::get_question_data('algebra', 'simplemath'); + $formdata = test_question_maker::get_question_form_data('algebra', 'simplemath'); + + $generator = $this->getDataGenerator()->get_plugin_generator('core_question'); + $cat = $generator->create_question_category(array()); + + $formdata->category = "{$cat->id},{$cat->contextid}"; + qtype_algebra_edit_form::mock_submit((array)$formdata); + + $form = qtype_algebra_test_helper::get_question_editing_form($cat, $questiondata); + + $this->assertTrue($form->is_validated()); + + $fromform = $form->get_data(); + + $returnedfromsave = $this->qtype->save_question($questiondata, $fromform); + $actualquestionsdata = question_load_questions(array($returnedfromsave->id)); + $actualquestiondata = end($actualquestionsdata); + + foreach ($questiondata as $property => $value) { + if (!in_array($property, array('id', 'version', 'timemodified', 'timecreated', 'options'))) { + $this->assertAttributeEquals($value, $property, $actualquestiondata); + } + } + + foreach ($questiondata->options as $optionname => $value) { + if ($optionname != 'answers') { + $this->assertAttributeEquals($value, $optionname, $actualquestiondata->options); + } + } + + foreach ($questiondata->options->answers as $answer) { + $actualanswer = array_shift($actualquestiondata->options->answers); + foreach ($answer as $ansproperty => $ansvalue) { + // This question does not use 'answerformat', will ignore it. + if (!in_array($ansproperty, array('id', 'question', 'answerformat'))) { + $this->assertAttributeEquals($ansvalue, $ansproperty, $actualanswer); + } + } + } + } + + public function test_question_saving_trims_answers() { + $this->resetAfterTest(true); + $this->setAdminUser(); + + $questiondata = test_question_maker::get_question_data('algebra', 'simplemath'); + $formdata = test_question_maker::get_question_form_data('algebra', 'simplemath'); + + $generator = $this->getDataGenerator()->get_plugin_generator('core_question'); + $cat = $generator->create_question_category(array()); + + $formdata->category = "{$cat->id},{$cat->contextid}"; + $formdata->answer[0] = ' 7*x '; + qtype_algebra_edit_form::mock_submit((array)$formdata); + + $form = qtype_algebra_test_helper::get_question_editing_form($cat, $questiondata); + + $this->assertTrue($form->is_validated()); + + $fromform = $form->get_data(); + + $returnedfromsave = $this->qtype->save_question($questiondata, $fromform); + $actualquestionsdata = question_load_questions(array($returnedfromsave->id)); + $actualquestiondata = end($actualquestionsdata); + + $firstsavedanswer = reset($questiondata->options->answers); + $this->assertEquals('7*x', $firstsavedanswer->answer); + } + + public function test_extra_question_fields() { + $extraquestionfields = array('qtype_algebra_options', 'compareby', 'nchecks', + 'tolerance', 'allowedfuncs', 'disallow', 'answerprefix'); + $this->assertEquals($this->qtype->extra_question_fields(), $extraquestionfields); + } +} |