moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-67673 phpunit: Remove deprecated assertContains() uses on strings

Browse source 
Both assertContains() and assertNotContains() are deprecated in PHPUnit 8
for operations on strings. Also the optional case parameter is. All uses
must be changed to one of:

- assertStringContainsString()
- assertStringContainsStringIgnoringCase()
- assertStringNotContainsString()
- assertStringNotContainsStringIgnoringCase()

More info: https://github.com/sebastianbergmann/phpunit/issues/3422

Regexp to find all uses:

ag 'assert(Not)?Contains\('
This commit is contained in:
Eloy Lafuente (stronk7) 2020-09-01 00:44:13 +02:00
parent 106c64ac24
commit 35bc26b516
113 changed files with 720 additions and 720 deletions
Download patch file Download diff file Expand all files Collapse all files

4
message/output/email/tests/send_email_task_test.php
View file

@ -127,8 +127,8 @@ class core_message_send_email_task_testcase extends advanced_testcase {
$this->assertSame($user2->email, $email->to);
$this->assertNotEmpty($email->header);
$emailbody = quoted_printable_decode($email->body);
$this->assertContains('Group 1', $emailbody);
$this->assertContains('Group 2', $emailbody);
$this->assertStringContainsString('Group 1', $emailbody);
$this->assertStringContainsString('Group 2', $emailbody);
// 5 unread messages per conversation, this will be listed twice.
$this->assertRegExp("/<span\b[^>]*>5<\/span> <span\b[^>]*>Unread message\w+/", $emailbody);

54
message/tests/api_test.php
View file

@ -2270,16 +2270,16 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
$message4 = $messages[3];
$this->assertEquals($user1->id, $message1->useridfrom);
$this->assertContains('Yo!', $message1->text);
$this->assertStringContainsString('Yo!', $message1->text);
$this->assertEquals($user2->id, $message2->useridfrom);
$this->assertContains('Sup mang?', $message2->text);
$this->assertStringContainsString('Sup mang?', $message2->text);
$this->assertEquals($user1->id, $message3->useridfrom);
$this->assertContains('Writing PHPUnit tests!', $message3->text);
$this->assertStringContainsString('Writing PHPUnit tests!', $message3->text);
$this->assertEquals($user1->id, $message4->useridfrom);
$this->assertContains('Word.', $message4->text);
$this->assertStringContainsString('Word.', $message4->text);
// Confirm the members data is correct.
$members = $convmessages['members'];
@ -2330,19 +2330,19 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
$message5 = $messages[4];
$this->assertEquals($user1->id, $message1->useridfrom);
$this->assertContains('Yo!', $message1->text);
$this->assertStringContainsString('Yo!', $message1->text);
$this->assertEquals($user2->id, $message2->useridfrom);
$this->assertContains('Sup mang?', $message2->text);
$this->assertStringContainsString('Sup mang?', $message2->text);
$this->assertEquals($user3->id, $message3->useridfrom);
$this->assertContains('Writing PHPUnit tests!', $message3->text);
$this->assertStringContainsString('Writing PHPUnit tests!', $message3->text);
$this->assertEquals($user1->id, $message4->useridfrom);
$this->assertContains('Word.', $message4->text);
$this->assertStringContainsString('Word.', $message4->text);
$this->assertEquals($user2->id, $message5->useridfrom);
$this->assertContains('Yeah!', $message5->text);
$this->assertStringContainsString('Yeah!', $message5->text);
// Confirm the members data is correct.
$members = $convmessages['members'];
@ -2457,10 +2457,10 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
$message3 = $messages[2];
$message4 = $messages[3];
$this->assertContains('Message 1', $message1->text);
$this->assertContains('Message 2', $message2->text);
$this->assertContains('Message 3', $message3->text);
$this->assertContains('Message 4', $message4->text);
$this->assertStringContainsString('Message 1', $message1->text);
$this->assertStringContainsString('Message 2', $message2->text);
$this->assertStringContainsString('Message 3', $message3->text);
$this->assertStringContainsString('Message 4', $message4->text);
// Confirm the members data is correct.
$members = $convmessages['members'];
@ -2480,8 +2480,8 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
$message1 = $messages[0];
$message2 = $messages[1];
$this->assertContains('Message 3', $message1->text);
$this->assertContains('Message 4', $message2->text);
$this->assertStringContainsString('Message 3', $message1->text);
$this->assertStringContainsString('Message 4', $message2->text);
// Confirm the members data is correct.
$members = $convmessages['members'];
@ -2530,10 +2530,10 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
$message3 = $messages[2];
$message4 = $messages[3];
$this->assertContains('Message 1', $message1->text);
$this->assertContains('Message 2', $message2->text);
$this->assertContains('Message 3', $message3->text);
$this->assertContains('Message 4', $message4->text);
$this->assertStringContainsString('Message 1', $message1->text);
$this->assertStringContainsString('Message 2', $message2->text);
$this->assertStringContainsString('Message 3', $message3->text);
$this->assertStringContainsString('Message 4', $message4->text);
// Confirm the members data is correct.
$members = $convmessages['members'];
@ -2553,8 +2553,8 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
$message1 = $messages[0];
$message2 = $messages[1];
$this->assertContains('Message 1', $message1->text);
$this->assertContains('Message 2', $message2->text);
$this->assertStringContainsString('Message 1', $message1->text);
$this->assertStringContainsString('Message 2', $message2->text);
// Confirm the members data is correct.
$members = $convmessages['members'];
@ -2601,8 +2601,8 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
$message1 = $messages[0];
$message2 = $messages[1];
$this->assertContains('Message 2', $message1->text);
$this->assertContains('Message 3', $message2->text);
$this->assertStringContainsString('Message 2', $message1->text);
$this->assertStringContainsString('Message 3', $message2->text);
// Confirm the members data is correct.
$members = $convmessages['members'];
@ -2649,8 +2649,8 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
$message1 = $messages[0];
$message2 = $messages[1];
$this->assertContains('Message 3', $message1->text);
$this->assertContains('Message 4', $message2->text);
$this->assertStringContainsString('Message 3', $message1->text);
$this->assertStringContainsString('Message 4', $message2->text);
// Confirm the members data is correct.
$members = $convmessages['members'];
@ -2696,7 +2696,7 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
$message1 = $messages[0];
$this->assertContains('Message 3', $message1->text);
$this->assertStringContainsString('Message 3', $message1->text);
// Confirm the members data is correct.
$members = $convmessages['members'];
@ -2733,7 +2733,7 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
// Check the results are correct.
$this->assertEquals($user2->id, $message->useridfrom);
$this->assertContains('Word.', $message->text);
$this->assertStringContainsString('Word.', $message->text);
}
/**

22
message/tests/externallib_test.php
View file

@ -2812,16 +2812,16 @@ class core_message_externallib_testcase extends externallib_advanced_testcase {
$message4 = $messages[3];
$this->assertEquals($user1->id, $message1['useridfrom']);
$this->assertContains('Yo!', $message1['text']);
$this->assertStringContainsString('Yo!', $message1['text']);
$this->assertEquals($user3->id, $message2['useridfrom']);
$this->assertContains('Sup mang?', $message2['text']);
$this->assertStringContainsString('Sup mang?', $message2['text']);
$this->assertEquals($user2->id, $message3['useridfrom']);
$this->assertContains('Writing PHPUnit tests!', $message3['text']);
$this->assertStringContainsString('Writing PHPUnit tests!', $message3['text']);
$this->assertEquals($user1->id, $message4['useridfrom']);
$this->assertContains('Word.', $message4['text']);
$this->assertStringContainsString('Word.', $message4['text']);
}
/**
@ -2870,9 +2870,9 @@ class core_message_externallib_testcase extends externallib_advanced_testcase {
$message2 = $messages[1];
$message3 = $messages[2];
$this->assertContains('Message 2', $message1['text']);
$this->assertContains('Message 3', $message2['text']);
$this->assertContains('Message 4', $message3['text']);
$this->assertStringContainsString('Message 2', $message1['text']);
$this->assertStringContainsString('Message 3', $message2['text']);
$this->assertStringContainsString('Message 4', $message3['text']);
// Confirm the members data is correct.
$members = $result['members'];
@ -2936,16 +2936,16 @@ class core_message_externallib_testcase extends externallib_advanced_testcase {
$message4 = $messages[3];
$this->assertEquals($user1->id, $message1['useridfrom']);
$this->assertContains('Yo!', $message1['text']);
$this->assertStringContainsString('Yo!', $message1['text']);
$this->assertEquals($user3->id, $message2['useridfrom']);
$this->assertContains('Sup mang?', $message2['text']);
$this->assertStringContainsString('Sup mang?', $message2['text']);
$this->assertEquals($user2->id, $message3['useridfrom']);
$this->assertContains('Writing PHPUnit tests!', $message3['text']);
$this->assertStringContainsString('Writing PHPUnit tests!', $message3['text']);
$this->assertEquals($user1->id, $message4['useridfrom']);
$this->assertContains('Word.', $message4['text']);
$this->assertStringContainsString('Word.', $message4['text']);
}
/**