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

Issue #3131474 by jungle, mondrake: Replace assertions involving calls to array_search() with assertContains()/assertNotContains()

merge-requests/2419/head
catch 2020-05-01 09:48:22 +01:00
parent 629abc963b
commit 6cf25ba266
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/modules/system/tests/src/Kernel/Entity/EntityReferenceSelectionReferenceableTest.php
View File

@ -119,7 +119,7 @@ class EntityReferenceSelectionReferenceableTest extends KernelTestBase {
// entity labels.
// @see \Drupal\Core\Entity\EntityReferenceSelection\SelectionInterface::getReferenceableEntities()
$item = is_string($item) ? Html::escape($item) : $item;
$this->assertTrue(array_search($item, $referenceables[$this->bundle]) !== FALSE);
$this->assertContains($item, $referenceables[$this->bundle]);
}
// Test ::countReferenceableEntities().

4
core/modules/user/tests/src/Functional/UserRolesAssignmentTest.php
View File

@ -89,10 +89,10 @@ class UserRolesAssignmentTest extends BrowserTestBase {
$user_storage->resetCache([$account->id()]);
$account = $user_storage->load($account->id());
if ($is_assigned) {
$this->assertFalse(array_search($rid, $account->getRoles()) === FALSE, 'The role is present in the user object.');
$this->assertContains($rid, $account->getRoles());
}
else {
$this->assertTrue(array_search($rid, $account->getRoles()) === FALSE, 'The role is not present in the user object.');
$this->assertNotContains($rid, $account->getRoles());
}
}

3
core/modules/views_ui/tests/src/Kernel/TagTest.php
View File

@ -2,7 +2,6 @@
namespace Drupal\Tests\views_ui\Kernel;
use Drupal\Component\Render\FormattableMarkup;
use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
use Drupal\views_ui\Controller\ViewsUIController;
use Drupal\Component\Utility\Html;
@ -59,7 +58,7 @@ class TagTest extends ViewsKernelTestBase {
$matches = (array) json_decode($result->getContent(), TRUE);
$this->assertEqual(count($matches), 8, 'Make sure that only a subset is returned.');
foreach ($matches as $tag) {
$this->assertTrue(array_search($tag['value'], $tags) !== FALSE, new FormattableMarkup('Make sure the returned tag @tag actually exists.', ['@tag' => $tag['value']]));
$this->assertContains($tag['value'], $tags);
}
// Make sure an invalid result doesn't return anything.

2
core/tests/Drupal/KernelTests/Core/DrupalKernel/DrupalKernelTest.php
View File

@ -139,7 +139,7 @@ class DrupalKernelTest extends KernelTestBase {
// Check that the container itself is not among the persist IDs because it
// does not make sense to persist the container itself.
$persist_ids = $container->getParameter('persist_ids');
$this->assertFalse(array_search('service_container', $persist_ids));
$this->assertNotContains('service_container', $persist_ids);
}
/**