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
......@@ -5,7 +5,7 @@
use Drupal\Core\Datetime\DrupalDateTime;
use Drupal\migrate\MigrateMessage;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
use Drupal\Core\Database\Database;
/**
......@@ -13,7 +13,7 @@
*
* @group migrate_drupal
*/
class MigrateDateFormatTest extends MigrateDrupalTestBase {
class MigrateDateFormatTest extends MigrateDrupal6TestBase {
/**
* {@inheritdoc}
......
......@@ -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 dblog.settings.yml.
*
* @group migrate_drupal
*/
class MigrateDblogConfigsTest extends MigrateDrupalTestBase {
class MigrateDblogConfigsTest extends MigrateDrupal6TestBase {
use SchemaCheckTestTrait;
......
......@@ -306,4 +306,14 @@ protected function getTestClassesList() {
return $classes;
}
/**
* Returns the path to the dump directory.
*
* @return string
* A string that represents the dump directory path.
*/
protected function getDumpDirectory() {
return dirname(__DIR__) . '/Table/d6';
}
}
<?php
/**
* @file
* Contains \Drupal\migrate_drupal\Tests\MigrateDrupal6TestBase.
*/
namespace Drupal\migrate_drupal\Tests\d6;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
/**
* Base class for Drupal 6 migration tests.
*/
abstract class MigrateDrupal6TestBase extends MigrateDrupalTestBase {
/**
* {@inheritdoc}
*/
protected function getDumpDirectory() {
return parent::getDumpDirectory() . '/d6';
}
}
......@@ -9,14 +9,14 @@
use Drupal\Core\Entity\Entity\EntityViewMode;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/**
* Upgrade field formatter settings to entity.display.*.*.yml.
*
* @group migrate_drupal
*/
class MigrateFieldFormatterSettingsTest extends MigrateDrupalTestBase {
class MigrateFieldFormatterSettingsTest extends MigrateDrupal6TestBase {
/**
* Modules to enable.
......
......@@ -9,7 +9,7 @@
use Drupal\field\Entity\FieldConfig;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
use Drupal\link\LinkItemInterface;
/**
......@@ -17,7 +17,7 @@
*
* @group migrate_drupal
*/
class MigrateFieldInstanceTest extends MigrateDrupalTestBase {
class MigrateFieldInstanceTest 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;
/**
* Migrate fields.
*
* @group migrate_drupal
*/
class MigrateFieldTest extends MigrateDrupalTestBase {
class MigrateFieldTest extends MigrateDrupal6TestBase {
/**
* Modules to enable.
......
......@@ -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;
/**
* Migrate field widget settings.
*
* @group migrate_drupal
*/
class MigrateFieldWidgetSettingsTest extends MigrateDrupalTestBase {
class MigrateFieldWidgetSettingsTest 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 file.settings.yml.
*
* @group migrate_drupal
*/
class MigrateFileConfigsTest extends MigrateDrupalTestBase {
class MigrateFileConfigsTest 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\Core\Database\Database;
/**
......@@ -16,7 +16,7 @@
*
* @group migrate_drupal
*/
class MigrateFileTest extends MigrateDrupalTestBase {
class MigrateFileTest extends MigrateDrupal6TestBase {
/**
* Modules to enable.
......
......@@ -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 variables to filter.formats.*.yml.
*
* @group migrate_drupal
*/
class MigrateFilterFormatTest extends MigrateDrupalTestBase {
class MigrateFilterFormatTest extends MigrateDrupal6TestBase {
/**
* {@inheritdoc}
......
......@@ -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 forum.settings.yml.
*
* @group migrate_drupal
*/
class MigrateForumConfigsTest extends MigrateDrupalTestBase {
class MigrateForumConfigsTest 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 locale.settings.yml.
*
* @group migrate_drupal
*/
class MigrateLocaleConfigsTest extends MigrateDrupalTestBase {
class MigrateLocaleConfigsTest 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 menu_ui.settings.yml.
*
* @group migrate_drupal
*/
class MigrateMenuConfigsTest extends MigrateDrupalTestBase {
class MigrateMenuConfigsTest extends MigrateDrupal6TestBase {
use SchemaCheckTestTrait;
......
......@@ -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;
/**
* Menu link migration.
*
* @group migrate_drupal
*/
class MigrateMenuLinkTest extends MigrateDrupalTestBase {
class MigrateMenuLinkTest extends MigrateDrupal6TestBase {
/**
* Modules to enable.
......
......@@ -9,7 +9,7 @@
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate\MigrateMessage;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
use Drupal\Core\Database\Database;
use Drupal\system\Entity\Menu;
......@@ -18,7 +18,7 @@
*
* @group migrate_drupal
*/
class MigrateMenuTest extends MigrateDrupalTestBase {
class MigrateMenuTest extends MigrateDrupal6TestBase {
/**
* {@inheritdoc}
......
......@@ -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;
/**
* Test migrating node settings into the base_field_bundle_override config entity.
*
* @group migrate_drupal
*/
class MigrateNodeBundleSettingsTest extends MigrateDrupalTestBase {
class MigrateNodeBundleSettingsTest 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 node.settings.yml.
*
* @group migrate_drupal
*/
class MigrateNodeConfigsTest extends MigrateDrupalTestBase {
class MigrateNodeConfigsTest extends MigrateDrupal6TestBase {
use SchemaCheckTestTrait;
......
......@@ -7,13 +7,13 @@
namespace Drupal\migrate_drupal\Tests\d6;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
use Drupal\migrate\Entity\MigrationInterface;
/**
* Base class for Node migration tests.
*/
abstract class MigrateNodeTestBase extends MigrateDrupalTestBase {
abstract class MigrateNodeTestBase extends MigrateDrupal6TestBase {
static $modules = array('node');
......
......@@ -9,14 +9,14 @@
use Drupal\field\Entity\FieldConfig;
use Drupal\migrate\MigrateExecutable;
use Drupal\migrate_drupal\Tests\MigrateDrupalTestBase;
use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase;
/**
* Upgrade node types to node.type.*.yml.
*
* @group migrate_drupal
*/
class MigrateNodeTypeTest extends MigrateDrupalTestBase {
class MigrateNodeTypeTest extends MigrateDrupal6TestBase {
/**
* Modules to enable.
......
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