diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php --- b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php @@ -144,8 +144,8 @@ $this->assertIdentical($node->field_test_identical2->value, '1', 'Integer value is correct'); $planet_node = Node::load(3); - $this->assertEqual($planet_node->field_multivalue->value, 33); - $this->assertEqual($planet_node->field_multivalue[1]->value, 44); + $this->assertIdentical($planet_node->field_multivalue->value, 33); + $this->assertIdentical($planet_node->field_multivalue[1]->value, 44); } diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php --- b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php @@ -111,7 +111,7 @@ 'prefix' => 'id-', 'suffix' => '', ); - $this->assertEqual($field->getSettings(), $expected); + $this->assertIdentical($field->getSettings(), $expected); // Test email field. $field = FieldConfig::load('node.story.field_test_email'); diff -u b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php --- b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php @@ -55,7 +55,7 @@ $this->assertIdentical($node_revision->getTitle(), 'Test title'); $this->assertIdentical($node_revision->getRevisionAuthor()->id(), '1', 'Node revision has the correct user'); // This is empty on the first revision. - $this->assertIdentical($node_revision->revision_log->value, ''); + $this->assertEqual($node_revision->revision_log->value, ''); // It is pointless to run the second half from MigrateDrupal6Test. if (empty($this->standalone)) { only in patch2: unchanged: --- a/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php +++ b/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php @@ -29,7 +29,7 @@ public function testMigrateDependenciesOrder() { $migration_items = array('d6_comment', 'd6_filter_format', 'd6_node'); $migrations = entity_load_multiple('migration', $migration_items); $expected_order = array('d6_filter_format', 'd6_node', 'd6_comment'); - $this->assertEqual(array_keys($migrations), $expected_order); + $this->assertIdentical(array_keys($migrations), $expected_order); $expected_requirements = array( 'd6_node', 'd6_node_type', @@ -45,9 +45,9 @@ public function testMigrateDependenciesOrder() { // Migration dependencies for comment include dependencies for node // migration as well. $actual_requirements = $migrations['d6_comment']->get('requirements'); - $this->assertEqual(count($actual_requirements), count($expected_requirements)); + $this->assertIdentical(count($actual_requirements), count($expected_requirements)); foreach ($expected_requirements as $requirement) { - $this->assertEqual($actual_requirements[$requirement], $requirement); + $this->assertIdentical($actual_requirements[$requirement], $requirement); } } @@ -64,7 +64,7 @@ public function testAggregatorMigrateDependencies() { $executable = new MigrateExecutable($migration, $this); $this->startCollectingMessages(); $executable->import(); - $this->assertEqual($this->migrateMessages['error'], array(String::format('Migration @id did not meet the requirements. Missing migrations d6_aggregator_feed. requirements: d6_aggregator_feed.', array('@id' => $migration->id())))); + $this->assertIdentical($this->migrateMessages['error'], array(String::format('Migration @id did not meet the requirements. Missing migrations d6_aggregator_feed. requirements: d6_aggregator_feed.', array('@id' => $migration->id())))); $this->collectMessages = FALSE; } only in patch2: unchanged: --- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php +++ b/core/modules/migrate_drupal/tests/src/Unit/source/d6/Drupal6SqlBaseTest.php @@ -80,6 +80,8 @@ public function testGetSystemData() { // Should be 1 theme and 2 modules. $this->assertEquals(1, count($system_data['theme'])); $this->assertEquals(2, count($system_data['module'])); + $this->assertIdentical(1, count($system_data['theme'])); + $this->assertIdentical(2, count($system_data['module'])); // Calling again should be identical. $this->assertSame($system_data, $this->base->getSystemData());