diff --git a/core/modules/book/tests/src/Kernel/Migrate/d7/MigrateBookTest.php b/core/modules/book/tests/src/Kernel/Migrate/d7/MigrateBookTest.php index e850521..62d6700 100644 --- a/core/modules/book/tests/src/Kernel/Migrate/d7/MigrateBookTest.php +++ b/core/modules/book/tests/src/Kernel/Migrate/d7/MigrateBookTest.php @@ -19,7 +19,6 @@ class MigrateBookTest extends MigrateDrupal7TestBase { 'book', 'menu_ui', 'node', - 'taxonomy', 'text', ]; @@ -28,15 +27,12 @@ class MigrateBookTest extends MigrateDrupal7TestBase { */ protected function setUp() { parent::setUp(); - $this->installEntitySchema('node'); - $this->installEntitySchema('taxonomy_term'); - $this->installConfig(['node']); $this->installSchema('book', ['book']); $this->installSchema('node', ['node_access']); + + $this->migrateUsers(FALSE); + $this->migrateContentTypes(); $this->executeMigrations([ - 'd7_user_role', - 'd7_user', - 'd7_node_type', 'd7_node', 'd7_book' ]); diff --git a/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentSettingsTest.php b/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentSettingsTest.php index d7a4551..7dc40eb 100644 --- a/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentSettingsTest.php +++ b/core/modules/language/tests/src/Kernel/Migrate/d7/MigrateLanguageContentSettingsTest.php @@ -23,8 +23,8 @@ class MigrateLanguageContentSettingsTest extends MigrateDrupal7TestBase { protected function setUp() { parent::setUp(); - $this->installConfig(['node']); - $this->executeMigrations(['d7_node_type', 'd7_language_content_settings']); + $this->migrateContentTypes(); + $this->executeMigration('d7_language_content_settings'); } /** diff --git a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php index ab21f2c..08fae8f 100644 --- a/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php +++ b/core/modules/menu_link_content/tests/src/Kernel/Migrate/d7/MigrateMenuLinkTest.php @@ -34,14 +34,13 @@ class MigrateMenuLinkTest extends MigrateDrupal7TestBase { protected function setUp() { parent::setUp(); $this->installEntitySchema('menu_link_content'); - $this->installEntitySchema('node'); $this->installSchema('node', ['node_access']); $this->installConfig(static::$modules); + + $this->migrateUsers(FALSE); + $this->migrateContentTypes(); $this->executeMigrations([ 'language', - 'd7_user_role', - 'd7_user', - 'd7_node_type', 'd7_language_content_settings', 'd7_node', 'd7_node_translation', diff --git a/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php b/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php index 9684193..9f7cd69 100644 --- a/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php +++ b/core/modules/migrate_drupal/tests/src/Kernel/d7/FollowUpMigrationsTest.php @@ -40,22 +40,17 @@ protected function setUp() { $this->fileMigrationSetup(); - $this->installEntitySchema('node'); $this->installEntitySchema('comment'); $this->installEntitySchema('taxonomy_term'); $this->installConfig(static::$modules); $this->installSchema('node', ['node_access']); + $this->migrateUsers(); + $this->migrateFields(); $this->executeMigrations([ 'language', - 'd7_user_role', - 'd7_user', - 'd7_node_type', 'd7_language_content_settings', - 'd7_comment_type', 'd7_taxonomy_vocabulary', - 'd7_field', - 'd7_field_instance', 'd7_node', 'd7_node_translation', ]); diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php index bb62e90..e91354d 100644 --- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTest.php @@ -45,27 +45,20 @@ protected function setUp() { $this->fileMigrationSetup(); - $this->installEntitySchema('node'); $this->installEntitySchema('comment'); $this->installEntitySchema('taxonomy_term'); $this->installConfig(static::$modules); $this->installSchema('comment', ['comment_entity_statistics']); $this->installSchema('forum', ['forum', 'forum_index']); $this->installSchema('node', ['node_access']); - $this->installSchema('system', ['sequences']); + $this->migrateUsers(); + $this->migrateFields(); $this->executeMigrations([ 'language', - 'd7_user_role', - 'd7_user', - 'd7_node_type', 'd7_language_content_settings', - 'd7_comment_type', 'd7_comment_field', 'd7_comment_field_instance', - 'd7_taxonomy_vocabulary', - 'd7_field', - 'd7_field_instance', 'd7_node', 'd7_node_translation', ]); diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTitleLabelTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTitleLabelTest.php index 0655631..fcf231b 100644 --- a/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTitleLabelTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d7/MigrateNodeTitleLabelTest.php @@ -19,9 +19,8 @@ class MigrateNodeTitleLabelTest extends MigrateDrupal7TestBase { */ protected function setUp() { parent::setUp(); - $this->installConfig(static::$modules); - $this->installEntitySchema('node'); - $this->executeMigrations(['d7_node_type', 'd7_node_title_label']); + $this->migrateContentTypes(); + $this->executeMigration('d7_node_title_label'); } /** diff --git a/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php b/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php index 88cc2ad..2f940b1 100644 --- a/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php +++ b/core/modules/node/tests/src/Kernel/Migrate/d7/NodeTranslationRedirectTest.php @@ -30,18 +30,15 @@ class NodeTranslationRedirectTest extends MigrateDrupal7TestBase { protected function setUp() { parent::setUp(); - $this->installEntitySchema('node'); - $this->installConfig('node'); $this->installSchema('node', ['node_access']); $this->installSchema('system', ['key_value']); + $this->migrateUsers(FALSE); + $this->migrateContentTypes(); $this->executeMigrations([ 'language', 'd7_language_types', 'd7_language_negotiation_settings', - 'd7_user_role', - 'd7_user', - 'd7_node_type', 'd7_node', 'd7_node_translation', ]); diff --git a/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php b/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php index dae0249..886ee39 100644 --- a/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php +++ b/core/modules/path/tests/src/Kernel/Migrate/d7/MigrateUrlAliasTest.php @@ -29,15 +29,12 @@ class MigrateUrlAliasTest extends MigrateDrupal7TestBase { protected function setUp() { parent::setUp(); - $this->installEntitySchema('node'); - $this->installConfig('node'); $this->installSchema('node', ['node_access']); + $this->migrateUsers(FALSE); + $this->migrateContentTypes(); $this->executeMigrations([ 'language', - 'd7_user_role', - 'd7_user', - 'd7_node_type', 'd7_node', 'd7_node_translation', 'd7_url_alias', diff --git a/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php b/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php index 9a7317f..5d5f242 100644 --- a/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php +++ b/core/modules/statistics/tests/src/Kernel/Migrate/d7/MigrateNodeCounterTest.php @@ -29,16 +29,13 @@ class MigrateNodeCounterTest extends MigrateDrupal7TestBase { protected function setUp() { parent::setUp(); - $this->installEntitySchema('node'); - $this->installConfig('node'); $this->installSchema('node', ['node_access']); $this->installSchema('statistics', ['node_counter']); + $this->migrateUsers(FALSE); + $this->migrateContentTypes(); $this->executeMigrations([ 'language', - 'd7_user_role', - 'd7_user', - 'd7_node_type', 'd7_language_content_settings', 'd7_node', 'd7_node_translation', diff --git a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php index e8c6fef..bd45590 100644 --- a/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php +++ b/core/modules/taxonomy/tests/src/Kernel/Migrate/d7/MigrateNodeTaxonomyTest.php @@ -15,6 +15,7 @@ class MigrateNodeTaxonomyTest extends MigrateDrupal7TestBase { public static $modules = [ + 'comment', 'datetime', 'field', 'filter', @@ -33,37 +34,12 @@ class MigrateNodeTaxonomyTest extends MigrateDrupal7TestBase { protected function setUp() { parent::setUp(); - $this->installEntitySchema('node'); - $this->installEntitySchema('taxonomy_term'); - $this->installConfig(static::$modules); $this->installSchema('node', ['node_access']); $this->installSchema('system', ['sequences']); - $this->executeMigration('d7_node_type'); - - FieldStorageConfig::create([ - 'type' => 'entity_reference', - 'field_name' => 'field_tags', - 'entity_type' => 'node', - 'settings' => [ - 'target_type' => 'taxonomy_term', - ], - 'cardinality' => FieldStorageConfigInterface::CARDINALITY_UNLIMITED, - ])->save(); - - FieldConfig::create([ - 'entity_type' => 'node', - 'field_name' => 'field_tags', - 'bundle' => 'article', - ])->save(); - - $this->executeMigrations([ - 'd7_taxonomy_vocabulary', - 'd7_taxonomy_term', - 'd7_user_role', - 'd7_user', - 'd7_node:article', - ]); + $this->migrateTaxonomyTerms(); + $this->migrateUsers(FALSE); + $this->executeMigration('d7_node:article'); } /**