.../src/Tests/MigrateDumpAlterInterface.php | 5 +-- .../migrate/src/Tests/MigrateEventsTest.php | 2 +- .../migrate/src/Tests/MigrateInterruptionTest.php | 5 ++- .../migrate/src/Tests/MigrateMessageTest.php | 2 +- .../migrate/src/Tests/MigrateRollbackTest.php | 4 +- .../migrate/src/Tests/MigrateSkipRowTest.php | 4 +- .../migrate/src/Tests/MigrateStatusTest.php | 4 +- core/modules/migrate/src/Tests/MigrateTestBase.php | 12 ++--- core/modules/migrate/src/Tests/MigrationTest.php | 4 +- core/modules/migrate/src/Tests/SqlBaseTest.php | 14 +++--- core/modules/migrate/src/Tests/TemplateTest.php | 52 +++++++++++----------- 11 files changed, 55 insertions(+), 53 deletions(-) diff --git a/core/modules/migrate/src/Tests/MigrateDumpAlterInterface.php b/core/modules/migrate/src/Tests/MigrateDumpAlterInterface.php index 94b8a3d..3f22657 100644 --- a/core/modules/migrate/src/Tests/MigrateDumpAlterInterface.php +++ b/core/modules/migrate/src/Tests/MigrateDumpAlterInterface.php @@ -7,21 +7,20 @@ namespace Drupal\migrate\Tests; use Drupal\simpletest\TestBase; /** - * Allows tests to alter dumps after they've loaded. + * Allows tests to alter dumps after they have loaded. * - * @s * @see \Drupal\migrate_drupal\Tests\d6\MigrateFileTest */ interface MigrateDumpAlterInterface { /** - * Allows tests to alter dumps after they've loaded. + * Allows tests to alter dumps after they have loaded. * * @param \Drupal\simpletest\TestBase $test * The test that is being run. */ public static function migrateDumpAlter(TestBase $test); diff --git a/core/modules/migrate/src/Tests/MigrateEventsTest.php b/core/modules/migrate/src/Tests/MigrateEventsTest.php index ccc82ac..ae540ac 100644 --- a/core/modules/migrate/src/Tests/MigrateEventsTest.php +++ b/core/modules/migrate/src/Tests/MigrateEventsTest.php @@ -82,13 +82,13 @@ public function testMigrateEvents() { 'destination' => ['plugin' => 'dummy'], ]; $migration = Migration::create($config); /** @var MigrationInterface $migration */ - $executable = new MigrateExecutable($migration, new MigrateMessage); + $executable = new MigrateExecutable($migration, new MigrateMessage()); // As the import runs, events will be dispatched, recording the received // information in state. $executable->import(); // Validate from the recorded state that the events were received. $event = $this->state->get('migrate_events_test.pre_import_event', []); diff --git a/core/modules/migrate/src/Tests/MigrateInterruptionTest.php b/core/modules/migrate/src/Tests/MigrateInterruptionTest.php index 3ffd22b..a7abd86 100644 --- a/core/modules/migrate/src/Tests/MigrateInterruptionTest.php +++ b/core/modules/migrate/src/Tests/MigrateInterruptionTest.php @@ -61,14 +61,15 @@ public function testMigrateEvents() { 'destination' => ['plugin' => 'dummy'], ]; $migration = Migration::create($config); /** @var MigrationInterface $migration */ - $executable = new MigrateExecutable($migration, new MigrateMessage); - // When the import runs, the first row imported will trigger an interruption. + $executable = new MigrateExecutable($migration, new MigrateMessage()); + // When the import runs, the first row imported will trigger an + // interruption. $result = $executable->import(); $this->assertEqual($result, MigrationInterface::RESULT_INCOMPLETE); // The status should have been reset to IDLE. $this->assertEqual($migration->getStatus(), MigrationInterface::STATUS_IDLE); diff --git a/core/modules/migrate/src/Tests/MigrateMessageTest.php b/core/modules/migrate/src/Tests/MigrateMessageTest.php index 729ca70..87eaa69 100644 --- a/core/modules/migrate/src/Tests/MigrateMessageTest.php +++ b/core/modules/migrate/src/Tests/MigrateMessageTest.php @@ -13,13 +13,13 @@ use Drupal\migrate\Event\MigrateIdMapMessageEvent; use Drupal\migrate\MigrateExecutable; use Drupal\migrate\MigrateMessageInterface; use Drupal\simpletest\KernelTestBase; /** - * Test whether idmap messages are sent to the message interface when requested. + * Tests whether idmap messages are sent to message interface when requested. * * @group migrate */ class MigrateMessageTest extends KernelTestBase implements MigrateMessageInterface { /** diff --git a/core/modules/migrate/src/Tests/MigrateRollbackTest.php b/core/modules/migrate/src/Tests/MigrateRollbackTest.php index ec03bb1..9d6055c 100644 --- a/core/modules/migrate/src/Tests/MigrateRollbackTest.php +++ b/core/modules/migrate/src/Tests/MigrateRollbackTest.php @@ -78,14 +78,14 @@ public function testRollback() { $vocabulary = Vocabulary::load($row['id']); $this->assertTrue($vocabulary); $map_row = $vocabulary_id_map->getRowBySource(['id' => $row['id']]); $this->assertNotNull($map_row['destid1']); } - // We use taxonomy terms to demonstrate importing and rolling back - // content entities. + // We use taxonomy terms to demonstrate importing and rolling back content + // entities. $term_data_rows = [ ['id' => '1', 'vocab' => '1', 'name' => 'music'], ['id' => '2', 'vocab' => '2', 'name' => 'Bach'], ['id' => '3', 'vocab' => '2', 'name' => 'Beethoven'], ]; $ids = ['id' => ['type' => 'integer']]; diff --git a/core/modules/migrate/src/Tests/MigrateSkipRowTest.php b/core/modules/migrate/src/Tests/MigrateSkipRowTest.php index d27a9ae..93c1a7c 100644 --- a/core/modules/migrate/src/Tests/MigrateSkipRowTest.php +++ b/core/modules/migrate/src/Tests/MigrateSkipRowTest.php @@ -38,13 +38,13 @@ public function testPrepareRowSkip() { 'id' => 'sample_data', 'migration_tags' => ['prepare_row test'], 'source' => [ 'plugin' => 'embedded_data', 'data_rows' => [ ['id' => '1', 'data' => 'skip_and_record'], - ['id' => '2', 'data' => 'skip_and_dont_record'] + ['id' => '2', 'data' => 'skip_and_dont_record'], ], 'ids' => [ 'id' => ['type' => 'string'], ], ], 'process' => ['value' => 'data'], @@ -54,13 +54,13 @@ public function testPrepareRowSkip() { ], 'load' => ['plugin' => 'null'], ]; $migration = Migration::create($config); - $executable = new MigrateExecutable($migration, new MigrateMessage); + $executable = new MigrateExecutable($migration, new MigrateMessage()); $result = $executable->import(); $this->assertEqual($result, MigrationInterface::RESULT_COMPLETED); $id_map_plugin = $migration->getIdMap(); // The first row is recorded in the map as ignored. $map_row = $id_map_plugin->getRowBySource(['id' => 1]); diff --git a/core/modules/migrate/src/Tests/MigrateStatusTest.php b/core/modules/migrate/src/Tests/MigrateStatusTest.php index 17b12e7..bdfcf74 100644 --- a/core/modules/migrate/src/Tests/MigrateStatusTest.php +++ b/core/modules/migrate/src/Tests/MigrateStatusTest.php @@ -8,20 +8,20 @@ namespace Drupal\migrate\Tests; use Drupal\migrate\Entity\Migration; use Drupal\migrate\Entity\MigrationInterface; /** - * Test migration status tracking. + * Tests migration status tracking. * * @group migrate */ class MigrateStatusTest extends MigrateTestBase { /** - * Test different connection types. + * Tests different connection types. */ public function testStatus() { // Create a minimally valid migration. $configuration = [ 'id' => 'migration_status_test', 'migration_tags' => ['Testing'], diff --git a/core/modules/migrate/src/Tests/MigrateTestBase.php b/core/modules/migrate/src/Tests/MigrateTestBase.php index 139bc2f..bb7dc30 100644 --- a/core/modules/migrate/src/Tests/MigrateTestBase.php +++ b/core/modules/migrate/src/Tests/MigrateTestBase.php @@ -13,13 +13,13 @@ use Drupal\migrate\MigrateMessageInterface; use Drupal\migrate\Plugin\MigrateIdMapInterface; use Drupal\migrate\Row; use Drupal\simpletest\KernelTestBase; /** - * Base class for migration tests. + * Creates abstract base class for migration tests. */ abstract class MigrateTestBase extends KernelTestBase implements MigrateMessageInterface { /** * TRUE to collect messages instead of displaying them. * @@ -143,13 +143,13 @@ protected function prepareMigrations(array $id_mappings) { } /** * Executes a single migration. * * @param string|\Drupal\migrate\Entity\MigrationInterface $migration - * The migration to execute, or its ID. + * The migration to execute, or its ID. */ protected function executeMigration($migration) { if (is_string($migration)) { $this->migration = Migration::load($migration); } else { @@ -197,22 +197,24 @@ public function startCollectingMessages() { */ public function stopCollectingMessages() { $this->collectMessages = FALSE; } /** - * Records a failure in the map table of a specific migration in order to - * test scenarios which require a failed row. + * Records a failure in the map table of a specific migration. + * + * This is done in order to test scenarios which require a failed row. * * @param string|\Drupal\migrate\Entity\MigrationInterface $migration * The migration entity, or its ID. * @param array $row * The raw source row which "failed". * @param int $status * (optional) The failure status. Should be one of the - * MigrateIdMapInterface::STATUS_* constants. + * MigrateIdMapInterface::STATUS_* constants. Defaults to + * MigrateIdMapInterface::STATUS_FAILED. */ protected function mockFailure($migration, array $row, $status = MigrateIdMapInterface::STATUS_FAILED) { if (is_string($migration)) { $migration = Migration::load($migration); } /** @var \Drupal\migrate\Entity\MigrationInterface $migration */ diff --git a/core/modules/migrate/src/Tests/MigrationTest.php b/core/modules/migrate/src/Tests/MigrationTest.php index 96dfada..6511903 100644 --- a/core/modules/migrate/src/Tests/MigrationTest.php +++ b/core/modules/migrate/src/Tests/MigrationTest.php @@ -16,20 +16,20 @@ * @group migrate * @coversDefaultClass \Drupal\migrate\Entity\Migration */ class MigrationTest extends KernelTestBase { /** - * Enable field because we're using one of its source plugins. + * Enable field because we are using one of its source plugins. * * @var array */ public static $modules = ['migrate', 'field']; /** - * Tests Migration::set() + * Tests Migration::set(). * * @covers ::set() */ public function testSetInvalidation() { $migration = Migration::create([ 'source' => ['plugin' => 'empty'], diff --git a/core/modules/migrate/src/Tests/SqlBaseTest.php b/core/modules/migrate/src/Tests/SqlBaseTest.php index 0ac7bca..0fd15a6 100644 --- a/core/modules/migrate/src/Tests/SqlBaseTest.php +++ b/core/modules/migrate/src/Tests/SqlBaseTest.php @@ -8,20 +8,20 @@ namespace Drupal\migrate\Tests; use Drupal\migrate\Plugin\migrate\source\TestSqlBase; use Drupal\Core\Database\Database; /** - * Test the functionality of SqlBase. + * Tests the functionality of SqlBase. * * @group migrate */ class SqlBaseTest extends MigrateTestBase { /** - * Test different connection types. + * Tests different connection types. */ public function testConnectionTypes() { $sql_base = new TestSqlBase(); // Check the default values. $sql_base->setConfiguration([]); @@ -31,13 +31,13 @@ public function testConnectionTypes() { $target = 'test_db_target'; $key = 'test_migrate_connection'; $config = array('target' => $target, 'key' => $key); $sql_base->setConfiguration($config); Database::addConnectionInfo($key, $target, Database::getConnectionInfo('default')['default']); - // Validate we've injected our custom key and target. + // Validate we have injected our custom key and target. $this->assertIdentical($sql_base->getDatabase()->getTarget(), $target); $this->assertIdentical($sql_base->getDatabase()->getKey(), $key); // Now test we can have SqlBase create the connection from an info array. $sql_base = new TestSqlBase(); @@ -59,13 +59,13 @@ public function testConnectionTypes() { $config = ['target' => $target, 'key' => $key]; $database_state_key = 'migrate_sql_base_test'; \Drupal::state()->set($database_state_key, $config); $sql_base->setConfiguration(['database_state_key' => $database_state_key]); Database::addConnectionInfo($key, $target, Database::getConnectionInfo('default')['default']); - // Validate we've injected our custom key and target. + // Validate we have injected our custom key and target. $this->assertIdentical($sql_base->getDatabase()->getTarget(), $target); $this->assertIdentical($sql_base->getDatabase()->getKey(), $key); // Now test we can have SqlBase create the connection from an info array. $sql_base = new TestSqlBase(); @@ -93,28 +93,28 @@ public function testConnectionTypes() { * * @package Drupal\migrate\Plugin\migrate\source */ class TestSqlBase extends SqlBase { /** - * Override the constructor so we can create one easily. + * Overrides the constructor so we can create one easily. */ public function __construct() { $this->state = \Drupal::state(); } /** - * Get the database without caching it. + * Gets the database without caching it. */ public function getDatabase() { $this->database = NULL; return parent::getDatabase(); } /** - * Allow us to set the configuration from a test. + * Allows us to set the configuration from a test. * * @param array $config * The config array. */ public function setConfiguration($config) { $this->configuration = $config; diff --git a/core/modules/migrate/src/Tests/TemplateTest.php b/core/modules/migrate/src/Tests/TemplateTest.php index 631bab7..99f8045 100644 --- a/core/modules/migrate/src/Tests/TemplateTest.php +++ b/core/modules/migrate/src/Tests/TemplateTest.php @@ -5,13 +5,13 @@ * Contains \Drupal\migrate\Tests\TemplateTest. */ namespace Drupal\migrate\Tests; /** - * Test the migration template functionality. + * Tests the migration template functionality. * * @group migrate */ class TemplateTest extends MigrateTestBase { /** @@ -19,31 +19,31 @@ class TemplateTest extends MigrateTestBase { * * @var array */ public static $modules = array('template_test'); /** - * Test different connection types. + * Tests different connection types. */ public function testTemplates() { $migration_templates = \Drupal::service('migrate.template_storage')->findTemplatesByTag("Template Test"); $expected_url = [ - 'id' => 'url_template', - 'label' => 'Template test - url', - 'migration_tags' => ['Template Test'], - 'source' => ['plugin' => 'empty'], - 'process' => ['src' => 'foobar'], - 'destination' => ['plugin' => 'url_alias'], + 'id' => 'url_template', + 'label' => 'Template test - url', + 'migration_tags' => ['Template Test'], + 'source' => ['plugin' => 'empty'], + 'process' => ['src' => 'foobar'], + 'destination' => ['plugin' => 'url_alias'], ]; $expected_node = [ - 'id' => 'node_template', - 'label' => 'Template test - node', - 'migration_tags' => ['Template Test'], - 'source' => ['plugin' => 'empty'], - 'process' => ['src' => 'barfoo'], - 'destination' => ['plugin' => 'entity:node'], + 'id' => 'node_template', + 'label' => 'Template test - node', + 'migration_tags' => ['Template Test'], + 'source' => ['plugin' => 'empty'], + 'process' => ['src' => 'barfoo'], + 'destination' => ['plugin' => 'entity:node'], ]; $this->assertIdentical($migration_templates['migrate.migration.url_template'], $expected_url); $this->assertIdentical($migration_templates['migrate.migration.node_template'], $expected_node); $this->assertFalse(isset($migration_templates['migrate.migration.other_template'])); } @@ -52,26 +52,26 @@ public function testTemplates() { */ public function testGetTemplateByName() { /** @var \Drupal\migrate\MigrateTemplateStorage $template_storage */ $template_storage = \Drupal::service('migrate.template_storage'); $expected_url = [ - 'id' => 'url_template', - 'label' => 'Template test - url', - 'migration_tags' => ['Template Test'], - 'source' => ['plugin' => 'empty'], - 'process' => ['src' => 'foobar'], - 'destination' => ['plugin' => 'url_alias'], + 'id' => 'url_template', + 'label' => 'Template test - url', + 'migration_tags' => ['Template Test'], + 'source' => ['plugin' => 'empty'], + 'process' => ['src' => 'foobar'], + 'destination' => ['plugin' => 'url_alias'], ]; $expected_node = [ - 'id' => 'node_template', - 'label' => 'Template test - node', - 'migration_tags' => ['Template Test'], - 'source' => ['plugin' => 'empty'], - 'process' => ['src' => 'barfoo'], - 'destination' => ['plugin' => 'entity:node'], + 'id' => 'node_template', + 'label' => 'Template test - node', + 'migration_tags' => ['Template Test'], + 'source' => ['plugin' => 'empty'], + 'process' => ['src' => 'barfoo'], + 'destination' => ['plugin' => 'entity:node'], ]; $this->assertIdentical($template_storage->getTemplateByName('migrate.migration.url_template'), $expected_url); $this->assertIdentical($template_storage->getTemplateByName('migrate.migration.node_template'), $expected_node); $this->assertNull($template_storage->getTemplateByName('migrate.migration.dne')); }