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

MDL-47494 ddmarker: Merge remote-tracking branch 'jp/wip_unittestconversions'

Browse Source 
Conflicts:
	tests/question_test.php
	tests/questiontype_test.php
	tests/shapes_test.php
	tests/walkthrough_test.php
This commit is contained in:
Tim Hunt
2012-06-20 10:54:05 +01:00
parent 41db46c6f9 4c72a49cd7
commit 77192cf305
5 changed files with 65 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
question/type/ddmarker/simpletest/helper.php → question/type/ddmarker/tests/helper.php
View File
question/type/ddmarker/simpletest/testquestion.php → question/type/ddmarker/tests/question_test.php
+36 -35
View File
@@ -17,8 +17,7 @@
/**
* Unit tests for the drag-and-drop markers question definition class.
*
* @package qtype
* @subpackage ddmarker
* @package qtype_ddmarker
* @copyright 2012 The Open University
* @author Jamie Pratt <me@jamiep.org>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -26,22 +25,24 @@
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/question/engine/simpletest/helpers.php');
require_once($CFG->dirroot . '/question/type/ddmarker/simpletest/helper.php');
require_once($CFG->dirroot . '/question/engine/tests/helpers.php');
require_once($CFG->dirroot . '/question/type/ddmarker/tests/helper.php');
/**
* Unit tests for the drag-and-drop markers question definition class.
*
* @copyright 2009 The Open University
* @copyright 2012 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @group qtype_ddmarker
*/
class qtype_ddmarker_question_test extends UnitTestCase {
class qtype_ddmarker_question_test extends basic_testcase {
public function test_get_question_summary() {
$dd = test_question_maker::make_question('ddmarker');
$this->assertEqual('The quick brown fox jumped over the lazy dog.; '.
$this->assertEquals('The quick brown fox jumped over the lazy dog.; '.
'[[Drop zone 1]] -> {quick / fox / lazy}; '.
'[[Drop zone 2]] -> {quick / fox / lazy}; '.
'[[Drop zone 3]] -> {quick / fox / lazy}',
@@ -50,7 +51,7 @@ class qtype_ddmarker_question_test extends UnitTestCase {
public function test_get_question_summary_maths() {
$dd = test_question_maker::make_question('ddmarker', 'maths');
$this->assertEqual('Fill in the operators to make this equation work:; '.
$this->assertEquals('Fill in the operators to make this equation work:; '.
'[[Drop zone 1]] -> {+ / - / * / /}; '.
'[[Drop zone 2]] -> {+ / - / * / /}; '.
'[[Drop zone 3]] -> {+ / - / * / /}',
@@ -62,7 +63,7 @@ class qtype_ddmarker_question_test extends UnitTestCase {
$dd->shufflechoices = false;
$dd->start_attempt(new question_attempt_step(), 1);
$this->assertEqual('{Drop zone 1 -> quick}, '.
$this->assertEquals('{Drop zone 1 -> quick}, '.
'{Drop zone 2 -> fox}, '.
'{Drop zone 3 -> lazy}',
$dd->summarise_response(array('c1' => '50,50',
@@ -75,7 +76,7 @@ class qtype_ddmarker_question_test extends UnitTestCase {
$dd->shufflechoices = false;
$dd->start_attempt(new question_attempt_step(), 1);
$this->assertEqual('{Drop zone 1 -> +}, '.
$this->assertEquals('{Drop zone 1 -> +}, '.
'{Drop zone 2 -> +}, '.
'{Drop zone 3 -> +}',
$dd->summarise_response(array('c1' => '50,50;150,50;50,150',
@@ -85,12 +86,12 @@ class qtype_ddmarker_question_test extends UnitTestCase {
public function test_get_random_guess_score() {
$dd = test_question_maker::make_question('ddmarker');
$this->assertEqual(null, $dd->get_random_guess_score());
$this->assertEquals(null, $dd->get_random_guess_score());
}
public function test_get_random_guess_score_maths() {
$dd = test_question_maker::make_question('ddmarker', 'maths');
$this->assertEqual(null, $dd->get_random_guess_score());
$this->assertEquals(null, $dd->get_random_guess_score());
}
public function test_get_right_choice_for() {
@@ -98,9 +99,9 @@ class qtype_ddmarker_question_test extends UnitTestCase {
$dd->shufflechoices = false;
$dd->start_attempt(new question_attempt_step(), 1);
$this->assertEqual(1, $dd->get_right_choice_for(1));
$this->assertEqual(2, $dd->get_right_choice_for(2));
$this->assertEqual(3, $dd->get_right_choice_for(3));
$this->assertEquals(1, $dd->get_right_choice_for(1));
$this->assertEquals(2, $dd->get_right_choice_for(2));
$this->assertEquals(3, $dd->get_right_choice_for(3));
}
public function test_get_right_choice_for_maths() {
@@ -108,9 +109,9 @@ class qtype_ddmarker_question_test extends UnitTestCase {
$dd->shufflechoices = false;
$dd->start_attempt(new question_attempt_step(), 1);
$this->assertEqual(1, $dd->get_right_choice_for(1));
$this->assertEqual(1, $dd->get_right_choice_for(2));
$this->assertEqual(1, $dd->get_right_choice_for(3));
$this->assertEquals(1, $dd->get_right_choice_for(1));
$this->assertEquals(1, $dd->get_right_choice_for(2));
$this->assertEquals(1, $dd->get_right_choice_for(3));
}
public function test_clear_wrong_from_response() {
@@ -119,7 +120,7 @@ class qtype_ddmarker_question_test extends UnitTestCase {
$dd->start_attempt(new question_attempt_step(), 1);
$initialresponse = array('c1' => '50,50', 'c2' => '100,100', 'c3' => '100,100;200,200');
$this->assertEqual(array('c1' => '50,50', 'c2' => '', 'c3' => ''),
$this->assertEquals(array('c1' => '50,50', 'c2' => '', 'c3' => ''),
$dd->clear_wrong_from_response($initialresponse));
}
@@ -131,15 +132,15 @@ class qtype_ddmarker_question_test extends UnitTestCase {
//second returned param in array is the max of correct choices or the actual number of
//items dragged.
$response1 = array('c1' => '50,50', 'c2' => '100,100', 'c3' => '100,100;200,200');
$this->assertEqual(array(1, 4), $dd->get_num_parts_right($response1));
$this->assertEquals(array(1, 4), $dd->get_num_parts_right($response1));
$response2 = array('c1' => '50,50;150,50;50,150',
'c2' => '100,100',
'c3' => '100,100;200,200');
$this->assertEqual(array(1, 6), $dd->get_num_parts_right($response2));
$this->assertEquals(array(1, 6), $dd->get_num_parts_right($response2));
$response3 = array('c1' => '50,50;150,50;50,150',
'c2' => '',
'c3' => '');
$this->assertEqual(array(1, 3), $dd->get_num_parts_right($response3));
$this->assertEquals(array(1, 3), $dd->get_num_parts_right($response3));
}
public function test_get_num_parts_right_maths() {
@@ -147,7 +148,7 @@ class qtype_ddmarker_question_test extends UnitTestCase {
$dd->shufflechoices = false;
$dd->start_attempt(new question_attempt_step(), 1);
$this->assertEqual(array(3, 3),
$this->assertEquals(array(3, 3),
$dd->get_num_parts_right(array(
'c1' => '50,50;150,50;50,150', 'c2' => '', 'c3' => '')));
}
@@ -156,7 +157,7 @@ class qtype_ddmarker_question_test extends UnitTestCase {
$dd = test_question_maker::make_question('ddmarker');
$dd->start_attempt(new question_attempt_step(), 1);
$this->assertEqual(
$this->assertEquals(
array('c1' => PARAM_NOTAGS, 'c2' => PARAM_NOTAGS, 'c3' => PARAM_NOTAGS),
$dd->get_expected_data()
);
@@ -167,7 +168,7 @@ class qtype_ddmarker_question_test extends UnitTestCase {
$dd->shufflechoices = false;
$dd->start_attempt(new question_attempt_step(), 1);
$this->assertEqual(array('c1' => '50,50', 'c2' => '150,50', 'c3' => '100,150'),
$this->assertEquals(array('c1' => '50,50', 'c2' => '150,50', 'c3' => '100,150'),
$dd->get_correct_response());
}
@@ -176,7 +177,7 @@ class qtype_ddmarker_question_test extends UnitTestCase {
$dd->shufflechoices = false;
$dd->start_attempt(new question_attempt_step(), 1);
$this->assertEqual(array('c1' => '50,50;150,50;50,150'), $dd->get_correct_response());
$this->assertEquals(array('c1' => '50,50;150,50;50,150'), $dd->get_correct_response());
}
public function test_is_same_response() {
@@ -258,11 +259,11 @@ class qtype_ddmarker_question_test extends UnitTestCase {
$dd->shufflechoices = false;
$dd->start_attempt(new question_attempt_step(), 1);
$this->assertEqual(array(1, question_state::$gradedright),
$this->assertEquals(array(1, question_state::$gradedright),
$dd->grade_response(array('c1' => '50,50', 'c2' => '150,50', 'c3' => '100,150')));
$this->assertEqual(array(2/3, question_state::$gradedpartial),
$this->assertEquals(array(2/3, question_state::$gradedpartial),
$dd->grade_response(array('c1' => '50,50', 'c2' => '50,50', 'c3' => '100,150')));
$this->assertEqual(array(0, question_state::$gradedwrong),
$this->assertEquals(array(0, question_state::$gradedwrong),
$dd->grade_response(array('c1' => '150,50', 'c2' => '50,50', 'c3' => '100,50')));
}
@@ -271,14 +272,14 @@ class qtype_ddmarker_question_test extends UnitTestCase {
$dd->shufflechoices = false;
$dd->start_attempt(new question_attempt_step(), 1);
$this->assertEqual(array(1, question_state::$gradedright),
$this->assertEquals(array(1, question_state::$gradedright),
$dd->grade_response(array('c1' => '50,50;150,50;50,150', 'c2' => '', 'c3' => '')));
$this->assertEqual(array(0.75, question_state::$gradedpartial),
$this->assertEquals(array(0.75, question_state::$gradedpartial),
$dd->grade_response(array('c1' => '50,50;150,50;50,150',
'c2' => '', 'c3' => '50,150')));
$this->assertEqual(array(0, question_state::$gradedwrong),
$this->assertEquals(array(0, question_state::$gradedwrong),
$dd->grade_response(array('c1' => '', 'c2' => '50,50;150,50', 'c3' => '100,50')));
$this->assertEqual(array(0, question_state::$gradedwrong),
$this->assertEquals(array(0, question_state::$gradedwrong),
$dd->grade_response(array('c1' => '300,300',
'c2' => '50,50;150,50',
'c3' => '100,50')));
@@ -289,13 +290,13 @@ class qtype_ddmarker_question_test extends UnitTestCase {
$dd->shufflechoices = false;
$dd->start_attempt(new question_attempt_step(), 1);
$this->assertEqual(array(
$this->assertEquals(array(
1 => new question_classified_response(1, 'quick', 1/3),
2 => new question_classified_response(2, 'fox', 1/3),
3 => new question_classified_response(3, 'lazy', 1/3)),
$dd->classify_response(array('c1' => '50,50', 'c2' => '150,50', 'c3' => '100,150')));
$this->assertEqual(array(
$this->assertEquals(array(
1 => new question_classified_response(1, 'quick', 1/3),
2 => question_classified_response::no_response(),
3 => question_classified_response::no_response()),
question/type/ddmarker/simpletest/testquestiontype.php → question/type/ddmarker/tests/questiontype_test.php
+10 -9
View File
@@ -17,8 +17,7 @@
/**
* Unit tests for the drag-and-drop markers question definition class.
*
* @package qtype
* @subpackage ddmarker
* @package qtype_ddmarker
* @copyright 2012 The Open University
* @author Jamie Pratt <me@jamiep.org>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -26,31 +25,33 @@
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/question/engine/simpletest/helpers.php');
require_once($CFG->dirroot . '/question/type/ddmarker/simpletest/helper.php');
require_once($CFG->dirroot . '/question/engine/tests/helpers.php');
require_once($CFG->dirroot . '/question/type/ddmarker/tests/helper.php');
/**
* Unit tests for the drag-and-drop markers question definition class.
*
* @copyright 2010 The Open University
* @copyright 2012 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @group qtype_ddmarker
*/
class qtype_ddmarker_test extends UnitTestCase {
class qtype_ddmarker_test extends basic_testcase {
/** @var qtype_ddmarker instance of the question type class to test. */
protected $qtype;
public function setUp() {
protected function setUp() {
$this->qtype = question_bank::get_qtype('ddmarker');;
}
public function tearDown() {
protected function tearDown() {
$this->qtype = null;
}
public function test_name() {
$this->assertEqual($this->qtype->name(), 'ddmarker');
$this->assertEquals($this->qtype->name(), 'ddmarker');
}
public function test_can_analyse_responses() {
question/type/ddmarker/simpletest/testshapes.php → question/type/ddmarker/tests/shapes_test.php
+5 -4
View File
@@ -17,8 +17,7 @@
/**
* Unit tests for the drag-and-drop words shape code.
*
* @package qtype
* @subpackage ddmarker
* @package qtype_ddmarker
* @copyright 2012 The Open University
* @author Jamie Pratt <me@jamiep.org>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -26,6 +25,7 @@
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/question/type/ddmarker/shapes.php');
@@ -33,10 +33,11 @@ require_once($CFG->dirroot . '/question/type/ddmarker/shapes.php');
/**
* Unit tests for shape code
*
* @copyright 2009 The Open University
* @copyright 2012 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @group qtype_ddmarker
*/
class qtype_ddmarker_shapes_test extends UnitTestCase {
class qtype_ddmarker_shapes_test extends basic_testcase {
public function test_polygon_hit_test() {
$shape = new qtype_ddmarker_shape_polygon('10,10;20,10;20,20;10,20');
question/type/ddmarker/simpletest/testwalkthrough.php → question/type/ddmarker/tests/walkthrough_test.php
+14 -13
View File
@@ -17,8 +17,7 @@
/**
* Unit tests for the drag-and-drop markers question type.
*
* @package qtype
* @subpackage ddmarker
* @package qtype_ddmarker
* @copyright 2012 The Open University
* @author Jamie Pratt <me@jamiep.org>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
@@ -26,16 +25,18 @@
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/question/engine/simpletest/helpers.php');
require_once($CFG->dirroot . '/question/type/ddmarker/simpletest/helper.php');
require_once($CFG->dirroot . '/question/engine/tests/helpers.php');
require_once($CFG->dirroot . '/question/type/ddmarker/tests/helper.php');
/**
* Unit tests for the drag-and-drop markers question type.
*
* @copyright 2010 The Open University
* @copyright 2012 The Open University
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @group qtype_ddmarker
*/
class qtype_ddmarker_walkthrough_test extends qbehaviour_walkthrough_test_base {
@@ -48,7 +49,7 @@ class qtype_ddmarker_walkthrough_test extends qbehaviour_walkthrough_test_base {
$expectedattrs = array();
$expectedattrs['class'] = $class;
return new ContainsTagWithAttributes('span', $expectedattrs);
return new question_contains_tag_with_attributes('span', $expectedattrs);
}
protected function get_contains_hidden_expectation($choiceno, $value = null) {
@@ -58,7 +59,7 @@ class qtype_ddmarker_walkthrough_test extends qbehaviour_walkthrough_test_base {
if (!is_null($value)) {
$expectedattributes['value'] = s($value);
}
return new ContainsTagWithAttributes('input', $expectedattributes);
return new question_contains_tag_with_attributes('input', $expectedattributes);
}
public function test_interactive_behaviour() {
@@ -122,7 +123,7 @@ class qtype_ddmarker_walkthrough_test extends qbehaviour_walkthrough_test_base {
$this->get_contains_hidden_expectation(2, '100,250'),
$this->get_contains_hidden_expectation(3, '150,250'),
$this->get_contains_try_again_button_expectation(true),
new PatternExpectation('/' .
new question_pattern_expectation('/' .
preg_quote(get_string('notcomplete', 'qbehaviour_interactive')) . '/'),
$this->get_contains_hint_expectation('This is the first hint'));
@@ -365,7 +366,7 @@ class qtype_ddmarker_walkthrough_test extends qbehaviour_walkthrough_test_base {
// Check the initial state.
$this->check_current_state(question_state::$todo);
$this->check_current_mark(null);
$this->assertEqual('interactivecountback',
$this->assertEquals('interactivecountback',
$this->quba->get_question_attempt($this->slot)->get_behaviour_name());
$this->check_current_output(
$this->get_contains_draggable_marker_home_expectation(1, false),
@@ -394,7 +395,7 @@ class qtype_ddmarker_walkthrough_test extends qbehaviour_walkthrough_test_base {
$this->get_contains_submit_button_expectation(false),
$this->get_contains_try_again_button_expectation(true),
$this->get_does_not_contain_correctness_expectation(),
new PatternExpectation('/' .
new question_pattern_expectation('/' .
preg_quote(get_string('notcomplete', 'qbehaviour_interactive')) . '/'),
$this->get_contains_hint_expectation('This is the first hint'),
$this->get_contains_num_parts_correct(2),
@@ -405,7 +406,7 @@ class qtype_ddmarker_walkthrough_test extends qbehaviour_walkthrough_test_base {
// Check that extract responses will return the reset data.
$prefix = $this->quba->get_field_prefix($this->slot);
$this->assertEqual(array('c1' => '50,50', 'c2' => '150,50'),
$this->assertEquals(array('c1' => '50,50', 'c2' => '150,50'),
$this->quba->extract_responses($this->slot,
array($prefix . 'c1' => '50,50', $prefix . 'c2' => '150,50', '-tryagain' => 1)));
@@ -445,7 +446,7 @@ class qtype_ddmarker_walkthrough_test extends qbehaviour_walkthrough_test_base {
$this->get_contains_submit_button_expectation(false),
$this->get_contains_try_again_button_expectation(true),
$this->get_does_not_contain_correctness_expectation(),
new PatternExpectation('/' .
new question_pattern_expectation('/' .
preg_quote(get_string('notcomplete', 'qbehaviour_interactive')) . '/'),
$this->get_contains_hint_expectation('This is the second hint'),
$this->get_contains_num_parts_correct(2),
@@ -708,7 +709,7 @@ class qtype_ddmarker_walkthrough_test extends qbehaviour_walkthrough_test_base {
// Verify.
$this->displayoptions->rightanswer = question_display_options::VISIBLE;
$this->assertEqual('{Drop zone 1 -> quick}, '.
$this->assertEquals('{Drop zone 1 -> quick}, '.
'{Drop zone 2 -> fox}, '.
'{Drop zone 3 -> lazy}',
$dd->get_right_answer_summary());