Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #3126797 by mondrake, Berdir, longwave: [D8 only] Add forwards-compatibility shim for assertString(Not)ContainsString()replacements in phpunit 6&7

merge-requests/64/head
catch 2020-04-17 12:09:49 +01:00
parent d71705f684
commit 443d627da0
3 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit6/TestCompatibilityTrait.php
View File

@ -39,6 +39,34 @@ trait TestCompatibilityTrait {
}
}
/**
* Forward compatibility for assertStringContainsString.
*/
public static function assertStringContainsString($needle, $haystack, $message = '') {
static::assertContains($needle, $haystack, $message);
}
/**
* Forward compatibility for assertStringContainsStringIgnoringCase.
*/
public static function assertStringContainsStringIgnoringCase($needle, $haystack, $message = '') {
static::assertContains($needle, $haystack, $message, TRUE);
}
/**
* Forward compatibility for assertStringNotContainsString.
*/
public static function assertStringNotContainsString($needle, $haystack, $message = '') {
static::assertNotContains($needle, $haystack, $message);
}
/**
* Forward compatibility for assertStringNotContainsStringIgnoringCase.
*/
public static function assertStringNotContainsStringIgnoringCase($needle, $haystack, $message = '') {
static::assertNotContains($needle, $haystack, $message, TRUE);
}
/**
* Forward compatibility for assertEqualsCanonicalizing.
*/

28
core/tests/Drupal/TestTools/PhpUnitCompatibility/PhpUnit7/TestCompatibilityTrait.php
View File

@ -39,6 +39,34 @@ trait TestCompatibilityTrait {
}
}
/**
* Forward compatibility for assertStringContainsString.
*/
public static function assertStringContainsString(string $needle, string $haystack, string $message = ''): void {
static::assertContains($needle, $haystack, $message);
}
/**
* Forward compatibility for assertStringContainsStringIgnoringCase.
*/
public static function assertStringContainsStringIgnoringCase(string $needle, string $haystack, string $message = ''): void {
static::assertContains($needle, $haystack, $message, TRUE);
}
/**
* Forward compatibility for assertStringNotContainsString.
*/
public static function assertStringNotContainsString(string $needle, string $haystack, string $message = ''): void {
static::assertNotContains($needle, $haystack, $message);
}
/**
* Forward compatibility for assertStringNotContainsStringIgnoringCase.
*/
public static function assertStringNotContainsStringIgnoringCase(string $needle, string $haystack, string $message = ''): void {
static::assertNotContains($needle, $haystack, $message, TRUE);
}
/**
* Forward compatibility for assertEqualsCanonicalizing.
*/

15
core/tests/Drupal/Tests/PhpunitCompatibilityTraitTest.php
View File

@ -35,6 +35,21 @@ class PhpunitCompatibilityTraitTest extends UnitTestCase {
throw new \Exception($expectedMessage, $expectedCode);
}
/**
* Tests that assert*StringContainsString* methods are available.
*
* @covers ::assertStringContainsString
* @covers ::assertStringContainsStringIgnoringCase
* @covers ::assertStringNotContainsString
* @covers ::assertStringNotContainsStringIgnoringCase
*/
public function testAssertStringContainsString() {
$this->assertStringContainsString("bingo", "foobarbingobongo");
$this->assertStringContainsStringIgnoringCase("bingo", "foobarBiNgObongo");
$this->assertStringNotContainsString("buzzer", "BUZZERbingobongo");
$this->assertStringNotContainsStringIgnoringCase("buzzer", "foobarBiNgObongo");
}
/**
* Tests that assert(Not)EqualsCanonicalizing methods are available.
*