diff -u b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php --- b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php +++ b/core/modules/migrate_drupal/src/Tests/MigrateFullDrupalTestBase.php @@ -8,10 +8,7 @@ namespace Drupal\migrate_drupal\Tests; use Drupal\Component\Utility\SafeMarkup; -use Drupal\Core\Config\ExtensionInstallStorage; -use Drupal\Core\Config\StorageInterface; use Drupal\migrate\MigrateExecutable; -use Drupal\migrate\MigrateTemplateStorage; use Drupal\simpletest\TestBase; /** @@ -58,7 +55,7 @@ $this->loadDumps($dumps); $classes = $this->getTestClassesList(); - $extension_install_storage = new ExtensionInstallStorage(\Drupal::service('config.storage'), MigrateTemplateStorage::MIGRATION_TEMPLATE_DIRECTORY, StorageInterface::DEFAULT_COLLECTION, TRUE); + $template_storage = \Drupal::service('migrate.template_storage'); foreach ($classes as $class) { if (is_subclass_of($class, '\Drupal\migrate\Tests\MigrateDumpAlterInterface')) { $class::migrateDumpAlter($this); @@ -71,7 +68,7 @@ // Ensure that the default migration has the correct dependencies. list($base_name, ) = explode(':', $migration->id(), 2); - $default_configuration = $extension_install_storage->read('migrate.migration.' . $base_name); + $default_configuration = $template_storage->read('migrate.migration.' . $base_name); $default_dependencies = isset($default_configuration['dependencies']) ? $default_configuration['dependencies'] : []; $this->assertEqual($default_dependencies, $migration->getDependencies(), SafeMarkup::format('Dependencies in @id match after installing. Default configuration @first is equal to active configuration @second.', array( '@id' => $migration->id(),