Commit 0e1fe4c2 authored by alexpott's avatar alexpott
Browse files

Issue #2413759 by benjy, hosef: Move D6 dumps to avoid collisions with D7 dumps

parent 370e15e6
......@@ -10,14 +10,14 @@
* @see https://www.drupal.org/sandbox/benjy/2405029
*/
namespace Drupal\migrate_drupal\Tests\Table;
namespace Drupal\migrate_drupal\Tests\Table\d6;
use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
/**
* Generated file to represent the users_roles table.
*/
class UsersRoles extends Drupal6DumpBase {
class UsersRoles extends DrupalDumpBase {
public function load() {
$this->createTable("users_roles", array(
......
......@@ -10,14 +10,14 @@
* @see https://www.drupal.org/sandbox/benjy/2405029
*/
namespace Drupal\migrate_drupal\Tests\Table;
namespace Drupal\migrate_drupal\Tests\Table\d6;
use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
/**
* Generated file to represent the variable table.
*/
class Variable extends Drupal6DumpBase {
class Variable extends DrupalDumpBase {
public function load() {
$this->createTable("variable", array(
......
......@@ -10,14 +10,14 @@
* @see https://www.drupal.org/sandbox/benjy/2405029
*/
namespace Drupal\migrate_drupal\Tests\Table;
namespace Drupal\migrate_drupal\Tests\Table\d6;
use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
/**
* Generated file to represent the vocabulary table.
*/
class Vocabulary extends Drupal6DumpBase {
class Vocabulary extends DrupalDumpBase {
public function load() {
$this->createTable("vocabulary", array(
......
......@@ -10,14 +10,14 @@
* @see https://www.drupal.org/sandbox/benjy/2405029
*/
namespace Drupal\migrate_drupal\Tests\Table;
namespace Drupal\migrate_drupal\Tests\Table\d6;
use Drupal\migrate_drupal\Tests\Dump\Drupal6DumpBase;
use Drupal\migrate_drupal\Tests\Dump\DrupalDumpBase;
/**
* Generated file to represent the vocabulary_node_types table.
*/
class VocabularyNodeTypes extends Drupal6DumpBase {
class VocabularyNodeTypes extends DrupalDumpBase {
public function load() {
$this->createTable("vocabulary_node_types", array(
......
......@@ -9,14 +9,14 @@
use Drupal\config\Tests\SchemaCheckTestTrait;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/**
* Upgrade variables to action.settings.yml.
*
* @group migrate_drupal
*/
class MigrateActionConfigsTest extends MigrateDrupalTestBase {
class MigrateActionConfigsTest extends MigrateDrupal6TestBase {
use SchemaCheckTestTrait;
......
......@@ -9,14 +9,14 @@
use Drupal\config\Tests\SchemaCheckTestTrait;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/**
* Upgrade variables to aggregator.settings.yml.
*
* @group migrate_drupal
*/
class MigrateAggregatorConfigsTest extends MigrateDrupalTestBase {
class MigrateAggregatorConfigsTest extends MigrateDrupal6TestBase {
use SchemaCheckTestTrait;
......
......@@ -9,14 +9,14 @@
use Drupal\aggregator\Entity\Feed;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/**
* Upgrade variables to aggregator_feed entities.
*
* @group migrate_drupal
*/
class MigrateAggregatorFeedTest extends MigrateDrupalTestBase {
class MigrateAggregatorFeedTest extends MigrateDrupal6TestBase {
static $modules = array('aggregator');
......
......@@ -10,14 +10,14 @@
use Drupal\aggregator\Entity\Item;
use Drupal\Core\Language\LanguageInterface;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/**
* Upgrade aggregator items.
*
* @group migrate_drupal
*/
class MigrateAggregatorItemTest extends MigrateDrupalTestBase {
class MigrateAggregatorItemTest extends MigrateDrupal6TestBase {
static $modules = array('aggregator');
......
......@@ -12,14 +12,14 @@
use Drupal\Core\Language\LanguageInterface;
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/**
* Upgrade custom blocks.
*
* @group migrate_drupal
*/
class MigrateBlockContentTest extends MigrateDrupalTestBase {
class MigrateBlockContentTest extends MigrateDrupal6TestBase {
static $modules = array('block', 'block_content');
......
......@@ -8,7 +8,7 @@
namespace Drupal\migrate_drupal\Tests\d6;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
use Drupal\block\Entity\Block;
/**
......@@ -16,7 +16,7 @@
*
* @group migrate_drupal
*/
class MigrateBlockTest extends MigrateDrupalTestBase {
class MigrateBlockTest extends MigrateDrupal6TestBase {
/**
* Modules to enable.
......
......@@ -10,14 +10,14 @@
use Drupal\config\Tests\SchemaCheckTestTrait;
use Drupal\migrate\MigrateMessage;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/**
* Upgrade variables to book.settings.yml.
*
* @group migrate_drupal
*/
class MigrateBookConfigsTest extends MigrateDrupalTestBase {
class MigrateBookConfigsTest extends MigrateDrupal6TestBase {
use SchemaCheckTestTrait;
......
......@@ -8,7 +8,7 @@
namespace Drupal\migrate_drupal\Tests\d6;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
use Drupal\node\Entity\Node;
/**
......@@ -16,7 +16,7 @@
*
* @group migrate_drupal
*/
class MigrateBookTest extends MigrateDrupalTestBase {
class MigrateBookTest extends MigrateDrupal6TestBase {
public static $modules = array('book');
......
......@@ -11,14 +11,14 @@
use Drupal\comment\Tests\CommentTestTrait;
use Drupal\Core\Language\LanguageInterface;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/**
* Upgrade comments.
*
* @group migrate_drupal
*/
class MigrateCommentTest extends MigrateDrupalTestBase {
class MigrateCommentTest extends MigrateDrupal6TestBase {
use CommentTestTrait;
......
......@@ -8,14 +8,14 @@
namespace Drupal\migrate_drupal\Tests\d6;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/**
* Upgrade comment type.
*
* @group migrate_drupal
*/
class MigrateCommentTypeTest extends MigrateDrupalTestBase {
class MigrateCommentTypeTest extends MigrateDrupal6TestBase {
static $modules = array('node', 'comment');
......
......@@ -8,12 +8,12 @@
namespace Drupal\migrate_drupal\Tests\d6;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/**
* Base class for Drupal 6 comment variables to Drupal 8 entity display tests.
*/
abstract class MigrateCommentVariableDisplayBase extends MigrateDrupalTestBase {
abstract class MigrateCommentVariableDisplayBase extends MigrateDrupal6TestBase {
/**
* The ID of migration to run.
......
......@@ -8,14 +8,14 @@
namespace Drupal\migrate_drupal\Tests\d6;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/**
* Upgrade comment subject variable to core.entity_form_display.comment.*.default.yml
*
* @group migrate_drupal
*/
class MigrateCommentVariableEntityFormDisplaySubjectTest extends MigrateDrupalTestBase {
class MigrateCommentVariableEntityFormDisplaySubjectTest extends MigrateDrupal6TestBase {
/**
* Modules to enable.
......
......@@ -9,14 +9,14 @@
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/**
* Upgrade comment variables to field.storage.node.comment.yml.
*
* @group migrate_drupal
*/
class MigrateCommentVariableFieldTest extends MigrateDrupalTestBase {
class MigrateCommentVariableFieldTest extends MigrateDrupal6TestBase {
static $modules = array('comment', 'node');
......
......@@ -8,14 +8,14 @@
namespace Drupal\migrate_drupal\Tests\d6;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/**
* Upgrade comment variables to field.instance.node.*.comment.yml.
*
* @group migrate_drupal
*/
class MigrateCommentVariableInstanceTest extends MigrateDrupalTestBase {
class MigrateCommentVariableInstanceTest extends MigrateDrupal6TestBase {
static $modules = array('comment', 'node');
......
......@@ -10,14 +10,14 @@
use Drupal\contact\Entity\ContactForm;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate\MigrateMessage;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/**
* Migrate contact categories to contact.form.*.yml.
*
* @group migrate_drupal
*/
class MigrateContactCategoryTest extends MigrateDrupalTestBase {
class MigrateContactCategoryTest extends MigrateDrupal6TestBase {
/**
* Modules to enable.
......
......@@ -10,14 +10,14 @@
use Drupal\config\Tests\SchemaCheckTestTrait;
use Drupal\migrate\MigrateMessage;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/**
* Upgrade variables to contact.settings.yml.
*
* @group migrate_drupal
*/
class MigrateContactConfigsTest extends MigrateDrupalTestBase {
class MigrateContactConfigsTest extends MigrateDrupal6TestBase {
use SchemaCheckTestTrait;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment