diff --git a/core/modules/block/src/Tests/BlockInterfaceTest.php b/core/modules/block/src/Tests/BlockInterfaceTest.php index 7215765..1464e1b 100644 --- a/core/modules/block/src/Tests/BlockInterfaceTest.php +++ b/core/modules/block/src/Tests/BlockInterfaceTest.php @@ -109,16 +109,16 @@ public function testBlockInterface() { $actual_form = $display_block->buildConfigurationForm(array(), $form_state); // Remove the visibility sections, as that just tests condition plugins. unset($actual_form['visibility'], $actual_form['visibility_tabs']); - $this->assertIdentical($actual_form, $expected_form, 'Only the expected form elements were present.'); + $this->assertIdenticalWithSafeStrings($actual_form, $expected_form, 'Only the expected form elements were present.'); $expected_build = array( '#children' => 'My custom display message.', ); // Ensure the build array is proper. - $this->assertIdentical($display_block->build(), $expected_build, 'The plugin returned the appropriate build array.'); + $this->assertIdenticalWithSafeStrings($display_block->build(), $expected_build, 'The plugin returned the appropriate build array.'); // Ensure the machine name suggestion is correct. In truth, this is actually // testing BlockBase's implementation, not the interface itself. - $this->assertIdentical($display_block->getMachineNameSuggestion(), 'displaymessage', 'The plugin returned the expected machine name suggestion.'); + $this->assertIdenticalWithSafeStrings($display_block->getMachineNameSuggestion(), 'displaymessage', 'The plugin returned the expected machine name suggestion.'); } } diff --git a/core/modules/block_content/src/Tests/BlockContentListTest.php b/core/modules/block_content/src/Tests/BlockContentListTest.php index aeed4dc..8b77d1a 100644 --- a/core/modules/block_content/src/Tests/BlockContentListTest.php +++ b/core/modules/block_content/src/Tests/BlockContentListTest.php @@ -46,7 +46,7 @@ public function testListing() { // Test the contents of each th cell. $expected_items = array(t('Block description'), t('Operations')); foreach ($elements as $key => $element) { - $this->assertIdentical((string) $element[0], $expected_items[$key]); + $this->assertEqual($element[0], $expected_items[$key]); } $label = 'Antelope'; diff --git a/core/modules/block_content/src/Tests/BlockContentListViewsTest.php b/core/modules/block_content/src/Tests/BlockContentListViewsTest.php index ba84f2b..0267913 100644 --- a/core/modules/block_content/src/Tests/BlockContentListViewsTest.php +++ b/core/modules/block_content/src/Tests/BlockContentListViewsTest.php @@ -45,10 +45,10 @@ public function testListing() { $expected_items = [t('Block description'), t('Block type'), t('Updated'), t('Operations')]; foreach ($elements as $key => $element) { if ($element->xpath('a')) { - $this->assertIdentical(trim((string) $element->xpath('a')[0]), $expected_items[$key]); + $this->assertIdenticalWithSafeStrings(trim((string) $element->xpath('a')[0]), $expected_items[$key]); } else { - $this->assertIdentical(trim((string) $element[0]), $expected_items[$key]); + $this->assertIdenticalWithSafeStrings(trim((string) $element[0]), $expected_items[$key]); } } diff --git a/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php b/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php index 0668c86..386d552 100644 --- a/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php +++ b/core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php @@ -193,7 +193,7 @@ public function testBreakpointGroups() { ); $breakpoint_groups = \Drupal::service('breakpoint.manager')->getGroups(); // Ensure the order is as expected. Should be sorted by label. - $this->assertIdentical($expected, $breakpoint_groups); + $this->assertIdenticalWithSafeStrings($expected, $breakpoint_groups); $expected = array( 'breakpoint_theme_test' => 'theme', diff --git a/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php index ca1954f..7c4a21a 100644 --- a/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php +++ b/core/modules/ckeditor/src/Tests/CKEditorAdminTest.php @@ -111,7 +111,7 @@ function testExistingFormat() { ), 'plugins' => array(), ); - $this->assertIdentical($ckeditor->getDefaultSettings(), $expected_default_settings); + $this->assertIdenticalWithSafeStrings($ckeditor->getDefaultSettings(), $expected_default_settings); // Keep the "CKEditor" editor selected and click the "Configure" button. $this->drupalPostAjaxForm(NULL, $edit, 'editor_configure'); @@ -279,7 +279,7 @@ function testNewFormat() { $expected_settings['plugins']['stylescombo']['styles'] = ''; $editor = entity_load('editor', 'amazing_format'); $this->assertTrue($editor instanceof Editor, 'An Editor config entity exists now.'); - $this->assertIdentical($expected_settings, $editor->getSettings(), 'The Editor config entity has the correct settings.'); + $this->assertIdenticalWithSafeStrings($expected_settings, $editor->getSettings(), 'The Editor config entity has the correct settings.'); } } diff --git a/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php index 01b9081..5bd8ed4 100644 --- a/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php +++ b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php @@ -112,7 +112,7 @@ function testLoading() { 'isXssSafe' => FALSE, ))); $this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page."); - $this->assertIdentical($expected, $settings['editor'], "Text Editor module's JavaScript settings on the page are correct."); + $this->assertIdenticalWithSafeStrings($expected, $settings['editor'], "Text Editor module's JavaScript settings on the page are correct."); $this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.'); $this->assertTrue(count($body) === 1, 'A body field exists.'); $this->assertTrue(count($format_selector) === 1, 'A single text format selector exists on the page.'); @@ -143,7 +143,7 @@ function testLoading() { 'isXssSafe' => FALSE, ))); $this->assertTrue($editor_settings_present, "Text Editor module's JavaScript settings are on the page."); - $this->assertIdentical($expected, $settings['editor'], "Text Editor module's JavaScript settings on the page are correct."); + $this->assertIdenticalWithSafeStrings($expected, $settings['editor'], "Text Editor module's JavaScript settings on the page are correct."); $this->assertTrue($editor_js_present, 'Text Editor JavaScript is present.'); $this->assertTrue(in_array('ckeditor/drupal.ckeditor', explode(',', $settings['ajaxPageState']['libraries'])), 'CKEditor glue library is present.'); } diff --git a/core/modules/ckeditor/src/Tests/CKEditorTest.php b/core/modules/ckeditor/src/Tests/CKEditorTest.php index d2a59bc..e7ed49f 100644 --- a/core/modules/ckeditor/src/Tests/CKEditorTest.php +++ b/core/modules/ckeditor/src/Tests/CKEditorTest.php @@ -95,7 +95,7 @@ function testGetJSSettings() { ), ); ksort($expected_config); - $this->assertIdentical($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for default configuration.'); + $this->assertIdenticalWithSafeStrings($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for default configuration.'); // Customize the configuration: add button, have two contextually enabled // buttons, and configure a CKEditor plugin setting. @@ -116,7 +116,7 @@ function testGetJSSettings() { $expected_config['drupalExternalPlugins']['llama_contextual_and_button'] = file_create_url('core/modules/ckeditor/tests/modules/js/llama_contextual_and_button.js'); $expected_config['contentsCss'][] = file_create_url('core/modules/ckeditor/tests/modules/ckeditor_test.css'); ksort($expected_config); - $this->assertIdentical($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for customized configuration.'); + $this->assertIdenticalWithSafeStrings($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for customized configuration.'); // Change the allowed HTML tags; the "allowedContent" and "format_tags" // settings for CKEditor should automatically be updated as well. @@ -127,7 +127,7 @@ function testGetJSSettings() { $expected_config['allowedContent']['pre'] = array('attributes' => TRUE, 'styles' => FALSE, 'classes' => TRUE); $expected_config['allowedContent']['h3'] = array('attributes' => TRUE, 'styles' => FALSE, 'classes' => TRUE); $expected_config['format_tags'] = 'p;h2;h3;h4;h5;h6;pre'; - $this->assertIdentical($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for customized configuration.'); + $this->assertIdenticalWithSafeStrings($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for customized configuration.'); // Disable the filter_html filter: allow *all *tags. $format->setFilterConfig('filter_html', array('status' => 0)); @@ -136,7 +136,7 @@ function testGetJSSettings() { $expected_config['allowedContent'] = TRUE; $expected_config['disallowedContent'] = FALSE; $expected_config['format_tags'] = 'p;h1;h2;h3;h4;h5;h6;pre'; - $this->assertIdentical($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for customized configuration.'); + $this->assertIdenticalWithSafeStrings($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for customized configuration.'); // Enable the filter_test_restrict_tags_and_attributes filter. $format->setFilterConfig('filter_test_restrict_tags_and_attributes', array( @@ -205,7 +205,7 @@ function testGetJSSettings() { ); $expected_config['format_tags'] = 'p'; ksort($expected_config); - $this->assertIdentical($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for customized configuration.'); + $this->assertIdenticalWithSafeStrings($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for customized configuration.'); } /** @@ -216,7 +216,7 @@ function testBuildToolbarJSSetting() { // Default toolbar. $expected = $this->getDefaultToolbarConfig(); - $this->assertIdentical($expected, $this->ckeditor->buildToolbarJSSetting($editor), '"toolbar" configuration part of JS settings built correctly for default toolbar.'); + $this->assertIdenticalWithSafeStrings($expected, $this->ckeditor->buildToolbarJSSetting($editor), '"toolbar" configuration part of JS settings built correctly for default toolbar.'); // Customize the configuration. $settings = $editor->getSettings(); @@ -224,7 +224,7 @@ function testBuildToolbarJSSetting() { $editor->setSettings($settings); $editor->save(); $expected[0]['items'][] = 'Strike'; - $this->assertIdentical($expected, $this->ckeditor->buildToolbarJSSetting($editor), '"toolbar" configuration part of JS settings built correctly for customized toolbar.'); + $this->assertIdenticalWithSafeStrings($expected, $this->ckeditor->buildToolbarJSSetting($editor), '"toolbar" configuration part of JS settings built correctly for customized toolbar.'); // Enable the editor_test module, customize further. $this->enableModules(array('ckeditor_test')); @@ -236,7 +236,7 @@ function testBuildToolbarJSSetting() { $editor->save(); $expected[0]['name'] = 'JunkScience'; $expected[0]['items'][] = 'Llama'; - $this->assertIdentical($expected, $this->ckeditor->buildToolbarJSSetting($editor), '"toolbar" configuration part of JS settings built correctly for customized toolbar with contrib module-provided CKEditor plugin.'); + $this->assertIdenticalWithSafeStrings($expected, $this->ckeditor->buildToolbarJSSetting($editor), '"toolbar" configuration part of JS settings built correctly for customized toolbar with contrib module-provided CKEditor plugin.'); } /** diff --git a/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php b/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php index 7f0d72e..9cc8c65 100644 --- a/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php +++ b/core/modules/config/src/Tests/ConfigImportRenameValidationTest.php @@ -112,7 +112,7 @@ public function testRenameValidation() { $expected = array( SafeMarkup::format('Entity type mismatch on rename. @old_type not equal to @new_type for existing configuration @old_name and staged configuration @new_name.', array('@old_type' => 'node_type', '@new_type' => 'config_test', '@old_name' => 'node.type.' . $content_type->id(), '@new_name' => 'config_test.dynamic.' . $test_entity_id)) ); - $this->assertIdentical($expected, $this->configImporter->getErrors()); + $this->assertIdenticalWithSafeStrings($expected, $this->configImporter->getErrors()); } } @@ -155,7 +155,7 @@ public function testRenameSimpleConfigValidation() { $expected = array( SafeMarkup::format('Rename operation for simple configuration. Existing configuration @old_name and staged configuration @new_name.', array('@old_name' => 'config_test.old', '@new_name' => 'config_test.new')) ); - $this->assertIdentical($expected, $this->configImporter->getErrors()); + $this->assertIdenticalWithSafeStrings($expected, $this->configImporter->getErrors()); } } diff --git a/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php b/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php index 59caa80..f2ab5f6 100644 --- a/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php +++ b/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php @@ -69,7 +69,7 @@ public function testAggregatorMigrateDependencies() { $executable = new MigrateExecutable($migration, $this); $this->startCollectingMessages(); $executable->import(); - $this->assertIdentical($this->migrateMessages['error'], array(SafeMarkup::format('Migration @id did not meet the requirements. Missing migrations d6_aggregator_feed. requirements: d6_aggregator_feed.', array('@id' => $migration->id())))); + $this->assertIdenticalWithSafeStrings($this->migrateMessages['error'], array(SafeMarkup::format('Migration @id did not meet the requirements. Missing migrations d6_aggregator_feed. requirements: d6_aggregator_feed.', array('@id' => $migration->id())))); $this->collectMessages = FALSE; } diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php index 4a5483a..9e08361 100644 --- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php +++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php @@ -34,8 +34,8 @@ class MigrateNodeBuilderTest extends MigrateDrupal6TestBase { protected function assertEntity($id, $label) { $migration = $this->builtMigrations[$id]; $this->assertTrue($migration instanceof Migration); - $this->assertIdentical($id, $migration->Id()); - $this->assertIdentical($label, $migration->label()); + $this->assertIdenticalWithSafeStrings($id, $migration->id()); + $this->assertIdenticalWithSafeStrings($label, $migration->label()); } /** diff --git a/core/modules/shortcut/src/Tests/ShortcutSetsTest.php b/core/modules/shortcut/src/Tests/ShortcutSetsTest.php index bc3c5f9..b9c684c 100644 --- a/core/modules/shortcut/src/Tests/ShortcutSetsTest.php +++ b/core/modules/shortcut/src/Tests/ShortcutSetsTest.php @@ -73,7 +73,7 @@ function testShortcutSetEdit() { // Test the contents of each th cell. $expected_items = array(t('Name'), t('Weight'), t('Operations')); foreach ($elements as $key => $element) { - $this->assertIdentical((string) $element[0], $expected_items[$key]); + $this->assertIdenticalWithSafeStrings((string) $element[0], $expected_items[$key]); } // Look for test shortcuts in the table. diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php index 62e4c9f..e72f4ca 100644 --- a/core/modules/simpletest/src/TestBase.php +++ b/core/modules/simpletest/src/TestBase.php @@ -750,6 +750,38 @@ protected function assertIdentical($first, $second, $message = '', $group = 'Oth } /** + * Runs $this->assertIdentical() after casting safe string objects to string. + * + * This helper function assists with comparison of two values where the actual + * value may include objects implementing SafeStringInterface such as + * TranslationWrappers, and we want to refer to these objects as strings in + * the expected value. + * + * @param $first + * The first value to check. + * @param $second + * The second value to check. + * @param $message + * (optional) A message to display with the assertion. Do not translate + * messages: use \Drupal\Component\Utility\SafeMarkup::format() to embed + * variables in the message text, not t(). If left blank, a default message + * will be displayed. + * @param $group + * (optional) The group this message is in, which is displayed in a column + * in test output. Use 'Debug' to indicate this is debugging output. Do not + * translate this string. Defaults to 'Other'; most tests do not override + * this default. + * + * @return + * TRUE if the assertion succeeded, FALSE otherwise. + * + */ + protected function assertIdenticalWithSafeStrings($first, $second, $message = '', $group = 'Other') { + $this->castSafeStrings($first, $second); + $this->assertIdentical($first, $second, $message, $group); + } + + /** * Check to see if two values are not identical. * * @param $first diff --git a/core/modules/system/src/Tests/Common/FormatDateTest.php b/core/modules/system/src/Tests/Common/FormatDateTest.php index 0ece458..aa357dd 100644 --- a/core/modules/system/src/Tests/Common/FormatDateTest.php +++ b/core/modules/system/src/Tests/Common/FormatDateTest.php @@ -88,10 +88,10 @@ function testAdminDefinedFormatDate() { function testFormatDate() { $timestamp = strtotime('2007-03-26T00:00:00+00:00'); $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', 'en'), 'Sunday, 25-Mar-07 17:00:00 PDT', 'Test all parameters.'); - $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), 'domingo, 25-Mar-07 17:00:00 PDT', 'Test translated format.'); - $this->assertIdentical(format_date($timestamp, 'custom', '\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), 'l, 25-Mar-07 17:00:00 PDT', 'Test an escaped format string.'); - $this->assertIdentical(format_date($timestamp, 'custom', '\\\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), '\\domingo, 25-Mar-07 17:00:00 PDT', 'Test format containing backslash character.'); - $this->assertIdentical(format_date($timestamp, 'custom', '\\\\\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), '\\l, 25-Mar-07 17:00:00 PDT', 'Test format containing backslash followed by escaped format string.'); + $this->assertIdenticalWithSafeStrings(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), 'domingo, 25-Mar-07 17:00:00 PDT', 'Test translated format.'); + $this->assertIdenticalWithSafeStrings(format_date($timestamp, 'custom', '\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), 'l, 25-Mar-07 17:00:00 PDT', 'Test an escaped format string.'); + $this->assertIdenticalWithSafeStrings(format_date($timestamp, 'custom', '\\\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), '\\domingo, 25-Mar-07 17:00:00 PDT', 'Test format containing backslash character.'); + $this->assertIdenticalWithSafeStrings(format_date($timestamp, 'custom', '\\\\\\l, d-M-y H:i:s T', 'America/Los_Angeles', self::LANGCODE), '\\l, 25-Mar-07 17:00:00 PDT', 'Test format containing backslash followed by escaped format string.'); $this->assertIdentical(format_date($timestamp, 'custom', 'l, d-M-y H:i:s T', 'Europe/London', 'en'), 'Monday, 26-Mar-07 01:00:00 BST', 'Test a different time zone.'); // Change the default language and timezone. diff --git a/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php b/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php index 1010b03..7ad44eb 100644 --- a/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php +++ b/core/modules/system/src/Tests/Entity/EntityDefinitionUpdateTest.php @@ -107,7 +107,7 @@ public function testEntityTypeUpdateWithoutData() { t('Update the %entity_type entity type.', array('%entity_type' => $this->entityManager->getDefinition('entity_test_update')->getLabel())), ), ); - $this->assertIdentical($this->entityDefinitionUpdateManager->getChangeSummary(), $expected); //, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected); //, 'EntityDefinitionUpdateManager reports the expected change summary.'); // Run the update and ensure the revision table is created. $this->entityDefinitionUpdateManager->applyUpdates(); @@ -146,7 +146,7 @@ public function testBaseFieldCreateUpdateDeleteWithoutData() { t('Create the %field_name field.', array('%field_name' => t('A new base field'))), ), ); - $this->assertIdentical($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertTrue($this->database->schema()->fieldExists('entity_test_update', 'new_base_field'), 'Column created in shared table for new_base_field.'); @@ -159,7 +159,7 @@ public function testBaseFieldCreateUpdateDeleteWithoutData() { t('Update the %field_name field.', array('%field_name' => t('A new base field'))), ), ); - $this->assertIdentical($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertTrue($this->database->schema()->indexExists('entity_test_update', 'entity_test_update_field__new_base_field'), 'Index created.'); @@ -172,7 +172,7 @@ public function testBaseFieldCreateUpdateDeleteWithoutData() { t('Update the %field_name field.', array('%field_name' => t('A new base field'))), ), ); - $this->assertIdentical($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertFalse($this->database->schema()->indexExists('entity_test_update', 'entity_test_update_field__new_base_field'), 'Index deleted.'); @@ -186,7 +186,7 @@ public function testBaseFieldCreateUpdateDeleteWithoutData() { t('Update the %field_name field.', array('%field_name' => t('A new base field'))), ), ); - $this->assertIdentical($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertFalse($this->database->schema()->fieldExists('entity_test_update', 'new_base_field'), 'Original column deleted in shared table for new_base_field.'); $this->assertTrue($this->database->schema()->fieldExists('entity_test_update', 'new_base_field__value'), 'Value column created in shared table for new_base_field.'); @@ -201,7 +201,7 @@ public function testBaseFieldCreateUpdateDeleteWithoutData() { t('Delete the %field_name field.', array('%field_name' => t('A new base field'))), ), ); - $this->assertIdentical($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertFalse($this->database->schema()->fieldExists('entity_test_update', 'new_base_field_value'), 'Value column deleted from shared table for new_base_field.'); $this->assertFalse($this->database->schema()->fieldExists('entity_test_update', 'new_base_field_format'), 'Format column deleted from shared table for new_base_field.'); @@ -220,7 +220,7 @@ public function testBundleFieldCreateUpdateDeleteWithoutData() { t('Create the %field_name field.', array('%field_name' => t('A new bundle field'))), ), ); - $this->assertIdentical($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertTrue($this->database->schema()->tableExists('entity_test_update__new_bundle_field'), 'Dedicated table created for new_bundle_field.'); @@ -234,7 +234,7 @@ public function testBundleFieldCreateUpdateDeleteWithoutData() { t('Update the %field_name field.', array('%field_name' => t('A new bundle field'))), ), ); - $this->assertIdentical($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertTrue($this->database->schema()->fieldExists('entity_test_update__new_bundle_field', 'new_bundle_field_format'), 'Format column created in dedicated table for new_base_field.'); @@ -247,7 +247,7 @@ public function testBundleFieldCreateUpdateDeleteWithoutData() { t('Delete the %field_name field.', array('%field_name' => t('A new bundle field'))), ), ); - $this->assertIdentical($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertFalse($this->database->schema()->tableExists('entity_test_update__new_bundle_field'), 'Dedicated table deleted for new_bundle_field.'); } @@ -274,7 +274,7 @@ public function testBaseFieldCreateDeleteWithExistingEntities() { $schema_handler = $this->database->schema(); $this->assertTrue($schema_handler->fieldExists('entity_test_update', 'new_base_field'), 'Column created in shared table for new_base_field.'); $entity = $this->entityManager->getStorage('entity_test_update')->load($entity->id()); - $this->assertIdentical($entity->name->value, $name, 'Entity data preserved during field creation.'); + $this->assertIdenticalWithSafeStrings($entity->name->value, $name, 'Entity data preserved during field creation.'); // Remove the base field and run the update. Ensure the base field's column // is deleted and the prior saved entity data is still there. @@ -282,7 +282,7 @@ public function testBaseFieldCreateDeleteWithExistingEntities() { $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertFalse($schema_handler->fieldExists('entity_test_update', 'new_base_field'), 'Column deleted from shared table for new_base_field.'); $entity = $this->entityManager->getStorage('entity_test_update')->load($entity->id()); - $this->assertIdentical($entity->name->value, $name, 'Entity data preserved during field deletion.'); + $this->assertIdenticalWithSafeStrings($entity->name->value, $name, 'Entity data preserved during field deletion.'); // Add a base field with a required property and run the update. Ensure // 'not null' is not applied and thus no exception is thrown. @@ -331,7 +331,7 @@ public function testBundleFieldCreateDeleteWithExistingEntities() { $schema_handler = $this->database->schema(); $this->assertTrue($schema_handler->tableExists('entity_test_update__new_bundle_field'), 'Dedicated table created for new_bundle_field.'); $entity = $this->entityManager->getStorage('entity_test_update')->load($entity->id()); - $this->assertIdentical($entity->name->value, $name, 'Entity data preserved during field creation.'); + $this->assertIdenticalWithSafeStrings($entity->name->value, $name, 'Entity data preserved during field creation.'); // Remove the base field and run the update. Ensure the bundle field's // table is deleted and the prior saved entity data is still there. @@ -339,7 +339,7 @@ public function testBundleFieldCreateDeleteWithExistingEntities() { $this->entityDefinitionUpdateManager->applyUpdates(); $this->assertFalse($schema_handler->tableExists('entity_test_update__new_bundle_field'), 'Dedicated table deleted for new_bundle_field.'); $entity = $this->entityManager->getStorage('entity_test_update')->load($entity->id()); - $this->assertIdentical($entity->name->value, $name, 'Entity data preserved during field deletion.'); + $this->assertIdenticalWithSafeStrings($entity->name->value, $name, 'Entity data preserved during field deletion.'); // Test that required columns are created as 'not null'. $this->addBundleField('shape_required'); @@ -489,7 +489,7 @@ public function testEntityIndexCreateDeleteWithoutData() { t('Update the %entity_type entity type.', array('%entity_type' => $this->entityManager->getDefinition('entity_test_update')->getLabel())), ), ); - $this->assertIdentical($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); // Run the update and ensure the new index is created. $this->entityDefinitionUpdateManager->applyUpdates(); @@ -504,7 +504,7 @@ public function testEntityIndexCreateDeleteWithoutData() { t('Update the %entity_type entity type.', array('%entity_type' => $this->entityManager->getDefinition('entity_test_update')->getLabel())), ), ); - $this->assertIdentical($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); + $this->assertIdenticalWithSafeStrings($this->entityDefinitionUpdateManager->getChangeSummary(), $expected, 'EntityDefinitionUpdateManager reports the expected change summary.'); // Run the update and ensure the index is deleted. $this->entityDefinitionUpdateManager->applyUpdates(); diff --git a/core/modules/system/src/Tests/Form/ValidationTest.php b/core/modules/system/src/Tests/Form/ValidationTest.php index 693d0af..2271d94 100644 --- a/core/modules/system/src/Tests/Form/ValidationTest.php +++ b/core/modules/system/src/Tests/Form/ValidationTest.php @@ -293,7 +293,7 @@ protected function assertErrorMessages($messages) { $this->fail(format_string('The error message for the "@title" element with key "@key" was not found.', ['@title' => $message['title'], '@key' => $message['key']])); } else { - $this->assertIdentical($message['message'], (string) $element[$delta]); + $this->assertIdenticalWithSafeStrings($message['message'], (string) $element[$delta]); } // Gather the element for checking the jump link section. diff --git a/core/modules/views/src/Tests/ModuleTest.php b/core/modules/views/src/Tests/ModuleTest.php index 7d5a31b..7adb05f 100644 --- a/core/modules/views/src/Tests/ModuleTest.php +++ b/core/modules/views/src/Tests/ModuleTest.php @@ -157,40 +157,40 @@ public function testLoadFunctions() { $all_views = $storage->loadMultiple(); // Test Views::getAllViews(). - $this->assertIdentical(array_keys($all_views), array_keys(Views::getAllViews()), 'Views::getAllViews works as expected.'); + $this->assertIdenticalWithSafeStrings(array_keys($all_views), array_keys(Views::getAllViews()), 'Views::getAllViews works as expected.'); // Test Views::getEnabledViews(). $expected_enabled = array_filter($all_views, function($view) { return views_view_is_enabled($view); }); - $this->assertIdentical(array_keys($expected_enabled), array_keys(Views::getEnabledViews()), 'Expected enabled views returned.'); + $this->assertIdenticalWithSafeStrings(array_keys($expected_enabled), array_keys(Views::getEnabledViews()), 'Expected enabled views returned.'); // Test Views::getDisabledViews(). $expected_disabled = array_filter($all_views, function($view) { return views_view_is_disabled($view); }); - $this->assertIdentical(array_keys($expected_disabled), array_keys(Views::getDisabledViews()), 'Expected disabled views returned.'); + $this->assertIdenticalWithSafeStrings(array_keys($expected_disabled), array_keys(Views::getDisabledViews()), 'Expected disabled views returned.'); // Test Views::getViewsAsOptions(). // Test the $views_only parameter. - $this->assertIdentical(array_keys($all_views), array_keys(Views::getViewsAsOptions(TRUE)), 'Expected option keys for all views were returned.'); + $this->assertIdenticalWithSafeStrings(array_keys($all_views), array_keys(Views::getViewsAsOptions(TRUE)), 'Expected option keys for all views were returned.'); $expected_options = array(); foreach ($all_views as $id => $view) { $expected_options[$id] = $view->label(); } - $this->assertIdentical($expected_options, Views::getViewsAsOptions(TRUE), 'Expected options array was returned.'); + $this->assertIdenticalWithSafeStrings($expected_options, Views::getViewsAsOptions(TRUE), 'Expected options array was returned.'); // Test the default. - $this->assertIdentical($this->formatViewOptions($all_views), Views::getViewsAsOptions(), 'Expected options array for all views was returned.'); + $this->assertIdenticalWithSafeStrings($this->formatViewOptions($all_views), Views::getViewsAsOptions(), 'Expected options array for all views was returned.'); // Test enabled views. - $this->assertIdentical($this->formatViewOptions($expected_enabled), Views::getViewsAsOptions(FALSE, 'enabled'), 'Expected enabled options array was returned.'); + $this->assertIdenticalWithSafeStrings($this->formatViewOptions($expected_enabled), Views::getViewsAsOptions(FALSE, 'enabled'), 'Expected enabled options array was returned.'); // Test disabled views. - $this->assertIdentical($this->formatViewOptions($expected_disabled), Views::getViewsAsOptions(FALSE, 'disabled'), 'Expected disabled options array was returned.'); + $this->assertIdenticalWithSafeStrings($this->formatViewOptions($expected_disabled), Views::getViewsAsOptions(FALSE, 'disabled'), 'Expected disabled options array was returned.'); // Test the sort parameter. $all_views_sorted = $all_views; ksort($all_views_sorted); - $this->assertIdentical(array_keys($all_views_sorted), array_keys(Views::getViewsAsOptions(TRUE, 'all', NULL, FALSE, TRUE)), 'All view id keys returned in expected sort order'); + $this->assertIdenticalWithSafeStrings(array_keys($all_views_sorted), array_keys(Views::getViewsAsOptions(TRUE, 'all', NULL, FALSE, TRUE)), 'All view id keys returned in expected sort order'); // Test $exclude_view parameter. $this->assertFalse(array_key_exists('archive', Views::getViewsAsOptions(TRUE, 'all', 'archive')), 'View excluded from options based on name'); @@ -204,7 +204,7 @@ public function testLoadFunctions() { $expected_opt_groups[$view->id()][$view->id() . ':' . $display['id']] = t('@view : @display', array('@view' => $view->id(), '@display' => $display['id'])); } } - $this->assertIdentical($expected_opt_groups, Views::getViewsAsOptions(FALSE, 'all', NULL, TRUE), 'Expected option array for an option group returned.'); + $this->assertIdenticalWithSafeStrings($expected_opt_groups, Views::getViewsAsOptions(FALSE, 'all', NULL, TRUE), 'Expected option array for an option group returned.'); } /** @@ -241,7 +241,7 @@ public function testViewsFetchPluginNames() { // Test using the 'test' style plugin type only returns the test_style and // mapping_test plugins. $plugins = Views::fetchPluginNames('style', 'test'); - $this->assertIdentical(array_keys($plugins), array('mapping_test', 'test_style', 'test_template_style')); + $this->assertIdenticalWithSafeStrings(array_keys($plugins), array('mapping_test', 'test_style', 'test_template_style')); // Test a non existent style plugin type returns no plugins. $plugins = Views::fetchPluginNames('style', $this->randomString());