From 1b7e0abcb89b1bbd24c449d4c33e4e48ceeffb45 Mon Sep 17 00:00:00 2001
From: Tim Hunt <T.J.Hunt@open.ac.uk>
Date: Thu, 26 May 2011 22:08:03 +0100
Subject: [PATCH] MDL-47494 ddwtos: Implement the new variants handling.

---
 .../type/ddwtos/simpletest/testquestion.php   | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/question/type/ddwtos/simpletest/testquestion.php b/question/type/ddwtos/simpletest/testquestion.php
index c7f27d76db6..58fea4279cf 100755
--- a/question/type/ddwtos/simpletest/testquestion.php
+++ b/question/type/ddwtos/simpletest/testquestion.php
@@ -55,7 +55,7 @@ class qtype_ddwtos_question_test extends UnitTestCase {
     public function test_summarise_response() {
         $dd = test_question_maker::make_question('ddwtos');
         $dd->shufflechoices = false;
-        $dd->start_attempt(new question_attempt_step());
+        $dd->start_attempt(new question_attempt_step(), 1);
 
         $this->assertEqual('{quick} {fox} {lazy}',
                 $dd->summarise_response(array('p1' => '1', 'p2' => '1', 'p3' => '1')));
@@ -64,7 +64,7 @@ class qtype_ddwtos_question_test extends UnitTestCase {
     public function test_summarise_response_maths() {
         $dd = test_question_maker::make_question('ddwtos', 'maths');
         $dd->shufflechoices = false;
-        $dd->start_attempt(new question_attempt_step());
+        $dd->start_attempt(new question_attempt_step(), 1);
 
         $this->assertEqual('{+} {-} {+} {-}',
                 $dd->summarise_response(array('p1' => '1', 'p2' => '2', 'p3' => '1', 'p4' => '2')));
@@ -83,7 +83,7 @@ class qtype_ddwtos_question_test extends UnitTestCase {
     public function test_get_right_choice_for() {
         $dd = test_question_maker::make_question('ddwtos');
         $dd->shufflechoices = false;
-        $dd->start_attempt(new question_attempt_step());
+        $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));
@@ -92,7 +92,7 @@ class qtype_ddwtos_question_test extends UnitTestCase {
     public function test_get_right_choice_for_maths() {
         $dd = test_question_maker::make_question('ddwtos', 'maths');
         $dd->shufflechoices = false;
-        $dd->start_attempt(new question_attempt_step());
+        $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));
@@ -101,7 +101,7 @@ class qtype_ddwtos_question_test extends UnitTestCase {
     public function test_clear_wrong_from_response() {
         $dd = test_question_maker::make_question('ddwtos', 'maths');
         $dd->shufflechoices = false;
-        $dd->start_attempt(new question_attempt_step());
+        $dd->start_attempt(new question_attempt_step(), 1);
 
         $initialresponse = array('p1' => '1', 'p2' => '1', 'p3' => '1', 'p4' => '1');
         $this->assertEqual(array('p1' => '1', 'p2' => '0', 'p3' => '1', 'p4' => '0'),
@@ -111,7 +111,7 @@ class qtype_ddwtos_question_test extends UnitTestCase {
     public function test_get_num_parts_right() {
         $dd = test_question_maker::make_question('ddwtos');
         $dd->shufflechoices = false;
-        $dd->start_attempt(new question_attempt_step());
+        $dd->start_attempt(new question_attempt_step(), 1);
 
         $this->assertEqual(array(2, 3),
                 $dd->get_num_parts_right(array('p1' => '1', 'p2' => '1', 'p3' => '2')));
@@ -122,7 +122,7 @@ class qtype_ddwtos_question_test extends UnitTestCase {
     public function test_get_num_parts_right_maths() {
         $dd = test_question_maker::make_question('ddwtos', 'maths');
         $dd->shufflechoices = false;
-        $dd->start_attempt(new question_attempt_step());
+        $dd->start_attempt(new question_attempt_step(), 1);
 
         $this->assertEqual(array(2, 4),
                 $dd->get_num_parts_right(array(
@@ -131,7 +131,7 @@ class qtype_ddwtos_question_test extends UnitTestCase {
 
     public function test_get_expected_data() {
         $dd = test_question_maker::make_question('ddwtos');
-        $dd->start_attempt(new question_attempt_step());
+        $dd->start_attempt(new question_attempt_step(), 1);
 
         $this->assertEqual(array('p1' => PARAM_INT, 'p2' => PARAM_INT, 'p3' => PARAM_INT),
                 $dd->get_expected_data());
@@ -140,7 +140,7 @@ class qtype_ddwtos_question_test extends UnitTestCase {
     public function test_get_correct_response() {
         $dd = test_question_maker::make_question('ddwtos');
         $dd->shufflechoices = false;
-        $dd->start_attempt(new question_attempt_step());
+        $dd->start_attempt(new question_attempt_step(), 1);
 
         $this->assertEqual(array('p1' => '1', 'p2' => '1', 'p3' => '1'),
                 $dd->get_correct_response());
@@ -149,7 +149,7 @@ class qtype_ddwtos_question_test extends UnitTestCase {
     public function test_get_correct_response_maths() {
         $dd = test_question_maker::make_question('ddwtos', 'maths');
         $dd->shufflechoices = false;
-        $dd->start_attempt(new question_attempt_step());
+        $dd->start_attempt(new question_attempt_step(), 1);
 
         $this->assertEqual(array('p1' => '1', 'p2' => '2', 'p3' => '1', 'p4' => '2'),
                 $dd->get_correct_response());
@@ -157,7 +157,7 @@ class qtype_ddwtos_question_test extends UnitTestCase {
 
     public function test_is_same_response() {
         $dd = test_question_maker::make_question('ddwtos');
-        $dd->start_attempt(new question_attempt_step());
+        $dd->start_attempt(new question_attempt_step(), 1);
 
         $this->assertTrue($dd->is_same_response(
                 array(),
@@ -181,7 +181,7 @@ class qtype_ddwtos_question_test extends UnitTestCase {
     }
     public function test_is_complete_response() {
         $dd = test_question_maker::make_question('ddwtos');
-        $dd->start_attempt(new question_attempt_step());
+        $dd->start_attempt(new question_attempt_step(), 1);
 
         $this->assertFalse($dd->is_complete_response(array()));
         $this->assertFalse($dd->is_complete_response(
@@ -193,7 +193,7 @@ class qtype_ddwtos_question_test extends UnitTestCase {
 
     public function test_is_gradable_response() {
         $dd = test_question_maker::make_question('ddwtos');
-        $dd->start_attempt(new question_attempt_step());
+        $dd->start_attempt(new question_attempt_step(), 1);
 
         $this->assertFalse($dd->is_gradable_response(array()));
         $this->assertFalse($dd->is_gradable_response(
@@ -208,7 +208,7 @@ class qtype_ddwtos_question_test extends UnitTestCase {
     public function test_grading() {
         $dd = test_question_maker::make_question('ddwtos');
         $dd->shufflechoices = false;
-        $dd->start_attempt(new question_attempt_step());
+        $dd->start_attempt(new question_attempt_step(), 1);
 
         $this->assertEqual(array(1, question_state::$gradedright),
                 $dd->grade_response(array('p1' => '1', 'p2' => '1', 'p3' => '1')));
@@ -221,7 +221,7 @@ class qtype_ddwtos_question_test extends UnitTestCase {
     public function test_grading_maths() {
         $dd = test_question_maker::make_question('ddwtos', 'maths');
         $dd->shufflechoices = false;
-        $dd->start_attempt(new question_attempt_step());
+        $dd->start_attempt(new question_attempt_step(), 1);
 
         $this->assertEqual(array(1, question_state::$gradedright),
                 $dd->grade_response(array('p1' => '1', 'p2' => '2', 'p3' => '1', 'p4' => '2')));
@@ -234,7 +234,7 @@ class qtype_ddwtos_question_test extends UnitTestCase {
     public function test_classify_response() {
         $dd = test_question_maker::make_question('ddwtos');
         $dd->shufflechoices = false;
-        $dd->start_attempt(new question_attempt_step());
+        $dd->start_attempt(new question_attempt_step(), 1);
 
         $this->assertEqual(array(
                     1 => new question_classified_response(1, 'quick', 1),