diff --git a/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml b/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml index 0bab8e3..b8b258e 100644 --- a/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml +++ b/core/modules/migrate_drupal/config/schema/migrate_drupal.source.schema.yml @@ -146,21 +146,6 @@ migrate.source.d6_comment_variable: type: migrate_entity_constant label: 'Constants' -migrate.source.d6_view_mode: - type: migrate_source_sql - label: 'Drupal 6 view mode' - mapping: - constants: - type: mapping - label: 'Constants' - mapping: - targetEntityType: - type: string - label: 'Target entity type' - status: - type: boolean - label: 'Status' - migrate.source.d6_profile_field: type: migrate_source_sql label: 'Drupal 6 profile field' @@ -177,34 +162,6 @@ migrate.source.d6_field_formatter_settings: type: migrate_entity_constant label: 'Constants' -migrate.source.d6_node_type: - type: migrate_source_sql - label: 'Drupal 6 node type' - mapping: - constants: - type: migrate_entity_constant - label: 'Constants' - -migrate.source.d6_node: - type: migrate_source_sql - label: 'Drupal 6 node' - mapping: - node_type: - # The node type can be specified both as a string ID of a node type or an - # array of node type IDs, so there is no way to consistently parse this. - type: ignore - label: 'Node type' - -migrate.source.d6_node_revision: - type: migrate_source_sql - label: 'Drupal 6 node' - mapping: - node_type: - # The node type can be specified both as a string ID of a node type or an - # array of node type IDs, so there is no way to consistently parse this. - type: ignore - label: 'Node type' - migrate.source.d6_upload_instance: type: migrate_source_sql label: 'Drupal 6 upload form display' diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php index a0cf124..b3dd8a0 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php +++ b/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/FieldInstancePerViewMode.php @@ -7,6 +7,8 @@ namespace Drupal\migrate_drupal\Plugin\migrate\source\d6; +use Drupal\node\Plugin\migrate\source\d6\ViewModeBase; + /** * The field instance per view mode source class. * diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php index 11b08ef..9ac6d26 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldRevisionTest.php @@ -8,6 +8,7 @@ namespace Drupal\migrate_drupal\Tests\d6; use Drupal\migrate\MigrateExecutable; +use Drupal\node\Tests\Migrate\d6\MigrateNodeTestBase; /** * CCK field revision migration. diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php index 20befed..02e5460 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateCckFieldValuesTest.php @@ -9,6 +9,7 @@ use Drupal\migrate\MigrateExecutable; use Drupal\node\Entity\Node; +use Drupal\node\Tests\Migrate\d6\MigrateNodeTestBase; /** * CCK field content migration. diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserRoleTest.php b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserRoleTest.php index 62e7d94..ebd2b6b 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateUserRoleTest.php +++ b/core/modules/migrate_drupal/src/Tests/d6/MigrateUserRoleTest.php @@ -21,7 +21,7 @@ class MigrateUserRoleTest extends MigrateDrupal6TestBase { * * @var array */ - static $modules = array('filter'); + static $modules = array('filter', 'node'); /** * {@inheritdoc} diff --git a/core/modules/node/config/schema/node.source.schema.yml b/core/modules/node/config/schema/node.source.schema.yml new file mode 100644 index 0000000..a9d88e8 --- /dev/null +++ b/core/modules/node/config/schema/node.source.schema.yml @@ -0,0 +1,42 @@ +migrate.source.d6_view_mode: + type: migrate_source_sql + label: 'Drupal 6 view mode' + mapping: + constants: + type: mapping + label: 'Constants' + mapping: + targetEntityType: + type: string + label: 'Target entity type' + status: + type: boolean + label: 'Status' + +migrate.source.d6_node_type: + type: migrate_source_sql + label: 'Drupal 6 node type' + mapping: + constants: + type: migrate_entity_constant + label: 'Constants' + +migrate.source.d6_node: + type: migrate_source_sql + label: 'Drupal 6 node' + mapping: + node_type: + # The node type can be specified both as a string ID of a node type or an + # array of node type IDs, so there is no way to consistently parse this. + type: ignore + label: 'Node type' + +migrate.source.d6_node_revision: + type: migrate_source_sql + label: 'Drupal 6 node' + mapping: + node_type: + # The node type can be specified both as a string ID of a node type or an + # array of node type IDs, so there is no way to consistently parse this. + type: ignore + label: 'Node type' diff --git a/core/modules/migrate_drupal/migration_templates/d6_node.yml b/core/modules/node/migration_templates/d6_node.yml similarity index 100% rename from core/modules/migrate_drupal/migration_templates/d6_node.yml rename to core/modules/node/migration_templates/d6_node.yml diff --git a/core/modules/migrate_drupal/migration_templates/d6_node_revision.yml b/core/modules/node/migration_templates/d6_node_revision.yml similarity index 100% rename from core/modules/migrate_drupal/migration_templates/d6_node_revision.yml rename to core/modules/node/migration_templates/d6_node_revision.yml diff --git a/core/modules/migrate_drupal/migration_templates/d6_node_setting_promote.yml b/core/modules/node/migration_templates/d6_node_setting_promote.yml similarity index 100% rename from core/modules/migrate_drupal/migration_templates/d6_node_setting_promote.yml rename to core/modules/node/migration_templates/d6_node_setting_promote.yml diff --git a/core/modules/migrate_drupal/migration_templates/d6_node_setting_status.yml b/core/modules/node/migration_templates/d6_node_setting_status.yml similarity index 100% rename from core/modules/migrate_drupal/migration_templates/d6_node_setting_status.yml rename to core/modules/node/migration_templates/d6_node_setting_status.yml diff --git a/core/modules/migrate_drupal/migration_templates/d6_node_setting_sticky.yml b/core/modules/node/migration_templates/d6_node_setting_sticky.yml similarity index 100% rename from core/modules/migrate_drupal/migration_templates/d6_node_setting_sticky.yml rename to core/modules/node/migration_templates/d6_node_setting_sticky.yml diff --git a/core/modules/migrate_drupal/migration_templates/d6_node_settings.yml b/core/modules/node/migration_templates/d6_node_settings.yml similarity index 100% rename from core/modules/migrate_drupal/migration_templates/d6_node_settings.yml rename to core/modules/node/migration_templates/d6_node_settings.yml diff --git a/core/modules/migrate_drupal/migration_templates/d6_node_type.yml b/core/modules/node/migration_templates/d6_node_type.yml similarity index 100% rename from core/modules/migrate_drupal/migration_templates/d6_node_type.yml rename to core/modules/node/migration_templates/d6_node_type.yml diff --git a/core/modules/migrate_drupal/migration_templates/d6_view_modes.yml b/core/modules/node/migration_templates/d6_view_modes.yml similarity index 100% rename from core/modules/migrate_drupal/migration_templates/d6_view_modes.yml rename to core/modules/node/migration_templates/d6_view_modes.yml diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/NodeUpdate7008.php b/core/modules/node/src/Plugin/migrate/process/d6/NodeUpdate7008.php similarity index 83% rename from core/modules/migrate_drupal/src/Plugin/migrate/process/d6/NodeUpdate7008.php rename to core/modules/node/src/Plugin/migrate/process/d6/NodeUpdate7008.php index 50917d1..af7dd4e 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/process/d6/NodeUpdate7008.php +++ b/core/modules/node/src/Plugin/migrate/process/d6/NodeUpdate7008.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\migrate_drupal\Plugin\migrate\process\d6\NodeUpdate7008. + * Contains \Drupal\node\Plugin\migrate\process\d6\NodeUpdate7008. */ -namespace Drupal\migrate_drupal\Plugin\migrate\process\d6; +namespace Drupal\node\Plugin\migrate\process\d6; use Drupal\migrate\MigrateExecutableInterface; use Drupal\migrate\ProcessPluginBase; diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Node.php b/core/modules/node/src/Plugin/migrate/source/d6/Node.php similarity index 96% rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Node.php rename to core/modules/node/src/Plugin/migrate/source/d6/Node.php index d7579fd..038c479 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/Node.php +++ b/core/modules/node/src/Plugin/migrate/source/d6/Node.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\Node. + * Contains \Drupal\node\Plugin\migrate\source\d6\Node. */ -namespace Drupal\migrate_drupal\Plugin\migrate\source\d6; +namespace Drupal\node\Plugin\migrate\source\d6; use Drupal\migrate\Row; use Drupal\migrate\Plugin\SourceEntityInterface; diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeRevision.php b/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php similarity index 85% rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeRevision.php rename to core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php index c419586..8f426c0 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeRevision.php +++ b/core/modules/node/src/Plugin/migrate/source/d6/NodeRevision.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\NodeRevision. + * Contains \Drupal\node\Plugin\migrate\source\d6\NodeRevision. */ -namespace Drupal\migrate_drupal\Plugin\migrate\source\d6; +namespace Drupal\node\Plugin\migrate\source\d6; /** * Drupal 6 node revision source from database. diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeType.php b/core/modules/node/src/Plugin/migrate/source/d6/NodeType.php similarity index 96% rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeType.php rename to core/modules/node/src/Plugin/migrate/source/d6/NodeType.php index cfab0d4..034c934 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/NodeType.php +++ b/core/modules/node/src/Plugin/migrate/source/d6/NodeType.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\NodeType. + * Contains \Drupal\node\Plugin\migrate\source\d6\NodeType. */ -namespace Drupal\migrate_drupal\Plugin\migrate\source\d6; +namespace Drupal\node\Plugin\migrate\source\d6; use Drupal\migrate\Row; use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase; diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ViewMode.php b/core/modules/node/src/Plugin/migrate/source/d6/ViewMode.php similarity index 84% rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ViewMode.php rename to core/modules/node/src/Plugin/migrate/source/d6/ViewMode.php index ea1c505..bed0663 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ViewMode.php +++ b/core/modules/node/src/Plugin/migrate/source/d6/ViewMode.php @@ -2,15 +2,10 @@ /** * @file - * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\ViewMode. + * Contains \Drupal\node\Plugin\migrate\source\d6\ViewMode. */ -namespace Drupal\migrate_drupal\Plugin\migrate\source\d6; - -use Drupal\Core\Entity\EntityManagerInterface; -use Drupal\Core\Plugin\ContainerFactoryPluginInterface; -use Drupal\migrate\Entity\MigrationInterface; -use Symfony\Component\DependencyInjection\ContainerInterface; +namespace Drupal\node\Plugin\migrate\source\d6; /** * The view mode source. diff --git a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ViewModeBase.php b/core/modules/node/src/Plugin/migrate/source/d6/ViewModeBase.php similarity index 86% rename from core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ViewModeBase.php rename to core/modules/node/src/Plugin/migrate/source/d6/ViewModeBase.php index 8e05887..9817a1b 100644 --- a/core/modules/migrate_drupal/src/Plugin/migrate/source/d6/ViewModeBase.php +++ b/core/modules/node/src/Plugin/migrate/source/d6/ViewModeBase.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\migrate_drupal\Plugin\migrate\source\d6\ViewModeBase. + * Contains \Drupal\node\Plugin\migrate\source\d6\ViewModeBase. */ -namespace Drupal\migrate_drupal\Plugin\migrate\source\d6; +namespace Drupal\node\Plugin\migrate\source\d6; use Drupal\migrate_drupal\Plugin\migrate\source\DrupalSqlBase; @@ -14,7 +14,6 @@ */ abstract class ViewModeBase extends DrupalSqlBase { - /** * {@inheritdoc} */ diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeBundleSettingsTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php similarity index 94% rename from core/modules/migrate_drupal/src/Tests/d6/MigrateNodeBundleSettingsTest.php rename to core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php index bda9bbe..fc6e4e5 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeBundleSettingsTest.php +++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeBundleSettingsTest.php @@ -2,15 +2,17 @@ /** * @file - * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeBundleSettingsTest. + * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeBundleSettingsTest. */ -namespace Drupal\migrate_drupal\Tests\d6; +namespace Drupal\node\Tests\Migrate\d6; + +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Test migrating node settings into the base_field_bundle_override config entity. * - * @group migrate_drupal + * @group node */ class MigrateNodeBundleSettingsTest extends MigrateDrupal6TestBase { diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php similarity index 82% rename from core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php rename to core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php index 4e1bed2..291c42a 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeConfigsTest.php +++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeConfigsTest.php @@ -2,17 +2,18 @@ /** * @file - * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeConfigsTest. + * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeConfigsTest. */ -namespace Drupal\migrate_drupal\Tests\d6; +namespace Drupal\node\Tests\Migrate\d6; use Drupal\config\Tests\SchemaCheckTestTrait; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Upgrade variables to node.settings.yml. * - * @group migrate_drupal + * @group node */ class MigrateNodeConfigsTest extends MigrateDrupal6TestBase { diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php similarity index 93% rename from core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php rename to core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php index aad5af7..b10083e 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeRevisionTest.php +++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeRevisionTest.php @@ -2,17 +2,17 @@ /** * @file - * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeRevisionTest. + * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeRevisionTest. */ -namespace Drupal\migrate_drupal\Tests\d6; +namespace Drupal\node\Tests\Migrate\d6; use Drupal\Core\Database\Database; /** * Node content revisions migration. * - * @group migrate_drupal + * @group node */ class MigrateNodeRevisionTest extends MigrateNodeTestBase { diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTest.php similarity index 96% rename from core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php rename to core/modules/node/src/Tests/Migrate/d6/MigrateNodeTest.php index 8cb932f..2b07bfb 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTest.php +++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeTest. + * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeTest. */ -namespace Drupal\migrate_drupal\Tests\d6; +namespace Drupal\node\Tests\Migrate\d6; use Drupal\migrate\MigrateExecutable; use Drupal\Core\Database\Database; @@ -14,7 +14,7 @@ /** * Node content migration. * - * @group migrate_drupal + * @group node */ class MigrateNodeTest extends MigrateNodeTestBase { diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTestBase.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTestBase.php similarity index 94% rename from core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTestBase.php rename to core/modules/node/src/Tests/Migrate/d6/MigrateNodeTestBase.php index faf34b7..f011a90 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTestBase.php +++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTestBase.php @@ -2,12 +2,13 @@ /** * @file - * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeTestBase. + * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeTestBase. */ -namespace Drupal\migrate_drupal\Tests\d6; +namespace Drupal\node\Tests\Migrate\d6; use Drupal\migrate\Entity\MigrationInterface; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; use Drupal\user\Entity\User; /** diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTypeTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php similarity index 94% rename from core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTypeTest.php rename to core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php index 0e36e1e..1ef267d 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateNodeTypeTest.php +++ b/core/modules/node/src/Tests/Migrate/d6/MigrateNodeTypeTest.php @@ -2,18 +2,19 @@ /** * @file - * Contains \Drupal\migrate_drupal\Tests\d6\MigrateNodeTypeTest. + * Contains \Drupal\node\Tests\Migrate\d6\MigrateNodeTypeTest. */ -namespace Drupal\migrate_drupal\Tests\d6; +namespace Drupal\node\Tests\Migrate\d6; use Drupal\field\Entity\FieldConfig; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; use Drupal\node\Entity\NodeType; /** * Upgrade node types to node.type.*.yml. * - * @group migrate_drupal + * @group node */ class MigrateNodeTypeTest extends MigrateDrupal6TestBase { diff --git a/core/modules/migrate_drupal/src/Tests/d6/MigrateViewModesTest.php b/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php similarity index 86% rename from core/modules/migrate_drupal/src/Tests/d6/MigrateViewModesTest.php rename to core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php index 7c6471b..aa4337f 100644 --- a/core/modules/migrate_drupal/src/Tests/d6/MigrateViewModesTest.php +++ b/core/modules/node/src/Tests/Migrate/d6/MigrateViewModesTest.php @@ -2,17 +2,18 @@ /** * @file - * Contains \Drupal\migrate_drupal\Tests\d6\MigrateViewModesTest. + * Contains \Drupal\node\Tests\Migrate\d6\MigrateViewModesTest. */ -namespace Drupal\migrate_drupal\Tests\d6; +namespace Drupal\node\Tests\Migrate\d6; use Drupal\Core\Entity\Entity\EntityViewMode; +use Drupal\migrate_drupal\Tests\d6\MigrateDrupal6TestBase; /** * Migrate view modes. * - * @group migrate_drupal + * @group node */ class MigrateViewModesTest extends MigrateDrupal6TestBase { diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeByNodeTypeTest.php b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeByNodeTypeTest.php similarity index 93% rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeByNodeTypeTest.php rename to core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeByNodeTypeTest.php index 2370bd8..0f9be31 100644 --- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeByNodeTypeTest.php +++ b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeByNodeTypeTest.php @@ -2,21 +2,21 @@ /** * @file - * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\NodeByNodeTypeTest. + * Contains \Drupal\Tests\node\Unit\Plugin\migrate\source\d6\NodeByNodeTypeTest. */ -namespace Drupal\Tests\migrate_drupal\Unit\source\d6; +namespace Drupal\Tests\node\Unit\Plugin\migrate\source\d6; use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase; /** * Tests D6 node source plugin with 'node_type' configuration. * - * @group migrate_drupal + * @group node */ class NodeByNodeTypeTest extends MigrateSqlSourceTestCase { - const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\Node'; + const PLUGIN_CLASS = 'Drupal\node\Plugin\migrate\source\d6\Node'; // The fake Migration configuration entity. protected $migrationConfiguration = array( diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionByNodeTypeTest.php b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeRevisionByNodeTypeTest.php similarity index 94% rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionByNodeTypeTest.php rename to core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeRevisionByNodeTypeTest.php index e4e7acb..f974954 100644 --- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionByNodeTypeTest.php +++ b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeRevisionByNodeTypeTest.php @@ -2,21 +2,21 @@ /** * @file - * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\NodeRevisionByNodeTypeTest. + * Contains \Drupal\Tests\node\Unit\Plugin\migrate\source\d6\NodeRevisionByNodeTypeTest. */ -namespace Drupal\Tests\migrate_drupal\Unit\source\d6; +namespace Drupal\Tests\node\Unit\Plugin\migrate\source\d6; use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase; /** * Tests D6 node revision source plugin. * - * @group migrate_drupal + * @group node */ class NodeRevisionByNodeTypeTest extends MigrateSqlSourceTestCase { - const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\NodeRevision'; + const PLUGIN_CLASS = 'Drupal\node\Plugin\migrate\source\d6\NodeRevision'; // The fake Migration configuration entity. protected $migrationConfiguration = [ diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionTest.php b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeRevisionTest.php similarity index 94% rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionTest.php rename to core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeRevisionTest.php index 4dde4b1..79b9983 100644 --- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeRevisionTest.php +++ b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeRevisionTest.php @@ -2,21 +2,21 @@ /** * @file - * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\NodeRevisionTest. + * Contains \Drupal\Tests\node\Unit\Plugin\migrate\source\d6\NodeRevisionTest. */ -namespace Drupal\Tests\migrate_drupal\Unit\source\d6; +namespace Drupal\Tests\node\Unit\Plugin\migrate\source\d6; use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase; /** * Tests D6 node revision source plugin. * - * @group migrate_drupal + * @group node */ class NodeRevisionTest extends MigrateSqlSourceTestCase { - const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\NodeRevision'; + const PLUGIN_CLASS = 'Drupal\node\Plugin\migrate\source\d6\NodeRevision'; // The fake Migration configuration entity. protected $migrationConfiguration = [ diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTest.php b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeTest.php similarity index 93% rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTest.php rename to core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeTest.php index a108f61..4a5d7af 100644 --- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTest.php +++ b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeTest.php @@ -2,21 +2,21 @@ /** * @file - * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\NodeTest. + * Contains \Drupal\Tests\node\Unit\Plugin\migrate\source\d6\NodeTest. */ -namespace Drupal\Tests\migrate_drupal\Unit\source\d6; +namespace Drupal\Tests\node\Unit\Plugin\migrate\source\d6; use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase; /** * Tests D6 node source plugin. * - * @group migrate_drupal + * @group node */ class NodeTest extends MigrateSqlSourceTestCase { - const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\Node'; + const PLUGIN_CLASS = 'Drupal\node\Plugin\migrate\source\d6\Node'; // The fake Migration configuration entity. protected $migrationConfiguration = array( diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTypeTest.php b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeTypeTest.php similarity index 90% rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTypeTest.php rename to core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeTypeTest.php index 5d80aca..8d545f4 100644 --- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/NodeTypeTest.php +++ b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/NodeTypeTest.php @@ -2,23 +2,23 @@ /** * @file - * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\NodeTypeTest. + * Contains \Drupal\Tests\node\Unit\Plugin\migrate\source\d6\NodeTypeTest. */ -namespace Drupal\Tests\migrate_drupal\Unit\source\d6; +namespace Drupal\Tests\node\Unit\Plugin\migrate\source\d6; use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase; /** * Tests D6 node type source plugin. * - * @group migrate_drupal + * @group node */ class NodeTypeTest extends MigrateSqlSourceTestCase { // The plugin system is not working during unit testing so the source plugin // class needs to be manually specified. - const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\NodeType'; + const PLUGIN_CLASS = 'Drupal\node\Plugin\migrate\source\d6\NodeType'; // The fake Migration configuration entity. protected $migrationConfiguration = array( diff --git a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ViewModeTest.php b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/ViewModeTest.php similarity index 86% rename from core/modules/migrate_drupal/tests/src/Unit/source/d6/ViewModeTest.php rename to core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/ViewModeTest.php index 250549f..ec97faa 100644 --- a/core/modules/migrate_drupal/tests/src/Unit/source/d6/ViewModeTest.php +++ b/core/modules/node/tests/src/Unit/Plugin/migrate/source/d6/ViewModeTest.php @@ -2,23 +2,23 @@ /** * @file - * Contains \Drupal\Tests\migrate_drupal\Unit\source\d6\ViewModeTest. + * Contains \Drupal\Tests\node\Unit\Plugin\migrate\source\d6\ViewModeTest. */ -namespace Drupal\Tests\migrate_drupal\Unit\source\d6; +namespace Drupal\Tests\node\Unit\Plugin\migrate\source\d6; use Drupal\Tests\migrate\Unit\MigrateSqlSourceTestCase; /** * Tests D6 view mode source plugin. * - * @group migrate_drupal + * @group node */ class ViewModeTest extends MigrateSqlSourceTestCase { // The plugin system is not working during unit testing so the source plugin // class needs to be manually specified. - const PLUGIN_CLASS = 'Drupal\migrate_drupal\Plugin\migrate\source\d6\ViewMode'; + const PLUGIN_CLASS = 'Drupal\node\Plugin\migrate\source\d6\ViewMode'; // The fake Migration configuration entity. protected $migrationConfiguration = array(