Issue #2554321 by phenaproxima, mikeryan, quietone, neclimdul, benjy: Clean up Migrate's test suite

core/modules/action/src/Tests/Migrate/d6/MigrateActionConfigsTest.php

@@ -20,11 +20,9 @@ class MigrateActionConfigsTest extends MigrateDrupal6TestBase {
   use SchemaCheckTestTrait;
 
   /**
-   * Modules to enable.
-   *
-   * @var array
+   * {@inheritdoc}
    */
-  public static $modules = array('action');
+  public static $modules = ['action'];
 
   /**
    * {@inheritdoc}

core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorConfigsTest.php

@@ -20,11 +20,9 @@ class MigrateAggregatorConfigsTest extends MigrateDrupal6TestBase {
   use SchemaCheckTestTrait;
 
   /**
-   * Modules to enable.
-   *
-   * @var array
+   * {@inheritdoc}
    */
-  public static $modules = array('aggregator');
+  public static $modules = ['aggregator'];
 
   /**
    * {@inheritdoc}

core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorFeedTest.php

@@ -17,7 +17,10 @@
  */
 class MigrateAggregatorFeedTest extends MigrateDrupal6TestBase {
 
-  static $modules = array('aggregator');
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['aggregator'];
 
   /**
    * {@inheritdoc}

core/modules/aggregator/src/Tests/Migrate/d6/MigrateAggregatorItemTest.php

@@ -17,7 +17,10 @@
  */
 class MigrateAggregatorItemTest extends MigrateDrupal6TestBase {
 
-  static $modules = array('aggregator');
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['aggregator'];
 
   /**
    * {@inheritdoc}
@@ -26,26 +29,7 @@ protected function setUp() {
     parent::setUp();
     $this->installEntitySchema('aggregator_feed');
     $this->installEntitySchema('aggregator_item');
-
-    // Add some id mappings for the dependant migrations.
-    $id_mappings = array(
-      'd6_aggregator_feed' => array(
-        array(array(5), array(5)),
-      ),
-    );
-    $this->prepareMigrations($id_mappings);
-
-    $entity = entity_create('aggregator_feed', array(
-      'fid' => 5,
-      'title' => 'Drupal Core',
-      'url' => 'https://groups.drupal.org/not_used/167169',
-      'refresh' => 900,
-      'checked' => 1389919932,
-      'description' => 'Drupal Core Group feed',
-    ));
-    $entity->enforceIsNew();
-    $entity->save();
-    $this->executeMigration('d6_aggregator_item');
+    $this->executeMigrations(['d6_aggregator_feed', 'd6_aggregator_item']);
   }
 
   /**

core/modules/block/src/Tests/Migrate/d6/MigrateBlockTest.php

@@ -18,50 +18,24 @@
 class MigrateBlockTest extends MigrateDrupal6TestBase {
 
   /**
-   * Modules to enable.
-   *
-   * @var array
+   * {@inheritdoc}
    */
-  static $modules = array(
+  public static $modules = [
     'block',
     'views',
     'comment',
     'menu_ui',
     'block_content',
-    'node',
-  );
+  ];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
+    $this->installConfig(['block_content']);
     $this->installEntitySchema('block_content');
 
-    $entities = array(
-      entity_create('menu', array('id' => 'primary-links')),
-      entity_create('menu', array('id' => 'secondary-links')),
-      entity_create('block_content', array('id' => 1, 'type' => 'basic', 'info' => $this->randomMachineName(8))),
-      entity_create('block_content', array('id' => 2, 'type' => 'basic', 'info' => $this->randomMachineName(8))),
-    );
-    foreach ($entities as $entity) {
-      $entity->enforceIsNew(TRUE);
-      $entity->save();
-    }
-    $this->prepareMigrations(array(
-      'd6_custom_block' => array(
-        array(array(1), array(1)),
-        array(array(2), array(2)),
-      ),
-      'menu' => array(
-        array(array('menu1'), array('menu')),
-      ),
-      'd6_user_role' => array(
-        array(array(2), array('authenticated')),
-        array(array(3), array('migrate_test_role_1')),
-      ),
-    ));
-
     // Set Bartik and Seven as the default public and admin theme.
     $config = $this->config('system.theme');
     $config->set('default', 'bartik');
@@ -69,9 +43,17 @@ protected function setUp() {
     $config->save();
 
     // Install one of D8's test themes.
-    \Drupal::service('theme_handler')->install(array('test_theme'));
-
-    $this->executeMigration('d6_block');
+    \Drupal::service('theme_handler')->install(['test_theme']);
+
+    $this->executeMigrations([
+      'd6_filter_format',
+      'block_content_type',
+      'block_content_body_field',
+      'd6_custom_block',
+      'menu',
+      'd6_user_role',
+      'd6_block',
+    ]);
   }
 
   /**

core/modules/block/src/Tests/Migrate/d7/MigrateBlockTest.php

@@ -18,10 +18,8 @@
  */
 class MigrateBlockTest extends MigrateDrupal7TestBase {
 
-  /**
-   * Modules to enable.
-   *
-   * @var array
+ /**
+   * {@inheritdoc}
    */
   static $modules = [
     'block',
@@ -52,12 +50,14 @@ protected function setUp() {
     // Install one of D8's test themes.
     \Drupal::service('theme_handler')->install(['bartik']);
 
-    $this->executeMigration('d7_filter_format');
-    $this->executeMigration('d7_user_role');
-    $this->executeMigration('block_content_type');
-    $this->executeMigration('block_content_body_field');
-    $this->executeMigration('d7_custom_block');
-    $this->executeMigration('d7_block');
+    $this->executeMigrations([
+      'd7_filter_format',
+      'd7_user_role',
+      'block_content_type',
+      'block_content_body_field',
+      'd7_custom_block',
+      'd7_block',
+    ]);
   }
 
   /**

core/modules/block_content/src/Tests/Migrate/MigrateBlockContentBodyFieldTest.php

@@ -29,8 +29,10 @@ protected function setUp() {
     parent::setUp();
     $this->installConfig(['block_content']);
     $this->installEntitySchema('block_content');
-    $this->executeMigration('block_content_type');
-    $this->executeMigration('block_content_body_field');
+    $this->executeMigrations([
+      'block_content_type',
+      'block_content_body_field',
+    ]);
   }
 
   /**

core/modules/block_content/src/Tests/Migrate/d6/MigrateBlockContentTest.php

@@ -17,25 +17,25 @@
  */
 class MigrateBlockContentTest extends MigrateDrupal6TestBase {
 
-  static $modules = array('block', 'block_content', 'filter', 'text');
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['block', 'block_content'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    $this->installConfig(array('block_content'));
+    $this->installConfig(['block_content']);
     $this->installEntitySchema('block_content');
 
-    $this->executeMigration('block_content_type');
-    $this->executeMigration('block_content_body_field');
-
-    $this->prepareMigrations(array(
-      'd6_filter_format' => array(
-        array(array(2), array('full_html'))
-      )
-    ));
-    $this->executeMigration('d6_custom_block');
+    $this->executeMigrations([
+      'd6_filter_format',
+      'block_content_type',
+      'block_content_body_field',
+      'd6_custom_block',
+    ]);
   }
 
   /**

core/modules/block_content/src/Tests/Migrate/d7/MigrateCustomBlockTest.php

@@ -32,10 +32,12 @@ protected function setUp() {
     $this->installConfig(static::$modules);
     $this->installEntitySchema('block_content');
 
-    $this->executeMigration('d7_filter_format');
-    $this->executeMigration('block_content_type');
-    $this->executeMigration('block_content_body_field');
-    $this->executeMigration('d7_custom_block');
+    $this->executeMigrations([
+      'd7_filter_format',
+      'block_content_type',
+      'block_content_body_field',
+      'd7_custom_block',
+    ]);
   }
 
   /**

core/modules/book/src/Tests/Migrate/d6/MigrateBookConfigsTest.php

@@ -20,11 +20,9 @@ class MigrateBookConfigsTest extends MigrateDrupal6TestBase {
   use SchemaCheckTestTrait;
 
   /**
-   * Modules to enable.
-   *
-   * @var array
+   * {@inheritdoc}
    */
-  public static $modules = array('book', 'system', 'node', 'field', 'text', 'entity_reference');
+  public static $modules = ['book'];
 
   /**
    * {@inheritdoc}

core/modules/book/src/Tests/Migrate/d6/MigrateBookTest.php

@@ -17,39 +17,19 @@
  */
 class MigrateBookTest extends MigrateDrupal6TestBase {
 
-  public static $modules = array('book', 'system', 'node', 'field', 'text', 'entity_reference', 'user');
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['book'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-
-    $this->installEntitySchema('node');
-    $this->installSchema('book', array('book'));
-    $this->installSchema('node', array('node_access'));
-
-    // Create a default bogus mapping for all variants of d6_node.
-    $id_mappings = array(
-      'd6_node:*' => array(
-        array(
-          array(0),
-          array(0),
-        ),
-      ),
-    );
-    for ($i = 4; $i <= 8; $i++) {
-      $entity = entity_create('node', array(
-        'type' => 'story',
-        'title' => "Node $i",
-        'nid' => $i,
-        'status' => TRUE,
-      ));
-      $entity->enforceIsNew();
-      $entity->save();
-      $id_mappings['d6_node__story'][] = array(array($i), array($i));
-    }
-    $this->prepareMigrations($id_mappings);
+    $this->installSchema('book', ['book']);
+    $this->installSchema('node', ['node_access']);
+    $this->migrateContent();
     $this->executeMigration('d6_book');
   }
 

core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTest.php

@@ -19,10 +19,16 @@ class MigrateCommentTest extends MigrateDrupal6TestBase {
 
   use CommentTestTrait;
 
-  // Directly testing that comments' entity_id is populated upon importing is
-  // not straightforward, but RDF module serves as an implicit test -
-  // its hook_comment_storage_load() references a stubbed comment.
-  static $modules = ['node', 'comment', 'text', 'filter', 'rdf'];
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = [
+    'comment',
+    // Directly testing that a stub comment's entity_id is populated upon
+    // importing is not straightforward, but RDF module serves as an implicit
+    // test - its hook_comment_storage_load() references a stubbed comment.
+    'rdf',
+  ];
 
   /**
    * {@inheritdoc}
@@ -34,38 +40,20 @@ protected function setUp() {
     $this->installEntitySchema('comment');
     $this->installSchema('comment', ['comment_entity_statistics']);
     $this->installSchema('system', ['router']);
-    $this->installConfig(['node', 'comment']);
+    $this->installConfig(['comment']);
 
     // The entity.node.canonical route must exist when the RDF hook is called.
     $this->container->get('router.builder')->rebuild();
 
-    entity_create('node_type', array('type' => 'page'))->save();
-    entity_create('node_type', array('type' => 'story'))->save();
-    $this->addDefaultCommentField('node', 'story');
-    $this->container->get('entity.manager')->getStorage('comment_type')->create(array(
-      'id' => 'comment_no_subject',
-      'label' => 'comment_no_subject',
-      'target_entity_type_id' => 'node',
-    ))->save();
-    \Drupal::service('comment.manager')->addBodyField('comment_no_subject');
-
-    $node = entity_create('node', array(
-      'type' => 'story',
-      'nid' => 1,
-      'title' => $this->randomString(),
-    ));
-    $node->enforceIsNew();
-    $node->save();
-    $id_mappings = array(
-      'd6_filter_format' => array(array(array(1), array('filtered_html'))),
-      'd6_node:*' => array(array(array(1), array(1))),
-      'd6_user' => array(array(array(0), array(0))),
-      'd6_comment_type' => array(array(array('comment'), array('comment_no_subject'))),
-      '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->prepareMigrations($id_mappings);
-    $this->executeMigration('d6_comment');
+    $this->migrateContent();
+    $this->executeMigrations([
+      'd6_comment_type',
+      'd6_comment_field',
+      'd6_comment_field_instance',
+      'd6_comment_entity_display',
+      'd6_comment_entity_form_display',
+      'd6_comment',
+    ]);
   }
 
   /**

core/modules/comment/src/Tests/Migrate/d6/MigrateCommentTypeTest.php

@@ -17,7 +17,10 @@
  */
 class MigrateCommentTypeTest extends MigrateDrupal6TestBase {
 
-  static $modules = array('node', 'comment', 'text', 'filter');
+  /**
+   * {@inheritdoc}
+   */
+  public static $modules = ['comment'];
 
   /**
    * {@inheritdoc}

core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableDisplayBase.php

@@ -15,57 +15,22 @@
 abstract class MigrateCommentVariableDisplayBase extends MigrateDrupal6TestBase {
 
   /**
-   * The ID of migration to run.
-   *
-   * This constant needs to be set in the concrete class in order for the test
-   * to work.
-   */
-  const MIGRATION = '';
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  static $modules = array('comment', 'node');
-
-  /**
-   * The node types being tested.
-   *
-   * @var array
+   * {@inheritdoc}
    */
-  protected $types = array('page', 'story', 'article');
+  public static $modules = ['comment'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    entity_create('field_storage_config', array(
-      'entity_type' => 'node',
-      'field_name' => 'comment',
-      'type' => 'comment',
-      'translatable' => '0',
-    ))->save();
-    foreach ($this->types as $type) {
-      entity_create('node_type', array('type' => $type))->save();
-      entity_create('field_config', array(
-        'label' => 'Comments',
-        'description' => '',
-        'field_name' => 'comment',
-        'entity_type' => 'node',
-        'bundle' => $type,
-        'required' => 1,
-      ))->save();
-    }
-    $id_mappings = array(
-      'd6_comment_field_instance' => array(
-        array(array('page'), array('node', 'comment', 'page')),
-      ),
-    );
-    $this->prepareMigrations($id_mappings);
-    $this->executeMigration(static::MIGRATION);
-
+    $this->installConfig(['comment']);
+    $this->migrateContentTypes();
+    $this->executeMigrations([
+      'd6_comment_type',
+      'd6_comment_field',
+      'd6_comment_field_instance',
+    ]);
   }
 
 }

core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityDisplayTest.php

@@ -7,6 +7,8 @@
 
 namespace Drupal\comment\Tests\Migrate\d6;
 
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+
 /**
  * Upgrade comment variables to entity.display.node.*.default.yml.
  *
@@ -15,21 +17,19 @@
 class MigrateCommentVariableEntityDisplayTest extends MigrateCommentVariableDisplayBase {
 
   /**
-   * The migration to run.
+   * {@inheritdoc}
    */
-  const MIGRATION = 'd6_comment_entity_display';
-
-  /**
-   * The node types being used.
-   */
-  protected $types = array('page', 'story', 'article');
+  protected function setUp() {
+    parent::setUp();
+    $this->executeMigration('d6_comment_entity_display');
+  }
 
   /**
    * Tests comment variables migrated into an entity display.
    */
   public function testCommentEntityDisplay() {
-    foreach ($this->types as $type) {
-      $component = entity_get_display('node', $type, 'default')->getComponent('comment');
+    foreach (['page', 'story', 'article'] as $type) {
+      $component = EntityViewDisplay::load('node.' . $type . '.default')->getComponent('comment');
       $this->assertIdentical('hidden', $component['label']);
       $this->assertIdentical('comment_default', $component['type']);
       $this->assertIdentical(20, $component['weight']);

core/modules/comment/src/Tests/Migrate/d6/MigrateCommentVariableEntityFormDisplaySubjectTest.php

@@ -7,6 +7,7 @@
 
 namespace Drupal\comment\Tests\Migrate\d6;
 
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
 use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
 
 /**
@@ -17,43 +18,31 @@
 class MigrateCommentVariableEntityFormDisplaySubjectTest extends MigrateDrupal6TestBase {
 
   /**
-   * Modules to enable.
-   *
-   * @var array
+   * {@inheritdoc}
    */
-  public static $modules = array('comment', 'node');
+  public static $modules = ['comment'];
 
   /**
    * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
-    foreach (['comment', 'comment_no_subject'] as $comment_type) {
-      entity_create('comment_type', array(
-        'id' => $comment_type,
-        'target_entity_type_id' => 'node',
-      ))
-        ->save();
-    }
-    // Add some id mappings for the dependant migrations.
-    $id_mappings = array(
-      'd6_comment_type' => array(
-        array(array('comment'), array('comment_no_subject')),
-      ),
-    );
-    $this->prepareMigrations($id_mappings);
-    $this->executeMigration('d6_comment_entity_form_display_subject');
+    $this->installConfig(['comment']);
+    $this->executeMigrations([
+      'd6_comment_type',
+      'd6_comment_entity_form_display_subject',
+    ]);
   }