diff --git a/badges/tests/badgeslib_test.php b/badges/tests/badgeslib_test.php index 4c5c05930a442..fc80b9b4ff2be 100644 --- a/badges/tests/badgeslib_test.php +++ b/badges/tests/badgeslib_test.php @@ -199,15 +199,15 @@ public function test_badge_status() { $badge = new badge($this->badgeid); $old_status = $badge->status; $badge->set_status(BADGE_STATUS_ACTIVE); - $this->assertAttributeNotEquals($old_status, 'status', $badge); - $this->assertAttributeEquals(BADGE_STATUS_ACTIVE, 'status', $badge); + $this->assertNotEquals($old_status, $badge->status); + $this->assertEquals(BADGE_STATUS_ACTIVE, $badge->status); } public function test_delete_badge() { $badge = new badge($this->badgeid); $badge->delete(); // We don't actually delete badges. We archive them. - $this->assertAttributeEquals(BADGE_STATUS_ARCHIVED, 'status', $badge); + $this->assertEquals(BADGE_STATUS_ARCHIVED, $badge->status); } /** diff --git a/message/tests/api_test.php b/message/tests/api_test.php index 917ab4e3c0c40..abcacd8f89dfc 100644 --- a/message/tests/api_test.php +++ b/message/tests/api_test.php @@ -5572,8 +5572,8 @@ public function test_send_message_to_conversation_individual_conversation() { // Verify the message returned. $this->assertInstanceOf(\stdClass::class, $message1); $this->assertObjectHasAttribute('id', $message1); - $this->assertAttributeEquals($user1->id, 'useridfrom', $message1); - $this->assertAttributeEquals('this is a message', 'text', $message1); + $this->assertEquals($user1->id, $message1->useridfrom); + $this->assertEquals('this is a message', $message1->text); $this->assertObjectHasAttribute('timecreated', $message1); // Verify events. Note: the event is a message read event because of an if (PHPUNIT) conditional within message_send(), @@ -5614,8 +5614,8 @@ public function test_send_message_to_conversation_group_conversation() { // Verify the message returned. $this->assertInstanceOf(\stdClass::class, $message1); $this->assertObjectHasAttribute('id', $message1); - $this->assertAttributeEquals($user1->id, 'useridfrom', $message1); - $this->assertAttributeEquals('message to the group', 'text', $message1); + $this->assertEquals($user1->id, $message1->useridfrom); + $this->assertEquals('message to the group', $message1->text); $this->assertObjectHasAttribute('timecreated', $message1); // Test customdata. $customdata = json_decode($messages[0]->customdata); @@ -5683,8 +5683,8 @@ public function test_send_message_to_conversation_linked_group_conversation() { // Verify the message returned. $this->assertInstanceOf(\stdClass::class, $message1); $this->assertObjectHasAttribute('id', $message1); - $this->assertAttributeEquals($user1->id, 'useridfrom', $message1); - $this->assertAttributeEquals('message to the group', 'text', $message1); + $this->assertEquals($user1->id, $message1->useridfrom); + $this->assertEquals('message to the group', $message1->text); $this->assertObjectHasAttribute('timecreated', $message1); // Test customdata. $customdata = json_decode($messages[0]->customdata); diff --git a/question/type/calculatedsimple/tests/questiontype_test.php b/question/type/calculatedsimple/tests/questiontype_test.php index 35483c6732af3..d18bd3f35f22d 100644 --- a/question/type/calculatedsimple/tests/questiontype_test.php +++ b/question/type/calculatedsimple/tests/questiontype_test.php @@ -90,13 +90,13 @@ public function test_question_saving_sumwithvariants() { foreach ($questiondata as $property => $value) { if (!in_array($property, array('id', 'version', 'timemodified', 'timecreated', 'options'))) { - $this->assertAttributeEquals($value, $property, $actualquestiondata); + $this->assertEquals($value, $actualquestiondata->$property); } } foreach ($questiondata->options as $optionname => $value) { if ($optionname != 'answers') { - $this->assertAttributeEquals($value, $optionname, $actualquestiondata->options); + $this->assertEquals($value, $actualquestiondata->options->$optionname); } } @@ -104,7 +104,7 @@ public function test_question_saving_sumwithvariants() { $actualanswer = array_shift($actualquestiondata->options->answers); foreach ($answer as $ansproperty => $ansvalue) { if (!in_array($ansproperty, array('id', 'question', 'answerformat'))) { - $this->assertAttributeEquals($ansvalue, $ansproperty, $actualanswer); + $this->assertEquals($ansvalue, $actualanswer->$ansproperty); } } } diff --git a/question/type/description/tests/questiontype_test.php b/question/type/description/tests/questiontype_test.php index b2444800ceea3..7e0dd575be912 100644 --- a/question/type/description/tests/questiontype_test.php +++ b/question/type/description/tests/questiontype_test.php @@ -95,7 +95,7 @@ public function test_question_saving() { foreach ($questiondata as $property => $value) { if (!in_array($property, array('id', 'version', 'timemodified', 'timecreated'))) { - $this->assertAttributeEquals($value, $property, $actualquestiondata); + $this->assertEquals($value, $actualquestiondata->$property); } } } diff --git a/question/type/match/tests/questiontype_test.php b/question/type/match/tests/questiontype_test.php index 0da8cacb2192f..dd9ee1c806e14 100644 --- a/question/type/match/tests/questiontype_test.php +++ b/question/type/match/tests/questiontype_test.php @@ -185,13 +185,13 @@ public function test_question_saving_foursubq() { foreach ($questiondata as $property => $value) { if (!in_array($property, array('id', 'version', 'timemodified', 'timecreated', 'options', 'stamp'))) { - $this->assertAttributeEquals($value, $property, $actualquestiondata); + $this->assertEquals($value, $actualquestiondata->$property); } } foreach ($questiondata->options as $optionname => $value) { if ($optionname != 'subquestions') { - $this->assertAttributeEquals($value, $optionname, $actualquestiondata->options); + $this->assertEquals($value, $actualquestiondata->options->$optionname); } } @@ -202,7 +202,7 @@ public function test_question_saving_foursubq() { $actualsubq = array_shift($actualquestiondata->options->subquestions); foreach ($subq as $subqproperty => $subqvalue) { if (!in_array($subqproperty, $subqpropstoignore)) { - $this->assertAttributeEquals($subqvalue, $subqproperty, $actualsubq); + $this->assertEquals($subqvalue, $actualsubq->$subqproperty); } } } diff --git a/question/type/multianswer/tests/questiontype_test.php b/question/type/multianswer/tests/questiontype_test.php index eb8e6071d4b18..defb2bda1da24 100644 --- a/question/type/multianswer/tests/questiontype_test.php +++ b/question/type/multianswer/tests/questiontype_test.php @@ -251,13 +251,13 @@ public function test_question_saving_twosubq() { foreach ($questiondata as $property => $value) { if (!in_array($property, array('id', 'version', 'timemodified', 'timecreated', 'options', 'hints', 'stamp'))) { - $this->assertAttributeEquals($value, $property, $actualquestiondata); + $this->assertEquals($value, $actualquestiondata->$property); } } foreach ($questiondata->options as $optionname => $value) { if ($optionname != 'questions') { - $this->assertAttributeEquals($value, $optionname, $actualquestiondata->options); + $this->assertEquals($value, $actualquestiondata->options->$optionname); } } @@ -265,7 +265,7 @@ public function test_question_saving_twosubq() { $actualhint = array_shift($actualquestiondata->hints); foreach ($hint as $property => $value) { if (!in_array($property, array('id', 'questionid', 'options'))) { - $this->assertAttributeEquals($value, $property, $actualhint); + $this->assertEquals($value, $actualhint->$property); } } } @@ -279,12 +279,12 @@ public function test_question_saving_twosubq() { $actualsubq = $actualquestiondata->options->questions[$subqno]; foreach ($subq as $subqproperty => $subqvalue) { if (!in_array($subqproperty, $subqpropstoignore)) { - $this->assertAttributeEquals($subqvalue, $subqproperty, $actualsubq); + $this->assertEquals($subqvalue, $actualsubq->$subqproperty); } } foreach ($subq->options as $optionname => $value) { if (!in_array($optionname, array('answers'))) { - $this->assertAttributeEquals($value, $optionname, $actualsubq->options); + $this->assertEquals($value, $actualsubq->options->$optionname); } } foreach ($subq->options->answers as $answer) { @@ -292,7 +292,7 @@ public function test_question_saving_twosubq() { foreach ($answer as $ansproperty => $ansvalue) { // These questions do not use 'answerformat', will ignore it. if (!in_array($ansproperty, array('id', 'question', 'answerformat'))) { - $this->assertAttributeEquals($ansvalue, $ansproperty, $actualanswer); + $this->assertEquals($ansvalue, $actualanswer->$ansproperty); } } } diff --git a/question/type/multichoice/tests/questiontype_test.php b/question/type/multichoice/tests/questiontype_test.php index c18ead0627c63..7068cab481bd7 100644 --- a/question/type/multichoice/tests/questiontype_test.php +++ b/question/type/multichoice/tests/questiontype_test.php @@ -134,13 +134,13 @@ public function test_question_saving_two_of_four($which) { foreach ($questiondata as $property => $value) { if (!in_array($property, array('id', 'version', 'timemodified', 'timecreated', 'options', 'hints', 'stamp'))) { - $this->assertAttributeEquals($value, $property, $actualquestiondata); + $this->assertEquals($value, $actualquestiondata->$property); } } foreach ($questiondata->options as $optionname => $value) { if ($optionname != 'answers') { - $this->assertAttributeEquals($value, $optionname, $actualquestiondata->options); + $this->assertEquals($value, $actualquestiondata->options->$optionname); } } @@ -148,7 +148,7 @@ public function test_question_saving_two_of_four($which) { $actualhint = array_shift($actualquestiondata->hints); foreach ($hint as $property => $value) { if (!in_array($property, array('id', 'questionid', 'options'))) { - $this->assertAttributeEquals($value, $property, $actualhint); + $this->assertEquals($value, $actualhint->$property); } } } @@ -158,7 +158,7 @@ public function test_question_saving_two_of_four($which) { 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); + $this->assertEquals($ansvalue, $actualanswer->$ansproperty); } } } diff --git a/question/type/numerical/tests/questiontype_test.php b/question/type/numerical/tests/questiontype_test.php index 9a39cde39f4b3..fef820cc586ca 100644 --- a/question/type/numerical/tests/questiontype_test.php +++ b/question/type/numerical/tests/questiontype_test.php @@ -149,13 +149,13 @@ public function test_question_saving_pi() { foreach ($questiondata as $property => $value) { if (!in_array($property, array('options'))) { - $this->assertAttributeEquals($value, $property, $actualquestiondata); + $this->assertEquals($value, $actualquestiondata->$property); } } foreach ($questiondata->options as $optionname => $value) { if (!in_array($optionname, array('answers'))) { - $this->assertAttributeEquals($value, $optionname, $actualquestiondata->options); + $this->assertEquals($value, $actualquestiondata->options->$optionname); } } @@ -164,7 +164,7 @@ public function test_question_saving_pi() { 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); + $this->assertEquals($ansvalue, $actualanswer->$ansproperty); } } } diff --git a/question/type/shortanswer/tests/questiontype_test.php b/question/type/shortanswer/tests/questiontype_test.php index 71ec1fe72fb8e..5a1ca8397c55a 100644 --- a/question/type/shortanswer/tests/questiontype_test.php +++ b/question/type/shortanswer/tests/questiontype_test.php @@ -121,13 +121,13 @@ public function test_question_saving_frogtoad() { foreach ($questiondata as $property => $value) { if (!in_array($property, array('id', 'version', 'timemodified', 'timecreated', 'options'))) { - $this->assertAttributeEquals($value, $property, $actualquestiondata); + $this->assertEquals($value, $actualquestiondata->$property); } } foreach ($questiondata->options as $optionname => $value) { if ($optionname != 'answers') { - $this->assertAttributeEquals($value, $optionname, $actualquestiondata->options); + $this->assertEquals($value, $actualquestiondata->options->$optionname); } } @@ -136,7 +136,7 @@ public function test_question_saving_frogtoad() { 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); + $this->assertEquals($ansvalue, $actualanswer->$ansproperty); } } } diff --git a/question/type/truefalse/tests/questiontype_test.php b/question/type/truefalse/tests/questiontype_test.php index 1408a443cc6ee..6bae0bcdc271c 100644 --- a/question/type/truefalse/tests/questiontype_test.php +++ b/question/type/truefalse/tests/questiontype_test.php @@ -161,13 +161,13 @@ public function test_question_saving_true() { foreach ($questiondata as $property => $value) { if (!in_array($property, array('options'))) { - $this->assertAttributeEquals($value, $property, $actualquestiondata); + $this->assertEquals($value, $actualquestiondata->$property); } } foreach ($questiondata->options as $optionname => $value) { if (!in_array($optionname, array('trueanswer', 'falseanswer', 'answers'))) { - $this->assertAttributeEquals($value, $optionname, $actualquestiondata->options); + $this->assertEquals($value, $actualquestiondata->options->$optionname); } } @@ -177,7 +177,7 @@ public function test_question_saving_true() { 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); + $this->assertEquals($ansvalue, $actualanswer->$ansproperty); } } $answerindexes[$answer->answer] = $ansindex;