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

MDL-71036 phpunit: assertContains() now performs strict comparison

Browse Source 
The methods assertContains() and assertNotContains() now perform
strict (type and value) comparison, pretty much like assertSame()
does.

A couple of new assertContainsEquals() and assertNotContainsEquals()
methods have been created to provide old (non-strict) behavior, pretty
much like assertEquals() do.

Apart from replacing the calls needing a relaxed comparison to those
new methods, there are also a couple of alternative, about how to
fix this, depending of every case:

- If the test is making any array_values() conversion, then it's better
  to remove that conversion and use assertArrayHasKey(), that is not
  strict.
- Sometimes if may be also possible to, simply, cast the expectation
  to the exact type coming in the array. I've not applied this technique
  to any of the cases in core.

Link: https://github.com/sebastianbergmann/phpunit/issues/3426
This commit is contained in:
Eloy Lafuente (stronk7)
2021-03-11 23:07:31 +01:00
parent 8940f67486
commit 3dd26fe334
27 changed files with 139 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files
message/tests/api_test.php
+7 -7
View File
@@ -1545,7 +1545,7 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
$conversations = \core_message\api::get_conversations($user1->id);
// Consider first conversations is self-conversation.
$this->assertCount(7, $conversations);
$this->assertContains($gc2->id, array_column($conversations, 'id'));
$this->assertContainsEquals($gc2->id, array_column($conversations, 'id'));
// Delete all messages from an individual conversation the user is in - it should not be returned.
$this->assertTrue(\core_message\api::is_user_in_conversation($user1->id, $ic1->id));
@@ -1557,7 +1557,7 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
$conversations = \core_message\api::get_conversations($user1->id);
// Consider first conversations is self-conversation.
$this->assertCount(6, $conversations);
$this->assertNotContains($ic1->id, array_column($conversations, 'id'));
$this->assertNotContainsEquals($ic1->id, array_column($conversations, 'id'));
}
/**
@@ -5580,8 +5580,8 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
// however, we can still determine the number and ids of any recipients this way.
$this->assertCount(1, $events);
$userids = array_column($events, 'userid');
$this->assertNotContains($user1->id, $userids);
$this->assertContains($user2->id, $userids);
$this->assertNotContainsEquals($user1->id, $userids);
$this->assertContainsEquals($user2->id, $userids);
}
/**
@@ -5629,9 +5629,9 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
// however, we can still determine the number and ids of any recipients this way.
$this->assertCount(2, $events);
$userids = array_column($events, 'userid');
$this->assertNotContains($user1->id, $userids);
$this->assertContains($user3->id, $userids);
$this->assertContains($user4->id, $userids);
$this->assertNotContainsEquals($user1->id, $userids);
$this->assertContainsEquals($user3->id, $userids);
$this->assertContainsEquals($user4->id, $userids);
}
/**