diff --git a/core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php b/core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php index b4b2540..779db2f 100644 --- a/core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php +++ b/core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php @@ -31,7 +31,6 @@ class MigrateActionConfigsTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_action_settings'); } diff --git a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php index 33d0893..7cef210 100644 --- a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php +++ b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php @@ -31,7 +31,6 @@ class MigrateAggregatorConfigsTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_aggregator_settings'); } diff --git a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php index 2264e28..77f6127 100644 --- a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php +++ b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php @@ -25,7 +25,6 @@ class MigrateAggregatorFeedTest extends MigrateDrupal6TestBase { protected function setUp() { parent::setUp(); $this->installEntitySchema('aggregator_feed'); - $this->loadDumps(['AggregatorFeed.php']); $this->executeMigration('d6_aggregator_feed'); } diff --git a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php index 20e4ad7..3d5716c 100644 --- a/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php +++ b/core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php @@ -45,7 +45,6 @@ protected function setUp() { )); $entity->enforceIsNew(); $entity->save(); - $this->loadDumps(['AggregatorItem.php']); $this->executeMigration('d6_aggregator_item'); } diff --git a/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorSettingsTest.php b/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorSettingsTest.php index b95835f..37c77dc 100644 --- a/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorSettingsTest.php +++ b/core/modules/aggregator/src/Tests/Migrate/d7/MigrateAggregatorSettingsTest.php @@ -24,7 +24,6 @@ class MigrateAggregatorSettingsTest extends MigrateDrupal7TestBase { protected function setUp() { parent::setUp(); $this->installConfig(static::$modules); - $this->loadDumps(['Variable.php']); $this->executeMigration('d7_aggregator_settings'); } diff --git a/core/modules/ban/src/Tests/Migrate/d7/MigrateBlockedIPsTest.php b/core/modules/ban/src/Tests/Migrate/d7/MigrateBlockedIPsTest.php index 3efa4a9..6a635fb 100644 --- a/core/modules/ban/src/Tests/Migrate/d7/MigrateBlockedIPsTest.php +++ b/core/modules/ban/src/Tests/Migrate/d7/MigrateBlockedIPsTest.php @@ -32,7 +32,6 @@ class MigrateBlockedIPsTest extends MigrateDrupal7TestBase { protected function setUp() { parent::setUp(); $this->installSchema('ban', ['ban_ip']); - $this->loadDumps(['BlockedIps.php']); $this->executeMigration('d7_blocked_ips'); } diff --git a/core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php b/core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php index 232fa4a..d1d3696 100644 --- a/core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php +++ b/core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php @@ -71,7 +71,6 @@ protected function setUp() { // Install one of D8's test themes. \Drupal::service('theme_handler')->install(array('test_theme')); - $this->loadDumps(['Blocks.php', 'BlocksRoles.php', 'AggregatorFeed.php']); $this->executeMigration('d6_block'); } diff --git a/core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php b/core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php index 3a68161..a4c5a57 100644 --- a/core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php +++ b/core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php @@ -35,7 +35,6 @@ protected function setUp() { array(array(2), array('full_html')) ) )); - $this->loadDumps(['Boxes.php']); $this->executeMigration('d6_custom_block'); } diff --git a/core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php b/core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php index 9ae1030..9d7a229 100644 --- a/core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php +++ b/core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php @@ -31,7 +31,6 @@ class MigrateBookConfigsTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_book_settings'); } diff --git a/core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php b/core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php index ea7846e..b0ebebb 100644 --- a/core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php +++ b/core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php @@ -42,8 +42,6 @@ protected function setUp() { $id_mappings['d6_node'][] = array(array($i), array($i)); } $this->prepareMigrations($id_mappings); - // Load database dumps to provide source data. - $this->loadDumps(['Book.php', 'MenuLinks.php']); $this->executeMigration('d6_book'); } diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTest.php index 19e74fe..cd23f6a 100644 --- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTest.php +++ b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTest.php @@ -56,16 +56,6 @@ protected function setUp() { 'd6_comment_entity_form_display' => array(array(array('story'), array('node', 'story', 'default', 'comment'))), ); $this->prepareMigrations($id_mappings); - - $this->loadDumps([ - 'Node.php', - 'NodeRevisions.php', - 'ContentTypeStory.php', - 'ContentTypeTestPlanet.php', - 'Variable.php', - 'NodeType.php', - 'Comments.php', - ]); $this->executeMigration('d6_comment'); } diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTypeTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTypeTest.php index fd0b3f1..8d25d1c 100644 --- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTypeTest.php +++ b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTypeTest.php @@ -24,12 +24,9 @@ class MigrateCommentTypeTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->installEntitySchema('node'); $this->installEntitySchema('comment'); $this->installConfig(['node', 'comment']); - - $this->loadDumps(['Variable.php', 'NodeType.php']); $this->executeMigration('d6_comment_type'); } diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableDisplayBase.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableDisplayBase.php index d36dd03..0995df0 100644 --- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableDisplayBase.php +++ b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableDisplayBase.php @@ -64,7 +64,6 @@ protected function setUp() { ), ); $this->prepareMigrations($id_mappings); - $this->loadDumps(['Variable.php', 'NodeType.php']); $this->executeMigration(static::MIGRATION); } diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php index 6a7f27f..9212f72 100644 --- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php +++ b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php @@ -42,7 +42,6 @@ protected function setUp() { ), ); $this->prepareMigrations($id_mappings); - $this->loadDumps(['Variable.php', 'NodeType.php']); $this->executeMigration('d6_comment_entity_form_display_subject'); } diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableFieldTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableFieldTest.php index 3d55fb5..468c18d 100644 --- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableFieldTest.php +++ b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableFieldTest.php @@ -41,7 +41,6 @@ protected function setUp() { ), ); $this->prepareMigrations($id_mappings); - $this->loadDumps(['Variable.php', 'NodeType.php']); $this->executeMigration('d6_comment_field'); } diff --git a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableInstanceTest.php b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableInstanceTest.php index 45b0950..1daf99f 100644 --- a/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableInstanceTest.php +++ b/core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableInstanceTest.php @@ -49,7 +49,6 @@ protected function setUp() { 'type' => 'comment', 'translatable' => '0', ))->save(); - $this->loadDumps(['Variable.php', 'NodeType.php']); $this->executeMigration('d6_comment_field_instance'); } diff --git a/core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php index 459b515..669ea7c 100644 --- a/core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php +++ b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactCategoryTest.php @@ -29,7 +29,6 @@ class MigrateContactCategoryTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Contact.php']); $this->executeMigration('d6_contact_category'); } diff --git a/core/modules/contact/src/Tests/Migrate/d6/MigrateContactConfigsTest.php b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactConfigsTest.php index 99eb405..9f9e673 100644 --- a/core/modules/contact/src/Tests/Migrate/d6/MigrateContactConfigsTest.php +++ b/core/modules/contact/src/Tests/Migrate/d6/MigrateContactConfigsTest.php @@ -39,7 +39,6 @@ protected function setUp() { ), ); $this->prepareMigrations($id_mappings); - $this->loadDumps(['Variable.php', 'Contact.php']); $this->executeMigration('d6_contact_settings'); } diff --git a/core/modules/dblog/src/Tests/Migrate/d6/MigrateDblogConfigsTest.php b/core/modules/dblog/src/Tests/Migrate/d6/MigrateDblogConfigsTest.php index f3dcfa1..4fb4a76 100644 --- a/core/modules/dblog/src/Tests/Migrate/d6/MigrateDblogConfigsTest.php +++ b/core/modules/dblog/src/Tests/Migrate/d6/MigrateDblogConfigsTest.php @@ -31,7 +31,6 @@ class MigrateDblogConfigsTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_dblog_settings'); } diff --git a/core/modules/dblog/src/Tests/Migrate/d7/MigrateDblogConfigsTest.php b/core/modules/dblog/src/Tests/Migrate/d7/MigrateDblogConfigsTest.php index 7d1f28a..6e088f2 100644 --- a/core/modules/dblog/src/Tests/Migrate/d7/MigrateDblogConfigsTest.php +++ b/core/modules/dblog/src/Tests/Migrate/d7/MigrateDblogConfigsTest.php @@ -29,7 +29,6 @@ class MigrateDblogConfigsTest extends MigrateDrupal7TestBase { protected function setUp() { parent::setUp(); $this->installConfig(static::$modules); - $this->loadDumps(['Variable.php']); $this->executeMigration('d7_dblog_settings'); } diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldFormatterSettingsTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldFormatterSettingsTest.php index b556dcf..9198d06 100644 --- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldFormatterSettingsTest.php +++ b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldFormatterSettingsTest.php @@ -64,14 +64,6 @@ protected function setUp() { ), ); $this->prepareMigrations($id_mappings); - - $this->loadDumps([ - 'ContentNodeFieldInstance.php', - 'ContentNodeField.php', - 'ContentFieldTest.php', - 'ContentFieldTestTwo.php', - 'ContentFieldMultivalue.php', - ]); $this->executeMigration('d6_field_formatter_settings'); } diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldInstanceTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldInstanceTest.php index ca21557..61bf944 100644 --- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldInstanceTest.php +++ b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldInstanceTest.php @@ -66,13 +66,6 @@ protected function setUp() { entity_create('node_type', array('type' => 'story'))->save(); entity_create('node_type', array('type' => 'test_page'))->save(); - $this->loadDumps([ - 'ContentNodeFieldInstance.php', - 'ContentNodeField.php', - 'ContentFieldTest.php', - 'ContentFieldTestTwo.php', - 'ContentFieldMultivalue.php', - ]); $this->createFields(); $this->executeMigration('d6_field_instance'); } diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php index 907bba5..30ce60a 100644 --- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php +++ b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldTest.php @@ -29,13 +29,6 @@ class MigrateFieldTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps([ - 'ContentNodeFieldInstance.php', - 'ContentNodeField.php', - 'ContentFieldTest.php', - 'ContentFieldTestTwo.php', - 'ContentFieldMultivalue.php', - ]); $this->executeMigration('d6_field'); } diff --git a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldWidgetSettingsTest.php b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldWidgetSettingsTest.php index a3232c4..37586a2 100644 --- a/core/modules/field/src/Tests/Migrate/d6/MigrateFieldWidgetSettingsTest.php +++ b/core/modules/field/src/Tests/Migrate/d6/MigrateFieldWidgetSettingsTest.php @@ -61,13 +61,6 @@ protected function setUp() { ), ); $this->prepareMigrations($id_mappings); - $this->loadDumps([ - 'ContentNodeFieldInstance.php', - 'ContentNodeField.php', - 'ContentFieldTest.php', - 'ContentFieldTestTwo.php', - 'ContentFieldMultivalue.php', - ]); $this->executeMigration('d6_field_instance_widget_settings'); } diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateFileConfigsTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateFileConfigsTest.php index c7964e4..c78c8b7 100644 --- a/core/modules/file/src/Tests/Migrate/d6/MigrateFileConfigsTest.php +++ b/core/modules/file/src/Tests/Migrate/d6/MigrateFileConfigsTest.php @@ -31,7 +31,6 @@ class MigrateFileConfigsTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_file_settings'); } diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateFileTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateFileTest.php index c5b68fc..2f68b2d 100644 --- a/core/modules/file/src/Tests/Migrate/d6/MigrateFileTest.php +++ b/core/modules/file/src/Tests/Migrate/d6/MigrateFileTest.php @@ -44,7 +44,6 @@ protected function setUp() { $this->installEntitySchema('file'); $this->installConfig(['file']); - $this->loadDumps(['Files.php']); /** @var \Drupal\migrate\Entity\MigrationInterface $migration */ $migration = entity_load('migration', 'd6_file'); $source = $migration->get('source'); @@ -74,8 +73,6 @@ public function testFiles() { // Test that we can re-import and also test with file_directory_path set. db_truncate(entity_load('migration', 'd6_file')->getIdMap()->mapTableName())->execute(); - $this->loadDumps(['Variable.php']); - // Update the file_directory_path. Database::getConnection('default', 'migrate') ->update('variable') diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadBase.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadBase.php index 17ea473..5cff822 100644 --- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadBase.php +++ b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadBase.php @@ -94,13 +94,6 @@ protected function setUp() { $node->save(); } } - $this->loadDumps([ - 'Node.php', - 'NodeRevisions.php', - 'ContentTypeStory.php', - 'ContentTypeTestPlanet.php', - 'Upload.php', - ]); } } diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityDisplayTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityDisplayTest.php index ff170a3..83eb0af 100644 --- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityDisplayTest.php +++ b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityDisplayTest.php @@ -39,8 +39,6 @@ protected function setUp() { ), ); $this->prepareMigrations($id_mappings); - - $this->loadDumps(['NodeType.php', 'Variable.php']); $this->executeMigration('d6_upload_entity_display'); } diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityFormDisplayTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityFormDisplayTest.php index b72f645..6023f51 100644 --- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityFormDisplayTest.php +++ b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadEntityFormDisplayTest.php @@ -39,8 +39,6 @@ protected function setUp() { ), ); $this->prepareMigrations($id_mappings); - - $this->loadDumps(['NodeType.php', 'Variable.php']); $this->executeMigration('d6_upload_entity_form_display'); } diff --git a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadInstanceTest.php b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadInstanceTest.php index 1a61af7..998912a 100644 --- a/core/modules/file/src/Tests/Migrate/d6/MigrateUploadInstanceTest.php +++ b/core/modules/file/src/Tests/Migrate/d6/MigrateUploadInstanceTest.php @@ -51,7 +51,6 @@ protected function setUp() { 'translatable' => '0', ))->save(); - $this->loadDumps(['NodeType.php', 'Variable.php']); $this->executeMigration('d6_upload_field_instance'); } diff --git a/core/modules/file/src/Tests/Migrate/d7/MigrateFileTest.php b/core/modules/file/src/Tests/Migrate/d7/MigrateFileTest.php index 4dedfbb..da1a6d2 100644 --- a/core/modules/file/src/Tests/Migrate/d7/MigrateFileTest.php +++ b/core/modules/file/src/Tests/Migrate/d7/MigrateFileTest.php @@ -26,7 +26,6 @@ class MigrateFileTest extends MigrateDrupal7TestBase { protected function setUp() { parent::setUp(); - $this->loadDumps(['FileManaged.php', 'Variable.php']); $this->installEntitySchema('file'); $fs = \Drupal::service('file_system'); diff --git a/core/modules/filter/src/Tests/Migrate/d6/MigrateFilterFormatTest.php b/core/modules/filter/src/Tests/Migrate/d6/MigrateFilterFormatTest.php index 62f374b..ac5e1ce 100644 --- a/core/modules/filter/src/Tests/Migrate/d6/MigrateFilterFormatTest.php +++ b/core/modules/filter/src/Tests/Migrate/d6/MigrateFilterFormatTest.php @@ -26,7 +26,6 @@ class MigrateFilterFormatTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Filters.php', 'FilterFormats.php', 'Variable.php']); $this->executeMigration('d6_filter_format'); } diff --git a/core/modules/filter/src/Tests/Migrate/d7/MigrateFilterFormatTest.php b/core/modules/filter/src/Tests/Migrate/d7/MigrateFilterFormatTest.php index ffb3ea5..ef4a574 100644 --- a/core/modules/filter/src/Tests/Migrate/d7/MigrateFilterFormatTest.php +++ b/core/modules/filter/src/Tests/Migrate/d7/MigrateFilterFormatTest.php @@ -28,7 +28,6 @@ class MigrateFilterFormatTest extends MigrateDrupal7TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Filter.php', 'FilterFormat.php', 'Variable.php']); $this->executeMigration('d7_filter_format'); } diff --git a/core/modules/forum/src/Tests/Migrate/d6/MigrateForumConfigsTest.php b/core/modules/forum/src/Tests/Migrate/d6/MigrateForumConfigsTest.php index 803de4b..8062538 100644 --- a/core/modules/forum/src/Tests/Migrate/d6/MigrateForumConfigsTest.php +++ b/core/modules/forum/src/Tests/Migrate/d6/MigrateForumConfigsTest.php @@ -36,7 +36,6 @@ protected function setUp() { array(array(1), array('vocabulary_1_i_0_')), ) )); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_forum_settings'); } diff --git a/core/modules/locale/src/Tests/Migrate/MigrateLocaleConfigsTest.php b/core/modules/locale/src/Tests/Migrate/MigrateLocaleConfigsTest.php index ffa5277..ceb34cd 100644 --- a/core/modules/locale/src/Tests/Migrate/MigrateLocaleConfigsTest.php +++ b/core/modules/locale/src/Tests/Migrate/MigrateLocaleConfigsTest.php @@ -31,7 +31,6 @@ class MigrateLocaleConfigsTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('locale_settings'); } diff --git a/core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php b/core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php index cf21ebd..5fd0cbf 100644 --- a/core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php +++ b/core/modules/menu_link_content/src/Tests/Migrate/d6/MigrateMenuLinkTest.php @@ -42,7 +42,6 @@ protected function setUp() { ), )); - $this->loadDumps(['MenuLinks.php']); $this->executeMigration('d6_menu_links'); } diff --git a/core/modules/menu_ui/src/Tests/Migrate/MigrateMenuSettingsTest.php b/core/modules/menu_ui/src/Tests/Migrate/MigrateMenuSettingsTest.php index 46de706..c1655c6 100644 --- a/core/modules/menu_ui/src/Tests/Migrate/MigrateMenuSettingsTest.php +++ b/core/modules/menu_ui/src/Tests/Migrate/MigrateMenuSettingsTest.php @@ -24,7 +24,6 @@ class MigrateMenuSettingsTest extends MigrateDrupal7TestBase { protected function setUp() { parent::setUp(); $this->installConfig(['menu_ui']); - $this->loadDumps(['Variable.php']); $this->executeMigration('menu_settings'); } diff --git a/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php b/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php index 9d4e1a2..f007b31 100644 --- a/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php +++ b/core/modules/migrate_drupal/src/Tests/MigrateDrupalTestBase.php @@ -30,7 +30,8 @@ */ protected function setUp() { parent::setUp(); - $this->loadDumps(['System.php']); + $tables = file_scan_directory($this->getDumpDirectory(), '/.php$/', array('recurse' => FALSE)); + $this->loadDumps(array_keys($tables)); $this->installEntitySchema('user'); $this->installConfig(['migrate_drupal', 'system']); @@ -47,14 +48,6 @@ protected function getDumpDirectory() { } /** - * {@inheritdoc} - */ - protected function loadDumps(array $files, $method = 'load') { - $files = array_map(function($file) { return $this->getDumpDirectory() . '/' . $file; }, $files); - parent::loadDumps($files, $method); - } - - /** * Turn all the migration templates for the specified drupal version into * real migration entities so we can test them. * diff --git a/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php index 98289c0..acbb24b 100644 --- a/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php +++ b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php @@ -29,14 +29,6 @@ protected static $blacklist = []; /** - * Get the dump classes required for this migration test. - * - * @return array - * The list of files containing dumps. - */ - protected abstract function getDumps(); - - /** * Get the test classes that needs to be run for this test. * * @return array @@ -73,14 +65,10 @@ protected function tearDown() { parent::tearDown(); } - /** * Test the complete Drupal migration. */ public function testDrupal() { - $dumps = $this->getDumps(); - $this->loadDumps($dumps); - $classes = $this->getTestClassesList(); foreach ($classes as $class) { if (is_subclass_of($class, '\Drupal\migrate\Tests\MigrateDumpAlterInterface')) { diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php index fb4f0ea..9f3482c 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateDrupal6Test.php @@ -209,52 +209,6 @@ protected function setUp() { } /** - * {@inheritdoc} - */ - protected function getDumps() { - return array( - 'AggregatorFeed.php', - 'AggregatorItem.php', - 'Blocks.php', - 'BlocksRoles.php', - 'Book.php', - 'Boxes.php', - 'Comments.php', - 'Contact.php', - 'ContentFieldMultivalue.php', - 'ContentFieldTest.php', - 'ContentFieldTestTwo.php', - 'ContentNodeField.php', - 'ContentNodeFieldInstance.php', - 'ContentTypeStory.php', - 'ContentTypeTestPlanet.php', - 'EventTimezones.php', - 'Files.php', - 'FilterFormats.php', - 'Filters.php', - 'MenuCustom.php', - 'MenuLinks.php', - 'Node.php', - 'NodeRevisions.php', - 'NodeType.php', - 'Permission.php', - 'ProfileFields.php', - 'ProfileValues.php', - 'Role.php', - 'TermData.php', - 'TermHierarchy.php', - 'TermNode.php', - 'Upload.php', - 'UrlAlias.php', - 'Users.php', - 'UsersRoles.php', - 'Variable.php', - 'Vocabulary.php', - 'VocabularyNodeTypes.php', - ); - } - - /** * Returns the path to the dump directory. * * @return string diff --git a/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php b/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php index 81842c1..d4b3a53 100644 --- a/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php +++ b/core/modules/migrate_drupal/src/Tests/dependencies/MigrateDependenciesTest.php @@ -55,7 +55,6 @@ public function testMigrateDependenciesOrder() { public function testAggregatorMigrateDependencies() { /** @var \Drupal\migrate\entity\Migration $migration */ $migration = entity_load('migration', 'd6_aggregator_item'); - $this->loadDumps(['AggregatorItem.php']); $executable = new MigrateExecutable($migration, $this); $this->startCollectingMessages(); $executable->import(); diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php index 33625eb..d19061b 100644 --- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php +++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBuilderTest.php @@ -17,18 +17,6 @@ class MigrateNodeBuilderTest extends MigrateDrupal6TestBase { public static $modules = ['migrate', 'migrate_drupal', 'node']; /** - * {@inheritdoc} - */ - public function setUp() { - parent::setUp(); - $this->loadDumps([ - 'ContentNodeField.php', - 'ContentNodeFieldInstance.php', - 'NodeType.php', - ]); - } - - /** * Tests creating migrations from a template, using a builder plugin. */ public function testCreateMigrations() { diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php index fc6e4e5..454040d 100644 --- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php +++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php @@ -57,7 +57,6 @@ public function setUp() { ); $this->prepareMigrations($id_mappings); - $this->loadDumps(['NodeType.php', 'Variable.php']); $this->executeMigration('d6_node_setting_promote'); $this->executeMigration('d6_node_setting_status'); $this->executeMigration('d6_node_setting_sticky'); diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php index 291c42a..af540f7 100644 --- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php +++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php @@ -31,7 +31,6 @@ class MigrateNodeConfigsTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_node_settings'); } diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php index b10083e..27a5dcd 100644 --- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php +++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php @@ -29,8 +29,6 @@ protected function setUp() { ); $this->prepareMigrations($id_mappings); - $this->loadDumps(['Users.php']); - // Create our users for the node authors. $query = Database::getConnection('default', 'migrate')->query('SELECT * FROM {users} WHERE uid NOT IN (0, 1)'); while(($row = $query->fetchAssoc()) !== FALSE) { diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTestBase.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTestBase.php index f011a90..a47df1f 100644 --- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTestBase.php +++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTestBase.php @@ -94,20 +94,6 @@ protected function setUp() { )); $node->enforceIsNew(); $node->save(); - - $this->loadDumps([ - 'Node.php', - 'NodeRevisions.php', - 'ContentTypeStory.php', - 'ContentTypeTestPlanet.php', - 'NodeType.php', - 'Variable.php', - 'ContentNodeFieldInstance.php', - 'ContentNodeField.php', - 'ContentFieldTest.php', - 'ContentFieldTestTwo.php', - 'ContentFieldMultivalue.php', - ]); } } diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php index 1ef267d..f7c5832 100644 --- a/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php +++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php @@ -30,9 +30,7 @@ class MigrateNodeTypeTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->installConfig(array('node')); - $this->loadDumps(['NodeType.php', 'Variable.php']); $this->executeMigration('d6_node_type'); } diff --git a/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php index aa4337f..310a0c9 100644 --- a/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php +++ b/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php @@ -29,13 +29,6 @@ class MigrateViewModesTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps([ - 'ContentNodeFieldInstance.php', - 'ContentNodeField.php', - 'ContentFieldTest.php', - 'ContentFieldTestTwo.php', - 'ContentFieldMultivalue.php', - ]); $this->executeMigration('d6_view_modes'); } diff --git a/core/modules/path/src/Tests/Migrate/d6/MigrateUrlAliasTest.php b/core/modules/path/src/Tests/Migrate/d6/MigrateUrlAliasTest.php index 200019c..bf08192 100644 --- a/core/modules/path/src/Tests/Migrate/d6/MigrateUrlAliasTest.php +++ b/core/modules/path/src/Tests/Migrate/d6/MigrateUrlAliasTest.php @@ -31,9 +31,7 @@ class MigrateUrlAliasTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->installSchema('system', ['url_alias']); - $this->loadDumps(['UrlAlias.php']); $this->executeMigration('d6_url_alias'); } diff --git a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php index 81fc6e1..c330d2f 100644 --- a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php +++ b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchPageTest.php @@ -30,7 +30,6 @@ class MigrateSearchPageTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_search_page'); } diff --git a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchSettingsTest.php b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchSettingsTest.php index 6b08fe5..d872d16 100644 --- a/core/modules/search/src/Tests/Migrate/d6/MigrateSearchSettingsTest.php +++ b/core/modules/search/src/Tests/Migrate/d6/MigrateSearchSettingsTest.php @@ -31,7 +31,6 @@ class MigrateSearchSettingsTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_search_settings'); } diff --git a/core/modules/search/src/Tests/Migrate/d7/MigrateSearchSettingsTest.php b/core/modules/search/src/Tests/Migrate/d7/MigrateSearchSettingsTest.php index dc31d15..5adff41 100644 --- a/core/modules/search/src/Tests/Migrate/d7/MigrateSearchSettingsTest.php +++ b/core/modules/search/src/Tests/Migrate/d7/MigrateSearchSettingsTest.php @@ -23,7 +23,6 @@ class MigrateSearchSettingsTest extends MigrateDrupal7TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d7_search_settings'); } diff --git a/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php b/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php index c44578d..43344dc 100644 --- a/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php +++ b/core/modules/simpletest/src/Tests/Migrate/d6/MigrateSimpletestConfigsTest.php @@ -33,7 +33,6 @@ protected function setUp() { parent::setUp(); $this->installConfig(['simpletest']); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_simpletest_settings'); } diff --git a/core/modules/simpletest/src/Tests/Migrate/d7/MigrateSimpletestSettingsTest.php b/core/modules/simpletest/src/Tests/Migrate/d7/MigrateSimpletestSettingsTest.php index 121c86c..0528cc1 100644 --- a/core/modules/simpletest/src/Tests/Migrate/d7/MigrateSimpletestSettingsTest.php +++ b/core/modules/simpletest/src/Tests/Migrate/d7/MigrateSimpletestSettingsTest.php @@ -24,7 +24,6 @@ class MigrateSimpletestSettingsTest extends MigrateDrupal7TestBase { protected function setUp() { parent::setUp(); $this->installConfig(static::$modules); - $this->loadDumps(['Variable.php']); $this->executeMigration('d7_simpletest_settings'); } diff --git a/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php b/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php index ea0be9d..9a0a9d2 100644 --- a/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php +++ b/core/modules/statistics/src/Tests/Migrate/d6/MigrateStatisticsConfigsTest.php @@ -31,7 +31,6 @@ class MigrateStatisticsConfigsTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_statistics_settings'); } diff --git a/core/modules/syslog/src/Tests/Migrate/d6/MigrateSyslogConfigsTest.php b/core/modules/syslog/src/Tests/Migrate/d6/MigrateSyslogConfigsTest.php index 19d9505..0ed8593 100644 --- a/core/modules/syslog/src/Tests/Migrate/d6/MigrateSyslogConfigsTest.php +++ b/core/modules/syslog/src/Tests/Migrate/d6/MigrateSyslogConfigsTest.php @@ -31,7 +31,6 @@ class MigrateSyslogConfigsTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_syslog_settings'); } diff --git a/core/modules/syslog/src/Tests/Migrate/d7/MigrateSyslogConfigsTest.php b/core/modules/syslog/src/Tests/Migrate/d7/MigrateSyslogConfigsTest.php index 234a52f..f7ae205 100644 --- a/core/modules/syslog/src/Tests/Migrate/d7/MigrateSyslogConfigsTest.php +++ b/core/modules/syslog/src/Tests/Migrate/d7/MigrateSyslogConfigsTest.php @@ -32,7 +32,6 @@ class MigrateSyslogConfigsTest extends MigrateDrupal7TestBase { protected function setUp() { parent::setUp(); $this->installConfig(static::$modules); - $this->loadDumps(['Variable.php']); $this->executeMigration('d7_syslog_settings'); } diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateDateFormatTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateDateFormatTest.php index c1d5c8f..8ba6c95 100644 --- a/core/modules/system/src/Tests/Migrate/d6/MigrateDateFormatTest.php +++ b/core/modules/system/src/Tests/Migrate/d6/MigrateDateFormatTest.php @@ -23,7 +23,6 @@ class MigrateDateFormatTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_date_formats'); } diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateMenuTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateMenuTest.php index 279e2b7..b868f2a 100644 --- a/core/modules/system/src/Tests/Migrate/d6/MigrateMenuTest.php +++ b/core/modules/system/src/Tests/Migrate/d6/MigrateMenuTest.php @@ -24,7 +24,6 @@ class MigrateMenuTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['MenuCustom.php']); $this->executeMigration('d6_menu'); } diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php index c39f11e..77831b0 100644 --- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php +++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemCronTest.php @@ -21,7 +21,6 @@ class MigrateSystemCronTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_system_cron'); } diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php index 9a9ff2a..6b7e0c2 100644 --- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php +++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemFileTest.php @@ -21,7 +21,6 @@ class MigrateSystemFileTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_system_file'); } diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php index cdf9eae..57f30a4 100644 --- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php +++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageGdTest.php @@ -21,7 +21,6 @@ class MigrateSystemImageGdTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_system_image_gd'); } diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php index e91e7cb..a2e5d80 100644 --- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php +++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemImageTest.php @@ -21,7 +21,6 @@ class MigrateSystemImageTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_system_image'); } diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php index 963f58b..c352910 100644 --- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php +++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemLoggingTest.php @@ -24,7 +24,6 @@ class MigrateSystemLoggingTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_system_logging'); } diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php index 581be5e..82ea483 100644 --- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php +++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemMaintenanceTest.php @@ -21,7 +21,6 @@ class MigrateSystemMaintenanceTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_system_maintenance'); } diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php index 54e72fa..f6defe9 100644 --- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php +++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemPerformanceTest.php @@ -21,7 +21,6 @@ class MigrateSystemPerformanceTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_system_performance'); } diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php index 6295a56..21b04c2 100644 --- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php +++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php @@ -21,7 +21,6 @@ class MigrateSystemRssTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_system_rss'); } diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php index 7591063..2b68764 100644 --- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php +++ b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemSiteTest.php @@ -21,7 +21,6 @@ class MigrateSystemSiteTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_system_site'); } diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyConfigsTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyConfigsTest.php index 08b12a9..ef17ea6 100644 --- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyConfigsTest.php +++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyConfigsTest.php @@ -31,7 +31,6 @@ class MigrateTaxonomyConfigsTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_taxonomy_settings'); } diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php index 8cf7560..eefcceb 100644 --- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php +++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyTermTest.php @@ -33,12 +33,6 @@ protected function setUp() { array(array(2), array('vocabulary_2_i_1_')), array(array(3), array('vocabulary_3_i_2_')), ))); - $this->loadDumps([ - 'TermData.php', - 'TermHierarchy.php', - 'Vocabulary.php', - 'VocabularyNodeTypes.php', - ]); $this->executeMigration('d6_taxonomy_term'); } diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php index e199238..af2fdba 100644 --- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php +++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTaxonomyVocabularyTest.php @@ -29,7 +29,6 @@ class MigrateTaxonomyVocabularyTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Vocabulary.php', 'VocabularyNodeTypes.php']); $this->executeMigration('d6_taxonomy_vocabulary'); } diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTestBase.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTestBase.php index c54377b..0d51f64 100644 --- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTestBase.php +++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateTermNodeTestBase.php @@ -82,17 +82,6 @@ protected function setUp() { $node->save(); } } - $this->loadDumps([ - 'Node.php', - 'NodeRevisions.php', - 'ContentTypeStory.php', - 'ContentTypeTestPlanet.php', - 'TermNode.php', - 'TermHierarchy.php', - 'TermData.php', - 'Vocabulary.php', - 'VocabularyNodeTypes.php', - ]); } } diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php index 5c266e6..bcf6b69 100644 --- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php +++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityDisplayTest.php @@ -69,8 +69,6 @@ protected function setUp() { ) ); $this->prepareMigrations($id_mappings); - - $this->loadDumps(['Vocabulary.php', 'VocabularyNodeTypes.php']); $this->executeMigration('d6_vocabulary_entity_display'); } diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php index 1691438..80efa09 100644 --- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php +++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyEntityFormDisplayTest.php @@ -69,8 +69,6 @@ protected function setUp() { ) ); $this->prepareMigrations($id_mappings); - - $this->loadDumps(['Vocabulary.php', 'VocabularyNodeTypes.php']); $this->executeMigration('d6_vocabulary_entity_form_display'); } diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php index 0154063..f5c02ad 100644 --- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php +++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldInstanceTest.php @@ -68,7 +68,6 @@ protected function setUp() { ), ))->save(); - $this->loadDumps(['Vocabulary.php', 'VocabularyNodeTypes.php']); $this->executeMigration('d6_vocabulary_field_instance'); } diff --git a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php index 9859d59..0c588c8 100644 --- a/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php +++ b/core/modules/taxonomy/src/Tests/Migrate/d6/MigrateVocabularyFieldTest.php @@ -44,7 +44,6 @@ protected function setUp() { 'vid' => 'test_vocab', ))->save(); - $this->loadDumps(['Vocabulary.php', 'VocabularyNodeTypes.php']); $this->executeMigration('d6_vocabulary_field'); } diff --git a/core/modules/text/src/Tests/Migrate/d6/MigrateTextConfigsTest.php b/core/modules/text/src/Tests/Migrate/d6/MigrateTextConfigsTest.php index 929d72d..440ffc0 100644 --- a/core/modules/text/src/Tests/Migrate/d6/MigrateTextConfigsTest.php +++ b/core/modules/text/src/Tests/Migrate/d6/MigrateTextConfigsTest.php @@ -31,7 +31,6 @@ class MigrateTextConfigsTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_text_settings'); } diff --git a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerSettingsTest.php b/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerSettingsTest.php index 3dd67b3..f37871e 100644 --- a/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerSettingsTest.php +++ b/core/modules/tracker/src/Tests/Migrate/d7/MigrateTrackerSettingsTest.php @@ -24,7 +24,6 @@ class MigrateTrackerSettingsTest extends MigrateDrupal7TestBase { protected function setUp() { parent::setUp(); $this->installConfig(['tracker']); - $this->loadDumps(['Variable.php']); $this->executeMigration('d7_tracker_settings'); } diff --git a/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php b/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php index 9cea4fc..fedf182 100644 --- a/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php +++ b/core/modules/update/src/Tests/Migrate/d6/MigrateUpdateConfigsTest.php @@ -31,7 +31,6 @@ class MigrateUpdateConfigsTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_update_settings'); } diff --git a/core/modules/user/src/Tests/Migrate/ProfileValuesBuilderTest.php b/core/modules/user/src/Tests/Migrate/ProfileValuesBuilderTest.php index a7f152d..747edc9 100644 --- a/core/modules/user/src/Tests/Migrate/ProfileValuesBuilderTest.php +++ b/core/modules/user/src/Tests/Migrate/ProfileValuesBuilderTest.php @@ -17,14 +17,6 @@ class ProfileValuesBuilderTest extends MigrateDrupal6TestBase { public static $modules = ['migrate', 'migrate_drupal', 'user']; /** - * {@inheritdoc} - */ - protected function setUp() { - parent::setUp(); - $this->loadDumps(['ProfileFields.php', 'ProfileValues.php']); - } - - /** * Tests that profile fields are merged into the d6_profile_values migration's * process pipeline by the d6_profile_values builder. */ diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php index 9fa2bab..a087bbd 100644 --- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php +++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserConfigsTest.php @@ -24,7 +24,6 @@ class MigrateUserConfigsTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps(['Variable.php']); $this->executeMigration('d6_user_mail'); $this->executeMigration('d6_user_settings'); } diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserContactSettingsTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserContactSettingsTest.php index 33637af..dec0153 100644 --- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserContactSettingsTest.php +++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserContactSettingsTest.php @@ -29,13 +29,6 @@ protected function setUp() { $this->installSchema('user', array('users_data')); - $this->loadDumps([ - 'Users.php', - 'ProfileValues.php', - 'UsersRoles.php', - 'EventTimezones.php', - ]); - $id_mappings = array( 'd6_user' => array( array(array(2), array(2)), diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php index 650e6f2..54a8456 100644 --- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php +++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserPictureFileTest.php @@ -31,12 +31,6 @@ protected function setUp() { parent::setUp(); $this->installEntitySchema('file'); - $this->loadDumps([ - 'Users.php', - 'ProfileValues.php', - 'UsersRoles.php', - 'EventTimezones.php', - ]); /** @var \Drupal\migrate\Entity\MigrationInterface $migration */ $migration = entity_load('migration', 'd6_user_picture_file'); diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileEntityDisplayTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileEntityDisplayTest.php index a1e9d16..059230f 100644 --- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileEntityDisplayTest.php +++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileEntityDisplayTest.php @@ -73,14 +73,6 @@ protected function setUp() { 'type' => 'boolean', ))->save(); - $this->loadDumps([ - 'ProfileFields.php', - 'Users.php', - 'ProfileValues.php', - 'UsersRoles.php', - 'EventTimezones.php', - ]); - $field_data = Database::getConnection('default', 'migrate') ->select('profile_fields', 'u') ->fields('u') diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileEntityFormDisplayTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileEntityFormDisplayTest.php index a863abe..0adb061 100644 --- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileEntityFormDisplayTest.php +++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileEntityFormDisplayTest.php @@ -68,14 +68,6 @@ protected function setUp() { 'type' => 'boolean', ))->save(); - $this->loadDumps([ - 'ProfileFields.php', - 'Users.php', - 'ProfileValues.php', - 'UsersRoles.php', - 'EventTimezones.php', - ]); - $field_data = Database::getConnection('default', 'migrate') ->select('profile_fields', 'u') ->fields('u') diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileFieldInstanceTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileFieldInstanceTest.php index 2b775ed..e4bbee1 100644 --- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileFieldInstanceTest.php +++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileFieldInstanceTest.php @@ -32,13 +32,6 @@ protected function setUp() { ); $this->prepareMigrations($id_mappings); $this->createFields(); - $this->loadDumps(array( - 'ProfileFields.php', - 'Users.php', - 'ProfileValues.php', - 'UsersRoles.php', - 'EventTimezones.php', - )); $this->executeMigration('d6_user_profile_field_instance'); } diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileFieldTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileFieldTest.php index fd739ae..12bb0a2 100644 --- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileFieldTest.php +++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileFieldTest.php @@ -24,13 +24,6 @@ class MigrateUserProfileFieldTest extends MigrateDrupal6TestBase { */ protected function setUp() { parent::setUp(); - $this->loadDumps([ - 'ProfileFields.php', - 'Users.php', - 'ProfileValues.php', - 'UsersRoles.php', - 'EventTimezones.php', - ]); $this->executeMigration('d6_user_profile_field'); } diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileValuesTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileValuesTest.php index 303013f..f07b919 100644 --- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileValuesTest.php +++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserProfileValuesTest.php @@ -105,14 +105,6 @@ protected function setUp() { ); $this->prepareMigrations($id_mappings); - $this->loadDumps([ - 'ProfileFields.php', - 'Users.php', - 'ProfileValues.php', - 'UsersRoles.php', - 'EventTimezones.php', - ]); - $field_data = Database::getConnection('default', 'migrate') ->select('profile_fields', 'u') ->fields('u') diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php index 1d637e7..caf1ca9 100644 --- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php +++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserRoleTest.php @@ -37,14 +37,6 @@ protected function setUp() { ), ); $this->prepareMigrations($id_mappings); - - $this->loadDumps([ - 'Permission.php', - 'Role.php', - 'Filters.php', - 'FilterFormats.php', - 'Variable.php', - ]); $this->executeMigration('d6_user_role'); } diff --git a/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php index dcc387c..7fa3236 100644 --- a/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php +++ b/core/modules/user/src/Tests/Migrate/d6/MigrateUserTest.php @@ -87,19 +87,6 @@ protected function setUp() { file_put_contents($file->getFileUri(), file_get_contents('core/modules/simpletest/files/image-2.jpg')); $file->save(); - $this->loadDumps([ - 'Filters.php', - 'FilterFormats.php', - 'Variable.php', - 'ProfileFields.php', - 'Permission.php', - 'Role.php', - 'Users.php', - 'ProfileValues.php', - 'UsersRoles.php', - 'EventTimezones.php', - ]); - $id_mappings = array( 'd6_user_role' => array( array(array(1), array('anonymous user')),