Merge pull request #24621 from alexandre-janniaux/php-unit-assert-contains/1

ContactTest: assertStringContainsString instead of assertContains
This commit is contained in:
Laurent Destailleur 2023-05-20 12:02:43 +02:00 committed by GitHub
commit 676d89d36a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -298,7 +298,7 @@ class ContactTest extends PHPUnit\Framework\TestCase
$result=$localobject->getFullAddress(1);
print __METHOD__." id=".$localobject->id." result=".$result."\n";
$this->assertContains("New address\nNew zip New town\nBelgium", $result);
$this->assertStringContainsString("New address\nNew zip New town\nBelgium", $result);
$localobject->info($localobject->id);
print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
@ -359,7 +359,7 @@ class ContactTest extends PHPUnit\Framework\TestCase
$localobjectadd->town='New town';
$result=$localobjectadd->getFullAddress(1);
print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
$this->assertContains("New address\nNew zip New town\nFrance", $result);
$this->assertStringContainsString("New address\nNew zip New town\nFrance", $result);
// Belgium
unset($localobjectadd->country_code);
@ -370,7 +370,7 @@ class ContactTest extends PHPUnit\Framework\TestCase
$localobjectadd->town='New town';
$result=$localobjectadd->getFullAddress(1);
print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
$this->assertContains("New address\nNew zip New town\nBelgium", $result);
$this->assertStringContainsString("New address\nNew zip New town\nBelgium", $result);
// Switzerland
unset($localobjectadd->country_code);
@ -381,7 +381,7 @@ class ContactTest extends PHPUnit\Framework\TestCase
$localobjectadd->town='New town';
$result=$localobjectadd->getFullAddress(1);
print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
$this->assertContains("New address\nNew zip New town\nSwitzerland", $result);
$this->assertStringContainsString("New address\nNew zip New town\nSwitzerland", $result);
// USA
unset($localobjectadd->country_code);
@ -392,7 +392,7 @@ class ContactTest extends PHPUnit\Framework\TestCase
$localobjectadd->town='New town';
$result=$localobjectadd->getFullAddress(1);
print __METHOD__." id=".$localobjectadd->id." result=".$result."\n";
$this->assertContains("New address\nNew town, New zip\nUnited States", $result);
$this->assertStringContainsString("New address\nNew town, New zip\nUnited States", $result);
return $localobjectadd->id;
}