Skip to content
Snippets Groups Projects
Unverified Commit 3246a76f authored by Alex Pott's avatar Alex Pott
Browse files

Issue #2675006 by danflanagan8, robpowell, quietone: Write UnitTest for...

Issue #2675006 by danflanagan8, robpowell, quietone: Write UnitTest for MigrationConfigurationTrait and fix Exception Handling

(cherry picked from commit ce4ce0ac)
parent d764daae
No related branches found
No related tags found
15 merge requests!2496Issue #3222757 by lauriii, Wim Leers, nod_, rachel_norfolk, itmaybejj,...,!2366Issue #3285105 by Daniel Arend,!2304Issue #3258987: Class "Drupal\Core\Utility\Error" not found in _drupal_error_handler_real() due to bug in PHP 8.1.0-8.1.5,!2148Issue #3270899: Remove Color module from core,!2136Issue #3227824: Move the linkset functionality from the decoupled menus contributed module to core's system module,!2071Issue #927570: Setting 403 or 404 handler to a page that redirects leads to endless loop,!1975Issue #3269749: losing query params from user to user/login redirect,!1959Issue #3236497: Allow other modules to opt out of security release message from update_page_top,!1387Draft: Resolve #2511878 "Support enclosure field",!1282Issue #3227824: Add the decoupled menus module to core,!1229Issue #3225621: Use media query event listener instead of a listener on the resize event,!799Issue #3214332: Preview content is broken in Claro.,!776Resolve #85494 "Use email verification 9.3.x",!558Resolve #3020422 "Toolbar style update",!231Issue #2671162: summary text wysiwyg patch working fine on 9.2.0-dev
......@@ -220,7 +220,7 @@ public static function getLegacyDrupalVersion(Connection $connection) {
}
}
}
catch (\PDOException $e) {
catch (DatabaseExceptionWrapper $e) {
$version_string = FALSE;
}
}
......
<?php
namespace Drupal\Tests\migrate_drupal\Unit;
use Drupal\Core\Database\DatabaseExceptionWrapper;
use Drupal\migrate_drupal\MigrationConfigurationTrait;
use Drupal\Tests\UnitTestCase;
/**
* @coversDefaultClass \Drupal\migrate_drupal\MigrationConfigurationTrait
* @group migrate_drupal
*/
class MigrationConfigurationTraitTest extends UnitTestCase {
/**
* @covers ::getLegacyDrupalVersion
* @dataProvider providerTestGetLegacyDrupalVersion
*/
public function testGetLegacyDrupalVersion($expected_version_string, $schema_version, $exception, $table_map) {
if ($schema_version) {
$statement = $this->createMock('\Drupal\Core\Database\StatementInterface');
$statement->expects($this->any())
->method('fetchField')
->willReturn($schema_version);
}
$schema = $this->createMock('\Drupal\Core\Database\Schema');
$schema->expects($this->any())
->method('tableExists')
->willReturnMap($table_map);
$connection = $this->getMockBuilder('Drupal\Core\Database\Connection')
->disableOriginalConstructor()
->getMock();
if ($exception) {
$connection->expects($this->any())
->method('query')
->willThrowException($exception);
}
else {
$connection->expects($this->any())
->method('query')
->willReturn($statement);
}
$connection->expects($this->any())
->method('schema')
->willReturn($schema);
$actual_version_string = MigrationConfigurationTrait::getLegacyDrupalVersion($connection);
$this->assertSame($expected_version_string, $actual_version_string);
}
/**
* Provides data for testGetLegacyDrupalVersion.
*/
public function providerTestGetLegacyDrupalVersion() {
return [
'D5' => [
'expected_version_string' => '5',
'schema_version' => '1678',
'exception' => NULL,
'table_map' => [
['system', TRUE],
['key_value', FALSE],
],
],
'D6' => [
'expected_version_string' => '6',
'schema_version' => '6057',
'exception' => NULL,
'table_map' => [
['system', TRUE],
['key_value', FALSE],
],
],
'D7' => [
'expected_version_string' => '7',
'schema_version' => '7065',
'exception' => NULL,
'table_map' => [
['system', TRUE],
['key_value', FALSE],
],
],
'D8' => [
'expected_version_string' => '8',
'schema_version' => serialize('8976'),
'exception' => NULL,
'table_map' => [
['system', FALSE],
['key_value', TRUE],
],
],
'D9' => [
'expected_version_string' => '9',
'schema_version' => serialize('9270'),
'exception' => NULL,
'table_map' => [
['system', FALSE],
['key_value', TRUE],
],
],
'Not drupal' => [
'expected_version_string' => FALSE,
'schema_version' => "not drupal I guess",
'exception' => NULL,
'table_map' => [
['system', FALSE],
['key_value', FALSE],
],
],
'D5 almost' => [
'expected_version_string' => FALSE,
'schema_version' => '123',
'exception' => NULL,
'table_map' => [
['system', TRUE],
['key_value', FALSE],
],
],
'D5/6/7 Exception' => [
'expected_version_string' => FALSE,
'schema_version' => NULL,
'exception' => new DatabaseExceptionWrapper(),
'table_map' => [
['system', TRUE],
['key_value', FALSE],
],
],
'D8/9 Exception' => [
'expected_version_string' => FALSE,
'schema_version' => NULL,
'exception' => new DatabaseExceptionWrapper(),
'table_map' => [
['system', FALSE],
['key_value', TRUE],
],
],
];
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment