Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2315489 by benjy: Renamed prepareIdMappings() in MigrateTestBase.

8.0.x
Alex Pott 2014-08-13 18:01:54 -07:00
parent f8c9cf8b16
commit 37df1bd026
36 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/modules/migrate/src/Tests/MigrateTestBase.php
View File

@ -104,21 +104,20 @@ abstract class MigrateTestBase extends WebTestBase implements MigrateMessageInte
}
/**
* Prepare the id mappings.
* Prepare any dependent migrations.
*
* @param array $id_mappings
* A list of id mappings keyed by migration ids. Each id mapping is a list
* of two arrays, the first are source ids and the second are destination
* ids.
*/
protected function prepareIdMappings(array $id_mappings) {
protected function prepareMigrations(array $id_mappings) {
/** @var \Drupal\migrate\Entity\MigrationInterface[] $migrations */
$migrations = entity_load_multiple('migration', array_keys($id_mappings));
foreach ($id_mappings as $migration_id => $data) {
$migration = $migrations[$migration_id];
// @TODO, rename prepareIdMappings() in https://drupal.org/node/2315489
// which will make the position of this more appropriate.
// Mark the dependent migrations as complete.
$migration->setMigrationResult(MigrationInterface::RESULT_COMPLETED);
$id_map = $migration->getIdMap();

2
core/modules/migrate_drupal/src/Tests/d6/MigrateAggregatorItemTest.php
View File

@ -32,7 +32,7 @@ class MigrateAggregatorItemTest extends MigrateDrupalTestBase {
array(array(5), array(5)),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
$entity = entity_create('aggregator_feed', array(
'fid' => 5,

2
core/modules/migrate_drupal/src/Tests/d6/MigrateBlockContentTest.php
View File

@ -27,7 +27,7 @@ class MigrateBlockContentTest extends MigrateDrupalTestBase {
*/
public function setUp() {
parent::setUp();
$this->prepareIdMappings(array(
$this->prepareMigrations(array(
'd6_filter_format' => array(
array(array(2), array('full_html'))
)

2
core/modules/migrate_drupal/src/Tests/d6/MigrateBlockTest.php
View File

@ -46,7 +46,7 @@ class MigrateBlockTest extends MigrateDrupalTestBase {
$entity->enforceIsNew(TRUE);
$entity->save();
}
$this->prepareIdMappings(array(
$this->prepareMigrations(array(
'd6_custom_block' => array(
array(array(10), array(1)),
array(array(11), array(2)),

2
core/modules/migrate_drupal/src/Tests/d6/MigrateBookTest.php
View File

@ -35,7 +35,7 @@ class MigrateBookTest extends MigrateDrupalTestBase {
$entity->save();
$id_mappings['d6_node'][] = array(array($i), array($i));
}
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
// Load database dumps to provide source data.
$dumps = array(
$this->getDumpDirectory() . '/Drupal6Book.php',

2
core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php
View File

@ -63,7 +63,7 @@ class MigrateCckFieldRevisionTest extends MigrateNodeTestBase {
array(array(1), array(1)),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
$dumps = array(
$this->getDumpDirectory() . '/Drupal6NodeRevision.php',
);

2
core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php
View File

@ -84,7 +84,7 @@ class MigrateCckFieldValuesTest extends MigrateNodeTestBase {
array(array(2), array(2)),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
$migrations = entity_load_multiple('migration', array('d6_cck_field_values:*'));
foreach ($migrations as $migration) {

2
core/modules/migrate_drupal/src/Tests/d6/MigrateCommentTest.php
View File

@ -53,7 +53,7 @@ class MigrateCommentTest extends MigrateDrupalTestBase {
'd6_comment_entity_display' => array(array(array('story'), array('node', 'story', 'default', 'comment'))),
'd6_comment_entity_form_display' => array(array(array('story'), array('node', 'story', 'default', 'comment'))),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
\Drupal::service('comment.manager')->addDefaultField('node', 'story');
/** @var \Drupal\migrate\entity\Migration $migration */

2
core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableDisplayBase.php
View File

@ -74,7 +74,7 @@ abstract class MigrateCommentVariableDisplayBase extends MigrateDrupalTestBase {
array(array('page'), array('node', 'comment', 'page')),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
/** @var \Drupal\migrate\entity\Migration $migration */
$migration = entity_load('migration', static::MIGRATION);
$this->prepare($migration, $this->dumps);

2
core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php
View File

@ -42,7 +42,7 @@ class MigrateCommentVariableEntityFormDisplaySubjectTest extends MigrateDrupalTe
array(array('comment'), array('comment_no_subject')),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
/** @var \Drupal\migrate\entity\Migration $migration */
$migration = entity_load('migration', 'd6_comment_entity_form_display_subject');
$dumps = array(

2
core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableFieldTest.php
View File

@ -40,7 +40,7 @@ class MigrateCommentVariableFieldTest extends MigrateDrupalTestBase {
array(array('comment'), array('comment_no_subject')),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
/** @var \Drupal\migrate\entity\Migration $migration */
$migration = entity_load('migration', 'd6_comment_field');
$dumps = array(

2
core/modules/migrate_drupal/src/Tests/d6/MigrateCommentVariableInstanceTest.php
View File

@ -33,7 +33,7 @@ class MigrateCommentVariableInstanceTest extends MigrateDrupalTestBase {
array(array('page'), array('page')),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
foreach (array('page', 'story') as $type) {
entity_create('node_type', array('type' => $type))->save();

2
core/modules/migrate_drupal/src/Tests/d6/MigrateContactConfigsTest.php
View File

@ -40,7 +40,7 @@ class MigrateContactConfigsTest extends MigrateDrupalTestBase {
array(array(2), array('some_other_category')),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
$migration = entity_load('migration', 'd6_contact_settings');
$dumps = array(
$this->getDumpDirectory() . '/Drupal6ContactSettings.php',

2
core/modules/migrate_drupal/src/Tests/d6/MigrateFieldFormatterSettingsTest.php
View File

@ -60,7 +60,7 @@ class MigrateFieldFormatterSettingsTest extends MigrateDrupalTestBase {
array(array('field_test_datetime'), array('node', 'field_test_datetime')),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
$migration = entity_load('migration', 'd6_field_formatter_settings');
$dumps = array(

2
core/modules/migrate_drupal/src/Tests/d6/MigrateFieldInstanceTest.php
View File

@ -60,7 +60,7 @@ class MigrateFieldInstanceTest extends MigrateDrupalTestBase {
array(array('test_page'), array('test_page')),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
entity_create('node_type', array('type' => 'page'))->save();
entity_create('node_type', array('type' => 'story'))->save();
entity_create('node_type', array('type' => 'test_page'))->save();

2
core/modules/migrate_drupal/src/Tests/d6/MigrateFieldWidgetSettingsTest.php
View File

@ -60,7 +60,7 @@ class MigrateFieldWidgetSettingsTest extends MigrateDrupalTestBase {
array(array('field_test_datetime'), array('node', 'field_test_datetime')),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
$migration = entity_load('migration', 'd6_field_instance_widget_settings');
$dumps = array(
$this->getDumpDirectory() . '/Drupal6FieldInstance.php',

2
core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php
View File

@ -26,7 +26,7 @@ class MigrateNodeRevisionTest extends MigrateNodeTestBase {
array(array(1), array(1)),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
$dumps = array(
$this->getDumpDirectory() . '/Drupal6NodeRevision.php',

2
core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTestBase.php
View File

@ -47,7 +47,7 @@ abstract class MigrateNodeTestBase extends MigrateDrupalTestBase {
),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
$migration = entity_load('migration', 'd6_node_settings');
$migration->setMigrationResult(MigrationInterface::RESULT_COMPLETED);

2
core/modules/migrate_drupal/src/Tests/d6/MigrateProfileValuesTest.php
View File

@ -123,7 +123,7 @@ class MigrateProfileValuesTest extends MigrateDrupalTestBase {
array(array(15), array(15)),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
// Load database dumps to provide source data.
$dumps = array(

2
core/modules/migrate_drupal/src/Tests/d6/MigrateTaxonomyTermTest.php
View File

@ -25,7 +25,7 @@ class MigrateTaxonomyTermTest extends MigrateDrupalTestBase {
*/
protected function setUp() {
parent::setUp();
$this->prepareIdMappings(array(
$this->prepareMigrations(array(
'd6_taxonomy_vocabulary' => array(
array(array(1), array('vocabulary_1_i_0_')),
array(array(2), array('vocabulary_2_i_1_')),

2
core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeRevisionTest.php
View File

@ -29,7 +29,7 @@ class MigrateTermNodeRevisionTest extends MigrateTermNodeTestBase {
array(array(2), array(2)),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
/** @var \Drupal\migrate\entity\Migration $migration */
$migrations = entity_load_multiple('migration', array('d6_term_node_revision:*'));
foreach ($migrations as $migration) {

2
core/modules/migrate_drupal/src/Tests/d6/MigrateTermNodeTestBase.php
View File

@ -67,7 +67,7 @@ abstract class MigrateTermNodeTestBase extends MigrateDrupalTestBase {
array(array(2), array(2)),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
$vids = array(1, 2, 3);
for ($i = 1; $i <= 2; $i++) {

2
core/modules/migrate_drupal/src/Tests/d6/MigrateUploadBase.php
View File

@ -67,7 +67,7 @@ abstract class MigrateUploadBase extends MigrateDrupalTestBase {
array(array(1), array(1)),
array(array(2), array(2)),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
$vids = array(1, 2, 3);
for ($i = 1; $i <= 2; $i++) {
$node = entity_create('node', array(

2
core/modules/migrate_drupal/src/Tests/d6/MigrateUploadEntityDisplayTest.php
View File

@ -39,7 +39,7 @@ class MigrateUploadEntityDisplayTest extends MigrateDrupalTestBase {
array(array(1), array('node', 'page', 'upload')),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
$migration = entity_load('migration', 'd6_upload_entity_display');
$dumps = array(

2
core/modules/migrate_drupal/src/Tests/d6/MigrateUploadEntityFormDisplayTest.php
View File

@ -39,7 +39,7 @@ class MigrateUploadEntityFormDisplayTest extends MigrateDrupalTestBase {
array(array(1), array('node', 'page', 'upload')),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
$migration = entity_load('migration', 'd6_upload_entity_form_display');
$dumps = array(

2
core/modules/migrate_drupal/src/Tests/d6/MigrateUploadInstanceTest.php
View File

@ -39,7 +39,7 @@ class MigrateUploadInstanceTest extends MigrateDrupalTestBase {
array(array('story'), array('story')),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
foreach (array('page', 'story') as $type) {
entity_create('node_type', array('type' => $type))->save();

2
core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureEntityDisplayTest.php
View File

@ -35,7 +35,7 @@ class MigrateUserPictureEntityDisplayTest extends MigrateDrupalTestBase {
array(array(1), array('user', 'user', 'user_picture')),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
$migration = entity_load('migration', 'd6_user_picture_entity_display');
$executable = new MigrateExecutable($migration, $this);

2
core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureEntityFormDisplayTest.php
View File

@ -34,7 +34,7 @@ class MigrateUserPictureEntityFormDisplayTest extends MigrateDrupalTestBase {
array(array(1), array('user', 'user', 'user_picture')),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
$migration = entity_load('migration', 'd6_user_picture_entity_form_display');
$executable = new MigrateExecutable($migration, $this);

2
core/modules/migrate_drupal/src/Tests/d6/MigrateUserPictureInstanceTest.php
View File

@ -35,7 +35,7 @@ class MigrateUserPictureInstanceTest extends MigrateDrupalTestBase {
array(array('user_upload'), array('name', 'bundle')),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
entity_create('field_storage_config', array(
'entity_type' => 'user',
'name' => 'user_picture',

2
core/modules/migrate_drupal/src/Tests/d6/MigrateUserProfileFieldInstanceTest.php
View File

@ -30,7 +30,7 @@ class MigrateUserProfileFieldInstanceTest extends MigrateDrupalTestBase {
array(array(1), array('user', 'profile_color')),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
$this->createFields();
/** @var \Drupal\migrate\entity\Migration $migration */
$migration = entity_load('migration', 'd6_user_profile_field_instance');

2
core/modules/migrate_drupal/src/Tests/d6/MigrateUserRoleTest.php
View File

@ -36,7 +36,7 @@ class MigrateUserRoleTest extends MigrateDrupalTestBase {
array(array(2), array('full_html'))
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
/** @var \Drupal\migrate\entity\Migration $migration */
$migration = entity_load('migration', 'd6_user_role');

2
core/modules/migrate_drupal/src/Tests/d6/MigrateUserTest.php
View File

@ -115,7 +115,7 @@ class MigrateUserTest extends MigrateDrupalTestBase {
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
// Migrate users.
$migration = entity_load('migration', 'd6_user');

2
core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityDisplayTest.php
View File

@ -57,7 +57,7 @@ class MigrateVocabularyEntityDisplayTest extends MigrateDrupalTestBase {
array(array(4, 'page'), array('node', 'page', 'tags')),
)
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
$migration = entity_load('migration', 'd6_vocabulary_entity_display');
$dumps = array(

2
core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyEntityFormDisplayTest.php
View File

@ -57,7 +57,7 @@ class MigrateVocabularyEntityFormDisplayTest extends MigrateDrupalTestBase {
array(array(4, 'page'), array('node', 'page', 'tags')),
)
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
$migration = entity_load('migration', 'd6_vocabulary_entity_form_display');
$dumps = array(

2
core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldInstanceTest.php
View File

@ -44,7 +44,7 @@ class MigrateVocabularyFieldInstanceTest extends MigrateDrupalTestBase {
array(array(4), array('node', 'tags')),
)
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
// Create the vocab.
entity_create('taxonomy_vocabulary', array(

2
core/modules/migrate_drupal/src/Tests/d6/MigrateVocabularyFieldTest.php
View File

@ -36,7 +36,7 @@ class MigrateVocabularyFieldTest extends MigrateDrupalTestBase {
array(array(4), array('tags')),
),
);
$this->prepareIdMappings($id_mappings);
$this->prepareMigrations($id_mappings);
entity_create('taxonomy_vocabulary', array(
'name' => 'Test Vocabulary',