diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php index 4b3feb3..7f93fbe 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgrade6Test.php @@ -57,7 +57,7 @@ protected function getEntityCounts() { 'contact_form' => 5, 'configurable_language' => 5, 'editor' => 2, - 'field_config' => 73, + 'field_config' => 69, 'field_storage_config' => 45, 'file' => 7, 'filter_format' => 7, @@ -66,25 +66,25 @@ protected function getEntityCounts() { 'migration' => 105, 'node' => 16, 'node_type' => 13, - 'rdf_mapping' => 7, + 'rdf_mapping' => 5, 'search_page' => 2, 'shortcut' => 2, 'shortcut_set' => 1, 'action' => 23, 'menu' => 8, 'taxonomy_term' => 7, - 'taxonomy_vocabulary' => 6, + 'taxonomy_vocabulary' => 5, 'tour' => 4, 'user' => 7, 'user_role' => 6, 'menu_link_content' => 4, 'view' => 16, 'date_format' => 11, - 'entity_form_display' => 19, + 'entity_form_display' => 17, 'entity_form_mode' => 1, - 'entity_view_display' => 43, + 'entity_view_display' => 41, 'entity_view_mode' => 14, - 'base_field_override' => 38, + 'base_field_override' => 37, ]; } diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgradeConflicts6Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgradeConflicts6Test.php index 642bb9e..6e1049d 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgradeConflicts6Test.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d6/MigrateUpgradeConflicts6Test.php @@ -54,6 +54,13 @@ public function testMigrateUpgrade() { protected function getEntityCounts() { $counts = parent::getEntityCounts(); $counts['comment_type'] = 3; + $counts['field_config'] = 73; + $counts['field_storage_config'] = 48; + $counts['rdf_mapping'] = 7; + $counts['taxonomy_vocabulary'] = 6; + $counts['entity_form_display'] = 19; + $counts['entity_view_display'] = 43; + $counts['base_field_override'] = 38; return $counts; } diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php index e930018..c7cce81 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgrade7Test.php @@ -50,7 +50,7 @@ protected function getEntityCounts() { 'configurable_language' => 4, 'contact_form' => 3, 'editor' => 2, - 'field_config' => 53, + 'field_config' => 50, 'field_storage_config' => 38, 'file' => 3, 'filter_format' => 7, @@ -59,7 +59,7 @@ protected function getEntityCounts() { 'migration' => 73, 'node' => 3, 'node_type' => 6, - 'rdf_mapping' => 7, + 'rdf_mapping' => 5, 'search_page' => 2, 'shortcut' => 6, 'shortcut_set' => 2, @@ -73,11 +73,11 @@ protected function getEntityCounts() { 'menu_link_content' => 7, 'view' => 16, 'date_format' => 11, - 'entity_form_display' => 18, + 'entity_form_display' => 16, 'entity_form_mode' => 1, - 'entity_view_display' => 29, + 'entity_view_display' => 27, 'entity_view_mode' => 14, - 'base_field_override' => 9, + 'base_field_override' => 8, ]; } diff --git a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgradeConflicts7Test.php b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgradeConflicts7Test.php index 5bba621..612f9c6 100644 --- a/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgradeConflicts7Test.php +++ b/core/modules/migrate_drupal_ui/tests/src/Functional/d7/MigrateUpgradeConflicts7Test.php @@ -56,6 +56,12 @@ protected function getEntityCounts() { $counts = parent::getEntityCounts(); // Forum has a comment. $counts['comment_type'] = 8; + $counts['field_config'] = 53; + $counts['field_storage_config'] = 40; + $counts['rdf_mapping'] = 7; + $counts['entity_form_display'] = 18; + $counts['entity_view_display'] = 29; + $counts['base_field_override'] = 9; return $counts; }