From 65f070f4db9bb64dbbfb5d13bcf054a019abc580 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Fri, 11 Dec 2020 09:27:09 +0000
Subject: [PATCH] Issue #3187794 by benjifisher: Remove redundant kernel tests
in the Migrate module
---
.../migrate/tests/src/Kernel/MigrateLookupTest.php | 11 -----------
.../migrate/tests/src/Kernel/MigrateStubTest.php | 10 ----------
.../migrate/tests/src/Unit/MigrateLookupTest.php | 1 +
.../migrate/tests/src/Unit/MigrateStubTest.php | 1 +
4 files changed, 2 insertions(+), 21 deletions(-)
diff --git a/core/modules/migrate/tests/src/Kernel/MigrateLookupTest.php b/core/modules/migrate/tests/src/Kernel/MigrateLookupTest.php
index 4affaa388465..4b2ec45b7d3a 100644
--- a/core/modules/migrate/tests/src/Kernel/MigrateLookupTest.php
+++ b/core/modules/migrate/tests/src/Kernel/MigrateLookupTest.php
@@ -2,7 +2,6 @@
namespace Drupal\Tests\migrate\Kernel;
-use Drupal\Component\Plugin\Exception\PluginNotFoundException;
use Drupal\migrate\MigrateException;
use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
@@ -78,16 +77,6 @@ public function testInvalidIdLookup() {
$this->migrateLookup->lookup('sample_lookup_migration', ['invalid_id' => 25]);
}
- /**
- * Tests an invalid lookup.
- */
- public function testInvalidMigrationLookup() {
- $this->expectException(PluginNotFoundException::class);
- $this->expectExceptionMessage("Plugin ID 'invalid_migration' was not found.");
- // Test invalid migration_id.
- $this->migrateLookup->lookup('invalid_migration', ['id' => 1337]);
- }
-
/**
* Tests lookups with multiple source ids.
*/
diff --git a/core/modules/migrate/tests/src/Kernel/MigrateStubTest.php b/core/modules/migrate/tests/src/Kernel/MigrateStubTest.php
index 51b9058fa643..817e54ba5be4 100644
--- a/core/modules/migrate/tests/src/Kernel/MigrateStubTest.php
+++ b/core/modules/migrate/tests/src/Kernel/MigrateStubTest.php
@@ -2,7 +2,6 @@
namespace Drupal\Tests\migrate\Kernel;
-use Drupal\Component\Plugin\Exception\PluginNotFoundException;
use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
/**
@@ -118,13 +117,4 @@ public function testInvalidSourceIdKeys() {
$this->migrateStub->createStub('sample_stubbing_migration_with_multiple_source_ids', ['id' => 17, 'not_a_key' => 17]);
}
- /**
- * Tests that an exception is thrown if a migration does not exist.
- */
- public function testErrorOnMigrationNotFound() {
- $this->expectException(PluginNotFoundException::class);
- $this->expectExceptionMessage("Plugin ID 'nonexistent_migration' was not found.");
- $this->migrateStub->createStub('nonexistent_migration', [1]);
- }
-
}
diff --git a/core/modules/migrate/tests/src/Unit/MigrateLookupTest.php b/core/modules/migrate/tests/src/Unit/MigrateLookupTest.php
index 417b08a86447..54fa42d2261c 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateLookupTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateLookupTest.php
@@ -53,6 +53,7 @@ public function testExceptionOnMigrationNotFound() {
$migration_plugin_manager = $this->prophesize(MigrationPluginManagerInterface::class);
$migration_plugin_manager->createInstances('bad_plugin')->willReturn([]);
$this->expectException(PluginNotFoundException::class);
+ $this->expectExceptionMessage("Plugin ID 'bad_plugin' was not found.");
$lookup = new MigrateLookup($migration_plugin_manager->reveal());
$lookup->lookup('bad_plugin', [1]);
}
diff --git a/core/modules/migrate/tests/src/Unit/MigrateStubTest.php b/core/modules/migrate/tests/src/Unit/MigrateStubTest.php
index 4a68dfdffc69..a89ab3562861 100644
--- a/core/modules/migrate/tests/src/Unit/MigrateStubTest.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateStubTest.php
@@ -72,6 +72,7 @@ public function testCreateStub() {
public function testExceptionOnPluginNotFound() {
$this->migrationPluginManager->createInstances(['test_migration'])->willReturn([]);
$this->expectException(PluginNotFoundException::class);
+ $this->expectExceptionMessage("Plugin ID 'test_migration' was not found.");
$stub = new MigrateStub($this->migrationPluginManager->reveal());
$stub->createStub('test_migration', [1]);
}
--
GitLab