From 072fcde3ee71e8bf0b45f135b6bccfeab05cfb88 Mon Sep 17 00:00:00 2001 From: Bas Brands Date: Wed, 27 Nov 2019 13:38:09 +0100 Subject: [PATCH] MDL-66999 theme_boost: @extend phpunit fixes --- .../adaptive/tests/mark_display_test.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/question/behaviour/adaptive/tests/mark_display_test.php b/question/behaviour/adaptive/tests/mark_display_test.php index 738d5accbe2..5a91a25bb95 100644 --- a/question/behaviour/adaptive/tests/mark_display_test.php +++ b/question/behaviour/adaptive/tests/mark_display_test.php @@ -58,7 +58,7 @@ class qbehaviour_adaptive_mark_display_test extends basic_testcase { } public function test_correct_no_penalty() { - $this->assertEquals('
' . get_string('correct', 'question') . '
' . + $this->assertEquals('
' . get_string('correct', 'question') . '
' . '
' . get_string('gradingdetails', 'qbehaviour_adaptive', array('cur' => '1.00', 'raw' => '1.00', 'max' => '1.00')) . '
', @@ -67,8 +67,8 @@ class qbehaviour_adaptive_mark_display_test extends basic_testcase { } public function test_partial_first_try() { - $this->assertEquals('
' . get_string('partiallycorrect', 'question') . '
' . - '
' . + $this->assertEquals('
' . get_string('partiallycorrect', 'question') . + '
' . get_string('gradingdetails', 'qbehaviour_adaptive', array('cur' => '0.50', 'raw' => '0.50', 'max' => '1.00')) . ' ' . get_string('gradingdetailspenalty', 'qbehaviour_adaptive', '0.10') . '
', @@ -78,8 +78,8 @@ class qbehaviour_adaptive_mark_display_test extends basic_testcase { public function test_partial_second_try() { $mark = array('cur' => '0.80', 'raw' => '0.90', 'max' => '1.00'); - $this->assertEquals('
' . get_string('partiallycorrect', 'question') . '
' . - '
' . + $this->assertEquals('
' . get_string('partiallycorrect', 'question') . + '
' . get_string('gradingdetails', 'qbehaviour_adaptive', $mark) . ' ' . get_string('gradingdetailsadjustment', 'qbehaviour_adaptive', $mark) . ' ' . get_string('gradingdetailspenalty', 'qbehaviour_adaptive', '0.10') . ' ' . @@ -90,8 +90,8 @@ class qbehaviour_adaptive_mark_display_test extends basic_testcase { public function test_correct_third_try() { $mark = array('cur' => '0.80', 'raw' => '1.00', 'max' => '1.00'); - $this->assertEquals('
' . get_string('partiallycorrect', 'question') . '
' . - '
' . + $this->assertEquals('
' . get_string('partiallycorrect', 'question') . + '
' . get_string('gradingdetails', 'qbehaviour_adaptive', $mark) . ' ' . get_string('gradingdetailsadjustment', 'qbehaviour_adaptive', $mark) . '
', $this->renderer->render_adaptive_marks(new qbehaviour_adaptive_mark_details( @@ -100,8 +100,8 @@ class qbehaviour_adaptive_mark_display_test extends basic_testcase { public function test_correct_third_try_if_we_dont_increase_penalties_for_wrong() { $mark = array('cur' => '0.80', 'raw' => '1.00', 'max' => '1.00'); - $this->assertEquals('
' . get_string('partiallycorrect', 'question') . '
' . - '
' . + $this->assertEquals('
' . get_string('partiallycorrect', 'question') . + '
' . get_string('gradingdetails', 'qbehaviour_adaptive', $mark) . ' ' . get_string('gradingdetailsadjustment', 'qbehaviour_adaptive', $mark) . '
', $this->renderer->render_adaptive_marks(new qbehaviour_adaptive_mark_details(