From af05690fe1adb07dff1bacf6f6a431a473fc76c7 Mon Sep 17 00:00:00 2001
From: catch <catch@35733.no-reply.drupal.org>
Date: Mon, 27 Apr 2020 09:20:37 +0100
Subject: [PATCH] Issue #3128575 by longwave, jungle, daffie: Replace
assert*(*, is_null()) with assertNotNull()/assertNull()
(cherry picked from commit bcec845d85bfdc6ce234e1704090f079670b4ee6)
---
.../src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php | 2 +-
.../src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php | 2 +-
.../src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php | 2 +-
.../Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php | 2 +-
.../tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php | 2 +-
.../jsonapi/tests/src/Unit/Query/EntityConditionTest.php | 2 +-
.../node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php | 2 +-
.../src/Kernel/Migrate/d6/MigrateUserProfileValuesTest.php | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
index ba2d1326b17f..1317fa16c418 100644
--- a/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d6/MigrateFieldWidgetSettingsTest.php
@@ -31,7 +31,7 @@ protected function setUp(): void {
public function testWidgetSettings() {
// Test the config can be loaded.
$form_display = EntityFormDisplay::load('node.story.default');
- $this->assertIdentical(FALSE, is_null($form_display), "Form display node.story.default loaded with config.");
+ $this->assertNotNull($form_display);
// Text field.
$component = $form_display->getComponent('field_test');
diff --git a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php
index 9dceabe3a6a2..b3bd60113384 100644
--- a/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php
+++ b/core/modules/field/tests/src/Kernel/Migrate/d7/MigrateFieldFormatterSettingsTest.php
@@ -80,7 +80,7 @@ protected function assertComponent($display_id, $component_id, $type, $label, $w
*/
protected function assertComponentNotExists($display_id, $component_id) {
$component = EntityViewDisplay::load($display_id)->getComponent($component_id);
- $this->assertTrue(is_null($component));
+ $this->assertNull($component);
}
/**
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php
index d026ee12f1f8..34fa900f7e6b 100644
--- a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityDisplayTest.php
@@ -42,7 +42,7 @@ public function testUploadEntityDisplay() {
// Assure this doesn't exist.
$display = EntityViewDisplay::load('node.article.default');
$component = $display->getComponent('upload');
- $this->assertTrue(is_null($component));
+ $this->assertNull($component);
$this->assertIdentical([['node', 'page', 'default', 'upload']], $this->getMigration('d6_upload_entity_display')->getIdMap()->lookupDestinationIds(['page']));
}
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
index 0ed44fefd35a..f880dc3af3bf 100644
--- a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadEntityFormDisplayTest.php
@@ -42,7 +42,7 @@ public function testUploadEntityFormDisplay() {
// Assure this doesn't exist.
$display = EntityFormDisplay::load('node.article.default');
$component = $display->getComponent('upload');
- $this->assertTrue(is_null($component));
+ $this->assertNull($component);
$this->assertIdentical([['node', 'page', 'default', 'upload']], $this->getMigration('d6_upload_entity_form_display')->getIdMap()->lookupDestinationIds(['page']));
}
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php
index 25a350b4fb99..dfd5f4fc9fba 100644
--- a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateUploadInstanceTest.php
@@ -41,7 +41,7 @@ public function testUploadFieldInstance() {
// Shouldn't exist.
$field = FieldConfig::load('node.article.upload');
- $this->assertTrue(is_null($field));
+ $this->assertNull($field);
$this->assertIdentical([['node', 'page', 'upload']], $this->getMigration('d6_upload_field_instance')->getIdMap()->lookupDestinationIds(['page']));
}
diff --git a/core/modules/jsonapi/tests/src/Unit/Query/EntityConditionTest.php b/core/modules/jsonapi/tests/src/Unit/Query/EntityConditionTest.php
index 5f75053246cb..7f9b628174ea 100644
--- a/core/modules/jsonapi/tests/src/Unit/Query/EntityConditionTest.php
+++ b/core/modules/jsonapi/tests/src/Unit/Query/EntityConditionTest.php
@@ -79,7 +79,7 @@ public function testValidation($input, $exception) {
$this->expectExceptionMessage($exception->getMessage());
}
EntityCondition::createFromQueryParameter($input);
- $this->assertTrue(is_null($exception), 'No exception was expected.');
+ $this->assertNull($exception, 'No exception was expected.');
}
/**
diff --git a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php
index b59760e758c0..2b2891a25521 100644
--- a/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php
+++ b/core/modules/node/tests/src/Kernel/Migrate/d6/MigrateViewModesTest.php
@@ -26,7 +26,7 @@ protected function setUp(): void {
public function testViewModes() {
// Test a new view mode.
$view_mode = EntityViewMode::load('node.preview');
- $this->assertIdentical(FALSE, is_null($view_mode), 'Preview view mode loaded.');
+ $this->assertNotNull($view_mode);
$this->assertIdentical('Preview', $view_mode->label(), 'View mode has correct label.');
// Test the ID map.
$this->assertIdentical([['node', 'preview']], $this->getMigration('d6_view_modes')->getIdMap()->lookupDestinationIds([1]));
diff --git a/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserProfileValuesTest.php b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserProfileValuesTest.php
index 661f021963dc..02a1f46c1839 100644
--- a/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserProfileValuesTest.php
+++ b/core/modules/user/tests/src/Kernel/Migrate/d6/MigrateUserProfileValuesTest.php
@@ -39,7 +39,7 @@ protected function setUp(): void {
*/
public function testUserProfileValues() {
$user = User::load(2);
- $this->assertFalse(is_null($user));
+ $this->assertNotNull($user);
$this->assertIdentical('red', $user->profile_color->value);
$expected = <<<EOT
Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam nulla sapien, congue nec risus ut, adipiscing aliquet felis. Maecenas quis justo vel nulla varius euismod. Quisque metus metus, cursus sit amet sem non, bibendum vehicula elit. Cras dui nisl, eleifend at iaculis vitae, lacinia ut felis. Nullam aliquam ligula volutpat nulla consectetur accumsan. Maecenas tincidunt molestie diam, a accumsan enim fringilla sit amet. Morbi a tincidunt tellus. Donec imperdiet scelerisque porta. Sed quis sem bibendum eros congue sodales. Vivamus vel fermentum est, at rutrum orci. Nunc consectetur purus ut dolor pulvinar, ut volutpat felis congue. Cras tincidunt odio sed neque sollicitudin, vehicula tempor metus scelerisque.
--
GitLab