Issue #2987418 by quietone, Kristen Pol: Rename MigrateUpgrade tests

Nathaniel Catchpole · Nathaniel Catchpole · commit 09d46eadd82a · 2019-01-18T08:58:02.000Z
(cherry picked from commit 898083c)
diff --git a/modules/migrate_drupal_ui/tests/src/Functional/MultilingualReviewPageTestBase.php b/modules/migrate_drupal_ui/tests/src/Functional/MultilingualReviewPageTestBase.php
@@ -6,8 +6,10 @@
 
 /**
  * Provides a base class for testing the review step of the Upgrade form.
+ *
+ * When using this test class, enable translation modules.
  */
-abstract class MigrateUpgradeReviewPageTestBase extends MigrateUpgradeTestBase {
+abstract class MultilingualReviewPageTestBase extends MigrateUpgradeTestBase {
 
   use CreateTestContentEntitiesTrait;
 
diff --git a/modules/migrate_drupal_ui/tests/src/Functional/NoMultilingualReviewPageTestBase.php b/modules/migrate_drupal_ui/tests/src/Functional/NoMultilingualReviewPageTestBase.php
@@ -5,9 +5,9 @@
 /**
  * Tests the upgrade review form without translations.
  *
- * When using this test class do not enable content_translation.
+ * When using this test class, do not enable migrate_drupal_multilingual.
  */
-abstract class MigrateUpgradeI18nReviewPageTestBase extends MigrateUpgradeReviewPageTestBase {
+abstract class NoMultilingualReviewPageTestBase extends MultilingualReviewPageTestBase {
 
   /**
    * Tests the review page when content_translation is enabled.
diff --git a/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php b/modules/migrate_drupal_ui/tests/src/Functional/d6/MultilingualReviewPageTest.php
@@ -2,15 +2,17 @@
 
 namespace Drupal\Tests\migrate_drupal_ui\Functional\d6;
 
-use Drupal\Tests\migrate_drupal_ui\Functional\MigrateUpgradeReviewPageTestBase;
+use Drupal\Tests\migrate_drupal_ui\Functional\MultilingualReviewPageTestBase;
 
 /**
  * Tests migrate upgrade review page for Drupal 6.
  *
+ * Tests with translation modules and migrate_drupal_multilingual enabled.
+ *
  * @group migrate_drupal_6
  * @group migrate_drupal_ui
  */
-class MigrateUpgrade6ReviewPageTest extends MigrateUpgradeReviewPageTestBase {
+class MultilingualReviewPageTest extends MultilingualReviewPageTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php b/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualReviewPageTest.php
@@ -2,15 +2,18 @@
 
 namespace Drupal\Tests\migrate_drupal_ui\Functional\d6;
 
-use Drupal\Tests\migrate_drupal_ui\Functional\MigrateUpgradeI18nReviewPageTestBase;
+use Drupal\Tests\migrate_drupal_ui\Functional\NoMultilingualReviewPageTestBase;
 
 /**
  * Tests migrate upgrade review page for Drupal 6 without translations.
  *
+ * Tests with the translation modules and migrate_drupal_multilingual module
+ * disabled.
+ *
  * @group migrate_drupal_6
  * @group migrate_drupal_ui
  */
-class MigrateUpgrade6I18nReviewPageTest extends MigrateUpgradeI18nReviewPageTestBase {
+class NoMultilingualReviewPageTest extends NoMultilingualReviewPageTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualTest.php b/modules/migrate_drupal_ui/tests/src/Functional/d6/NoMultilingualTest.php
@@ -11,7 +11,7 @@
  *
  * @group migrate_drupal_ui
  */
-class MigrateUpgrade6NoMultilingualTest extends MigrateUpgradeExecuteTestBase {
+class NoMultilingualTest extends MigrateUpgradeExecuteTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php b/modules/migrate_drupal_ui/tests/src/Functional/d6/Upgrade6Test.php
@@ -13,7 +13,7 @@
  *
  * @group migrate_drupal_ui
  */
-class MigrateUpgrade6Test extends MigrateUpgradeExecuteTestBase {
+class Upgrade6Test extends MigrateUpgradeExecuteTestBase {
 
   /**
    * Modules to enable.
diff --git a/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php b/modules/migrate_drupal_ui/tests/src/Functional/d7/MultilingualReviewPageTest.php
@@ -2,15 +2,17 @@
 
 namespace Drupal\Tests\migrate_drupal_ui\Functional\d7;
 
-use Drupal\Tests\migrate_drupal_ui\Functional\MigrateUpgradeReviewPageTestBase;
+use Drupal\Tests\migrate_drupal_ui\Functional\MultilingualReviewPageTestBase;
 
 /**
  * Tests migrate upgrade review page for Drupal 7.
  *
+ * Tests with translation modules and migrate_drupal_multilingual enabled.
+ *
  * @group migrate_drupal_7
  * @group migrate_drupal_ui
  */
-class MigrateUpgrade7ReviewPageTest extends MigrateUpgradeReviewPageTestBase {
+class MultilingualReviewPageTest extends MultilingualReviewPageTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualTest.php b/modules/migrate_drupal_ui/tests/src/Functional/d7/NoMultilingualTest.php
@@ -11,7 +11,7 @@
  *
  * @group migrate_drupal_ui
  */
-class MigrateUpgrade7NoMultilingualTest extends MigrateUpgradeExecuteTestBase {
+class NoMultilingualTest extends MigrateUpgradeExecuteTestBase {
 
   /**
    * {@inheritdoc}
diff --git a/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php b/modules/migrate_drupal_ui/tests/src/Functional/d7/Upgrade7Test.php
@@ -13,7 +13,7 @@
  *
  * @group migrate_drupal_ui
  */
-class MigrateUpgrade7Test extends MigrateUpgradeExecuteTestBase {
+class Upgrade7Test extends MigrateUpgradeExecuteTestBase {
 
   /**
    * Modules to enable.

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`* @group migrate_drupal_ui`
`13`	`13`	`*/`
`14`		`-class MigrateUpgrade6NoMultilingualTest extends MigrateUpgradeExecuteTestBase {`
	`14`	`+class NoMultilingualTest extends MigrateUpgradeExecuteTestBase {`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* {@inheritdoc}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`* @group migrate_drupal_ui`
`15`	`15`	`*/`
`16`		`-class MigrateUpgrade6Test extends MigrateUpgradeExecuteTestBase {`
	`16`	`+class Upgrade6Test extends MigrateUpgradeExecuteTestBase {`
`17`	`17`
`18`	`18`	`/**`
`19`	`19`	`* Modules to enable.`