moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +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

8
availability/condition/completion/tests/condition_test.php
View file

@ -116,7 +116,7 @@ class availability_completion_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing or invalid ->cm', $e->getMessage());
$this->assertStringContainsString('Missing or invalid ->cm', $e->getMessage());
}
// Invalid $cm.
@ -125,7 +125,7 @@ class availability_completion_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing or invalid ->cm', $e->getMessage());
$this->assertStringContainsString('Missing or invalid ->cm', $e->getMessage());
}
// Missing $e.
@ -134,7 +134,7 @@ class availability_completion_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing or invalid ->e', $e->getMessage());
$this->assertStringContainsString('Missing or invalid ->e', $e->getMessage());
}
// Invalid $e.
@ -143,7 +143,7 @@ class availability_completion_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing or invalid ->e', $e->getMessage());
$this->assertStringContainsString('Missing or invalid ->e', $e->getMessage());
}
// Successful construct & display with all different expected values.

8
availability/condition/date/tests/condition_test.php
View file

@ -96,7 +96,7 @@ class availability_date_condition_testcase extends advanced_testcase {
$date = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing or invalid ->d', $e->getMessage());
$this->assertStringContainsString('Missing or invalid ->d', $e->getMessage());
}
// Invalid ->d.
@ -105,7 +105,7 @@ class availability_date_condition_testcase extends advanced_testcase {
$date = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing or invalid ->d', $e->getMessage());
$this->assertStringContainsString('Missing or invalid ->d', $e->getMessage());
}
// Missing ->t.
@ -114,7 +114,7 @@ class availability_date_condition_testcase extends advanced_testcase {
$date = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing or invalid ->t', $e->getMessage());
$this->assertStringContainsString('Missing or invalid ->t', $e->getMessage());
}
// Invalid ->t.
@ -123,7 +123,7 @@ class availability_date_condition_testcase extends advanced_testcase {
$date = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing or invalid ->t', $e->getMessage());
$this->assertStringContainsString('Missing or invalid ->t', $e->getMessage());
}
// Valid conditions of both types.

8
availability/condition/grade/tests/condition_test.php
View file

@ -149,7 +149,7 @@ class availability_grade_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing or invalid ->id', $e->getMessage());
$this->assertStringContainsString('Missing or invalid ->id', $e->getMessage());
}
// Invalid id (not int).
@ -158,7 +158,7 @@ class availability_grade_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing or invalid ->id', $e->getMessage());
$this->assertStringContainsString('Missing or invalid ->id', $e->getMessage());
}
// Invalid min (not number).
@ -168,7 +168,7 @@ class availability_grade_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing or invalid ->min', $e->getMessage());
$this->assertStringContainsString('Missing or invalid ->min', $e->getMessage());
}
// Invalid max (not number).
@ -178,7 +178,7 @@ class availability_grade_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing or invalid ->max', $e->getMessage());
$this->assertStringContainsString('Missing or invalid ->max', $e->getMessage());
}
// All valid.

2
availability/condition/group/tests/condition_test.php
View file

@ -122,7 +122,7 @@ class availability_group_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Invalid ->id', $e->getMessage());
$this->assertStringContainsString('Invalid ->id', $e->getMessage());
}
// Valid (with id).

8
availability/condition/grouping/tests/condition_test.php
View file

@ -132,7 +132,7 @@ class availability_grouping_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing ->id / ->activity', $e->getMessage());
$this->assertStringContainsString('Missing ->id / ->activity', $e->getMessage());
}
// Invalid id (not int).
@ -141,7 +141,7 @@ class availability_grouping_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Invalid ->id', $e->getMessage());
$this->assertStringContainsString('Invalid ->id', $e->getMessage());
}
// Invalid activity option (not bool).
@ -151,7 +151,7 @@ class availability_grouping_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Invalid ->activity', $e->getMessage());
$this->assertStringContainsString('Invalid ->activity', $e->getMessage());
}
// Invalid activity option (false).
@ -160,7 +160,7 @@ class availability_grouping_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Invalid ->activity', $e->getMessage());
$this->assertStringContainsString('Invalid ->activity', $e->getMessage());
}
// Valid with id.

18
availability/condition/profile/tests/condition_test.php
View file

@ -105,7 +105,7 @@ class availability_profile_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing or invalid ->op', $e->getMessage());
$this->assertStringContainsString('Missing or invalid ->op', $e->getMessage());
}
// Invalid op.
@ -114,7 +114,7 @@ class availability_profile_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing or invalid ->op', $e->getMessage());
$this->assertStringContainsString('Missing or invalid ->op', $e->getMessage());
}
// Missing value.
@ -123,7 +123,7 @@ class availability_profile_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing or invalid ->v', $e->getMessage());
$this->assertStringContainsString('Missing or invalid ->v', $e->getMessage());
}
// Invalid value (not string).
@ -132,7 +132,7 @@ class availability_profile_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing or invalid ->v', $e->getMessage());
$this->assertStringContainsString('Missing or invalid ->v', $e->getMessage());
}
// Unexpected value.
@ -141,7 +141,7 @@ class availability_profile_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Unexpected ->v', $e->getMessage());
$this->assertStringContainsString('Unexpected ->v', $e->getMessage());
}
// Missing field.
@ -151,7 +151,7 @@ class availability_profile_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Missing ->sf or ->cf', $e->getMessage());
$this->assertStringContainsString('Missing ->sf or ->cf', $e->getMessage());
}
// Invalid field (not string).
@ -160,7 +160,7 @@ class availability_profile_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Invalid ->sf', $e->getMessage());
$this->assertStringContainsString('Invalid ->sf', $e->getMessage());
}
// Both fields.
@ -170,7 +170,7 @@ class availability_profile_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Both ->sf and ->cf', $e->getMessage());
$this->assertStringContainsString('Both ->sf and ->cf', $e->getMessage());
}
// Invalid ->cf field (not string).
@ -180,7 +180,7 @@ class availability_profile_condition_testcase extends advanced_testcase {
$cond = new condition($structure);
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Invalid ->cf', $e->getMessage());
$this->assertStringContainsString('Invalid ->cf', $e->getMessage());
}
// Valid examples (checks values are correctly included).

4
availability/tests/info_test.php
View file

@ -91,7 +91,7 @@ class info_testcase extends advanced_testcase {
$debugging = $this->getDebuggingMessages();
$this->resetDebugging();
$this->assertEquals(1, count($debugging));
$this->assertContains('Invalid availability', $debugging[0]->message);
$this->assertStringContainsString('Invalid availability', $debugging[0]->message);
// Check empty one.
$info = new info_module($cm4);
@ -145,7 +145,7 @@ class info_testcase extends advanced_testcase {
$debugging = $this->getDebuggingMessages();
$this->resetDebugging();
$this->assertEquals(1, count($debugging));
$this->assertContains('Invalid availability', $debugging[0]->message);
$this->assertStringContainsString('Invalid availability', $debugging[0]->message);
// Check empty one.
$info = new info_section($sections[4]);

28
availability/tests/tree_test.php
View file

@ -49,83 +49,83 @@ class tree_testcase extends \advanced_testcase {
new tree('frog');
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('not object', $e->getMessage());
$this->assertStringContainsString('not object', $e->getMessage());
}
try {
new tree((object)array());
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('missing ->op', $e->getMessage());
$this->assertStringContainsString('missing ->op', $e->getMessage());
}
try {
new tree((object)array('op' => '*'));
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('unknown ->op', $e->getMessage());
$this->assertStringContainsString('unknown ->op', $e->getMessage());
}
try {
new tree((object)array('op' => '|'));
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('missing ->show', $e->getMessage());
$this->assertStringContainsString('missing ->show', $e->getMessage());
}
try {
new tree((object)array('op' => '|', 'show' => 0));
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('->show not bool', $e->getMessage());
$this->assertStringContainsString('->show not bool', $e->getMessage());
}
try {
new tree((object)array('op' => '&'));
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('missing ->showc', $e->getMessage());
$this->assertStringContainsString('missing ->showc', $e->getMessage());
}
try {
new tree((object)array('op' => '&', 'showc' => 0));
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('->showc not array', $e->getMessage());
$this->assertStringContainsString('->showc not array', $e->getMessage());
}
try {
new tree((object)array('op' => '&', 'showc' => array(0)));
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('->showc value not bool', $e->getMessage());
$this->assertStringContainsString('->showc value not bool', $e->getMessage());
}
try {
new tree((object)array('op' => '|', 'show' => true));
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('missing ->c', $e->getMessage());
$this->assertStringContainsString('missing ->c', $e->getMessage());
}
try {
new tree((object)array('op' => '|', 'show' => true,
'c' => 'side'));
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('->c not array', $e->getMessage());
$this->assertStringContainsString('->c not array', $e->getMessage());
}
try {
new tree((object)array('op' => '|', 'show' => true,
'c' => array(3)));
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('child not object', $e->getMessage());
$this->assertStringContainsString('child not object', $e->getMessage());
}
try {
new tree((object)array('op' => '|', 'show' => true,
'c' => array((object)array('type' => 'doesnotexist'))));
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('Unknown condition type: doesnotexist', $e->getMessage());
$this->assertStringContainsString('Unknown condition type: doesnotexist', $e->getMessage());
}
try {
new tree((object)array('op' => '|', 'show' => true,
'c' => array((object)array())));
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('missing ->op', $e->getMessage());
$this->assertStringContainsString('missing ->op', $e->getMessage());
}
try {
new tree((object)array('op' => '&',
@ -134,7 +134,7 @@ class tree_testcase extends \advanced_testcase {
));
$this->fail();
} catch (coding_exception $e) {
$this->assertContains('->c, ->showc mismatch', $e->getMessage());
$this->assertStringContainsString('->c, ->showc mismatch', $e->getMessage());
}
}