Skip to content

GitLab

D
drupal
Commit 0db5b138 authored by alexpott's avatar alexpott
Browse files
Options

Issue #2686207 by Berdir: Convert simpletest kernel tests in modules A-I to phpunit

parent 48e0852c
Hide whitespace changes
Inline Side-by-side
Showing with 334 additions and 290 deletions
core/lib/Drupal/Core/Config/Testing/ConfigSchemaChecker.php
View file @ 0db5b138
......@@ -24,7 +24,7 @@
* is invalid.
*
* @see \Drupal\simpletest\WebTestBase::setUp()
* @see \Drupal\simpletest\KernelTestBase::containerBuild()
* @see \Drupal\KernelTests\KernelTestBase::register()
*/
class ConfigSchemaChecker implements EventSubscriberInterface {
use SchemaCheckTrait;
......
core/modules/aggregator/src/Tests/AggregatorTitleTest.php → core/modules/aggregator/tests/src/Kernel/AggregatorTitleTest.php
View file @ 0db5b138
......@@ -2,14 +2,14 @@
/**
* @file
* Contains \Drupal\aggregator\Tests\AggregatorTitleTest.
* Contains \Drupal\Tests\aggregator\Kernel\AggregatorTitleTest.
*/
namespace Drupal\aggregator\Tests;
namespace Drupal\Tests\aggregator\Kernel;
use Drupal\aggregator\Entity\Feed;
use Drupal\aggregator\Entity\Item;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
/**
......@@ -24,7 +24,7 @@ class AggregatorTitleTest extends KernelTestBase {
*
* @var array
*/
public static $modules = ['file', 'field', 'options', 'aggregator'];
public static $modules = ['file', 'field', 'options', 'aggregator', 'system'];
/**
* The field name that is tested.
......@@ -43,6 +43,8 @@ protected function setUp() {
$this->installEntitySchema('aggregator_feed');
$this->installEntitySchema('aggregator_item');
\Drupal::service('router.builder')->rebuild();
$this->fieldName = 'title';
}
......@@ -69,25 +71,25 @@ public function testStringFormatter() {
$build = $aggregator_feed->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => TRUE]]);
$result = $this->render($build);
$this->assertTrue(strpos($result, 'testing title'));
$this->assertTrue(strpos($result, 'href="' . $aggregator_feed->getUrl()) . '"');
$this->assertContains('testing title', $result);
$this->assertContains('href="' . $aggregator_feed->getUrl() . '"', $result);
$build = $aggregator_feed->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => FALSE]]);
$result = $this->render($build);
$this->assertTrue(strpos($result, 'testing title') === 0);
$this->assertTrue(strpos($result, $aggregator_feed->getUrl()) === FALSE);
$this->assertContains('testing title', $result);
$this->assertNotContains($aggregator_feed->getUrl(), $result);
// Verify aggregator item title with and without links.
$build = $aggregator_item->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' =>TRUE]]);
$result = $this->render($build);
$this->assertTrue(strpos($result, 'test title'));
$this->assertTrue(strpos($result, 'href="' . $aggregator_item->getLink()) . '"');
$this->assertContains('test title', $result);
$this->assertContains('href="' . $aggregator_item->getLink() . '"', $result);
$build = $aggregator_item->{$this->fieldName}->view(['type' => 'aggregator_title', 'settings' => ['display_as_link' => FALSE]]);
$result = $this->render($build);
$this->assertTrue(strpos($result, 'test title') === 0);
$this->assertTrue(strpos($result, $aggregator_item->getLink()) === FALSE);
$this->assertContains('test title', $result);
$this->assertNotContains($aggregator_item->getLink(), $result);
}
}
core/modules/aggregator/src/Tests/FeedValidationTest.php → core/modules/aggregator/tests/src/Kernel/FeedValidationTest.php
View file @ 0db5b138
......@@ -2,20 +2,20 @@
/**
* @file
* Contains \Drupal\aggregator\Tests\FeedValidationTest.
* Contains \Drupal\Tests\aggregator\Kernel\FeedValidationTest.
*/
namespace Drupal\aggregator\Tests;
namespace Drupal\Tests\aggregator\Kernel;
use Drupal\aggregator\Entity\Feed;
use Drupal\system\Tests\Entity\EntityUnitTestBase;
use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
/**
* Tests feed validation constraints.
*
* @group aggregator
*/
class FeedValidationTest extends EntityUnitTestBase {
class FeedValidationTest extends EntityKernelTestBase {
/**
* Modules to install.
......
core/modules/aggregator/src/Tests/ItemWithoutFeedTest.php → core/modules/aggregator/tests/src/Kernel/ItemWithoutFeedTest.php
View file @ 0db5b138
......@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\aggregator\Tests\ItemWithoutFeedTest.
* Contains \Drupal\Tests\aggregator\Unit\ItemWithoutFeedTest.
*/
namespace Drupal\aggregator\Tests;
namespace Drupal\Tests\aggregator\Kernel;
use Drupal\aggregator\Entity\Item;
use Drupal\KernelTests\KernelTestBase;
......
core/modules/block/src/Tests/BlockConfigSchemaTest.php → core/modules/block/tests/src/Kernel/BlockConfigSchemaTest.php
View file @ 0db5b138
......@@ -2,14 +2,14 @@
/**
* @file
* Contains \Drupal\block\Tests\BlockConfigSchemaTest.
* Contains \Drupal\Tests\block\Kernel\BlockConfigSchemaTest.
*/
namespace Drupal\block\Tests;
namespace Drupal\Tests\block\Kernel;
use Drupal\block\Entity\Block;
use Drupal\config\Tests\SchemaCheckTestTrait;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
/**
* Tests the block config schema.
......
core/modules/block/src/Tests/BlockInterfaceTest.php → core/modules/block/tests/src/Kernel/BlockInterfaceTest.php
View file @ 0db5b138
......@@ -2,14 +2,14 @@
/**
* @file
* Contains \Drupal\block\Tests\BlockInterfaceTest.
* Contains \Drupal\Tests\block\Kernel\BlockInterfaceTest.
*/
namespace Drupal\block\Tests;
namespace Drupal\Tests\block\Kernel;
use Drupal\Core\Form\FormState;
use Drupal\simpletest\KernelTestBase;
use Drupal\block\BlockInterface;
use Drupal\KernelTests\KernelTestBase;
/**
* Tests that the block plugin can work properly without a supporting entity.
......@@ -17,6 +17,7 @@
* @group block
*/
class BlockInterfaceTest extends KernelTestBase {
public static $modules = array('system', 'block', 'block_test', 'user');
/**
......
core/modules/block/src/Tests/BlockStorageUnitTest.php → core/modules/block/tests/src/Kernel/BlockStorageUnitTest.php
View file @ 0db5b138
......@@ -2,13 +2,13 @@
/**
* @file
* Contains \Drupal\block\Tests\BlockStorageUnitTest.
* Contains \Drupal\Tests\block\Kernel\BlockStorageUnitTest.
*/
namespace Drupal\block\Tests;
namespace Drupal\Tests\block\Kernel;
use Drupal\Core\Config\Entity\ConfigEntityStorage;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
use Drupal\block_test\Plugin\Block\TestHtmlBlock;
use Drupal\Component\Plugin\Exception\PluginException;
use Drupal\block\Entity\Block;
......@@ -26,7 +26,7 @@ class BlockStorageUnitTest extends KernelTestBase {
*
* @var array
*/
public static $modules = array('block', 'block_test');
public static $modules = array('block', 'block_test', 'system');
/**
* The block storage.
......
core/modules/block/src/Tests/BlockViewBuilderTest.php → core/modules/block/tests/src/Kernel/BlockViewBuilderTest.php
View file @ 0db5b138
......@@ -2,15 +2,15 @@
/**
* @file
* Contains \Drupal\block\Tests\BlockViewBuilderTest.
* Contains \Drupal\Tests\block\Kernel\BlockViewBuilderTest.
*/
namespace Drupal\block\Tests;
namespace Drupal\Tests\block\Kernel;
use Drupal\Component\Utility\Html;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Language\LanguageInterface;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
use Drupal\block\Entity\Block;
/**
......
core/modules/book/src/Tests/BookUninstallTest.php → core/modules/book/tests/src/Kernel/BookUninstallTest.php
View file @ 0db5b138
......@@ -2,14 +2,14 @@
/**
* @file
* Contains \Drupal\book\Tests\BookUninstallTest.
* Contains \Drupal\Tests\book\Kernel\BookUninstallTest.
*/
namespace Drupal\book\Tests;
namespace Drupal\Tests\book\Kernel;
use Drupal\node\Entity\Node;
use Drupal\node\Entity\NodeType;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
/**
* Tests that the Book module cannot be uninstalled if books exist.
......
core/modules/breakpoint/src/Tests/BreakpointDiscoveryTest.php → core/modules/breakpoint/tests/src/Kernel/BreakpointDiscoveryTest.php
View file @ 0db5b138
<?php
/**
* @file
* Contains \Drupal\breakpoint\Tests\BreakpointDiscoveryTest.
* Contains \Drupal\Tests\breakpoint\Kernel\BreakpointDiscoveryTest.
*/
namespace Drupal\breakpoint\Tests;
namespace Drupal\Tests\breakpoint\Kernel;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
/**
* Tests discovery of breakpoints provided by themes and modules.
......
core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php → core/modules/ckeditor/tests/modules/src/Kernel/CKEditorPluginManagerTest.php
View file @ 0db5b138
......@@ -2,13 +2,13 @@
/**
* @file
* Contains \Drupal\ckeditor\Tests\CKEditorPluginManagerTest.
* Contains \Drupal\Tests\ckeditor\Kernel\CKEditorPluginManagerTest.
*/
namespace Drupal\ckeditor\Tests;
namespace Drupal\Tests\ckeditor\Kernel;
use Drupal\editor\Entity\Editor;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
use Drupal\filter\Entity\FilterFormat;
/**
......
core/modules/ckeditor/src/Tests/CKEditorTest.php → core/modules/ckeditor/tests/modules/src/Kernel/CKEditorTest.php
View file @ 0db5b138
......@@ -2,12 +2,12 @@
/**
* @file
* Contains \Drupal\ckeditor\Tests\CKEditorTest.
* Contains \Drupal\Tests\ckeditor\Kernel\CKEditorTest.
*/
namespace Drupal\ckeditor\Tests;
namespace Drupal\Tests\ckeditor\Kernel;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\editor\Entity\Editor;
use Drupal\filter\Entity\FilterFormat;
......
core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php → core/modules/comment/tests/src/Kernel/CommentDefaultFormatterCacheTagsTest.php
View file @ 0db5b138
......@@ -2,14 +2,15 @@
/**
* @file
* Contains \Drupal\comment\Tests\CommentDefaultFormatterCacheTagsTest.
* Contains \Drupal\Tests\comment\Kernel\CommentDefaultFormatterCacheTagsTest.
*/
namespace Drupal\comment\Tests;
namespace Drupal\Tests\comment\Kernel;
use Drupal\comment\Tests\CommentTestTrait;
use Drupal\Core\Cache\Cache;
use Drupal\comment\CommentInterface;
use Drupal\system\Tests\Entity\EntityUnitTestBase;
use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Session\Session;
use Drupal\comment\Entity\Comment;
......@@ -21,7 +22,7 @@
*
* @group comment
*/
class CommentDefaultFormatterCacheTagsTest extends EntityUnitTestBase {
class CommentDefaultFormatterCacheTagsTest extends EntityKernelTestBase {
use CommentTestTrait;
......
core/modules/comment/src/Tests/CommentFieldAccessTest.php → core/modules/comment/tests/src/Kernel/CommentFieldAccessTest.php
View file @ 0db5b138
<?php
/**
* @file
* Contains \Drupal\comment\Tests\CommentFieldAccessTest.
* Contains \Drupal\Tests\comment\Kernel\CommentFieldAccessTest.
*/
namespace Drupal\comment\Tests;
namespace Drupal\Tests\comment\Kernel;
use Drupal\comment\Entity\Comment;
use Drupal\comment\Entity\CommentType;
use Drupal\comment\Tests\CommentTestTrait;
use Drupal\Component\Utility\SafeMarkup;
use Drupal\Core\Session\AnonymousUserSession;
use Drupal\entity_test\Entity\EntityTest;
use Drupal\field\Entity\FieldConfig;
use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
use Drupal\simpletest\TestBase;
use Drupal\system\Tests\Entity\EntityUnitTestBase;
use Drupal\user\Entity\Role;
use Drupal\user\RoleInterface;
......@@ -23,7 +24,7 @@
* @group comment
* @group Access
*/
class CommentFieldAccessTest extends EntityUnitTestBase {
class CommentFieldAccessTest extends EntityKernelTestBase {
use CommentTestTrait;
......
core/modules/comment/src/Tests/CommentStringIdEntitiesTest.php → core/modules/comment/tests/src/Kernel/CommentStringIdEntitiesTest.php
View file @ 0db5b138
......@@ -2,13 +2,13 @@
/**
* @file
* Contains \Drupal\comment\Tests\CommentStringIdEntitiesTest.
* Contains \Drupal\Tests\comment\Kernel\CommentStringIdEntitiesTest.
*/
namespace Drupal\comment\Tests;
namespace Drupal\Tests\comment\Kernel;
use Drupal\comment\Entity\CommentType;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
use Drupal\field\Entity\FieldStorageConfig;
/**
......
core/modules/comment/src/Tests/CommentValidationTest.php → core/modules/comment/tests/src/Kernel/CommentValidationTest.php
View file @ 0db5b138
......@@ -2,14 +2,14 @@
/**
* @file
* Contains \Drupal\comment\Tests\CommentValidationTest.
* Contains \Drupal\Tests\comment\Kernel\CommentValidationTest.
*/
namespace Drupal\comment\Tests;
namespace Drupal\Tests\comment\Kernel;
use Drupal\comment\CommentInterface;
use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
use Drupal\node\Entity\Node;
use Drupal\system\Tests\Entity\EntityUnitTestBase;
use Drupal\user\Entity\User;
/**
......@@ -17,7 +17,7 @@
*
* @group comment
*/
class CommentValidationTest extends EntityUnitTestBase {
class CommentValidationTest extends EntityKernelTestBase {
/**
* Modules to install.
......
core/modules/config/src/Tests/AssertConfigEntityImportTrait.php
View file @ 0db5b138
......@@ -13,7 +13,7 @@
* Provides test assertions for testing config entity synchronization.
*
* Can be used by test classes that extend \Drupal\simpletest\WebTestBase or
* \Drupal\simpletest\KernelTestBase.
* \Drupal\KernelTests\KernelTestBase.
*/
trait AssertConfigEntityImportTrait {
......
core/modules/contact/src/Tests/MessageEntityTest.php → core/modules/contact/tests/src/Kernel/MessageEntityTest.php
View file @ 0db5b138
<?php
/**
* @file
* Contains \Drupal\contact\Tests\MessageEntityTest.
* Contains \Drupal\Tests\contact\Kernel\MessageEntityTest.
*/
namespace Drupal\contact\Tests;
namespace Drupal\Tests\contact\Kernel;
use Drupal\system\Tests\Entity\EntityUnitTestBase;
use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
/**
* Tests the message entity class.
......@@ -14,7 +14,7 @@
* @group contact
* @see \Drupal\contact\Entity\Message
*/
class MessageEntityTest extends EntityUnitTestBase {
class MessageEntityTest extends EntityKernelTestBase {
/**
* Modules to enable.
......
core/modules/content_translation/src/Tests/ContentTranslationConfigImportTest.php → core/modules/content_translation/tests/src/Kernel/ContentTranslationConfigImportTest.php
View file @ 0db5b138
......@@ -2,14 +2,14 @@
/**
* @file
* Contains \Drupal\content_translation\Tests\ContentTranslationConfigImportTest.
* Contains \Drupal\Tests\content_translation\Kernel\ContentTranslationConfigImportTest.
*/
namespace Drupal\content_translation\Tests;
namespace Drupal\Tests\content_translation\Kernel;
use Drupal\Core\Config\ConfigImporter;
use Drupal\Core\Config\StorageComparer;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
/**
* Tests content translation updates performed during config import.
......
core/modules/content_translation/src/Tests/ContentTranslationSettingsApiTest.php → core/modules/content_translation/tests/src/Kernel/ContentTranslationSettingsApiTest.php
View file @ 0db5b138
......@@ -2,12 +2,12 @@
/**
* @file
* Contains \Drupal\content_translation\Tests\ContentTranslationSettingsApiTest.
* Contains \Drupal\Tests\content_translation\Kernel\ContentTranslationSettingsApiTest.
*/
namespace Drupal\content_translation\Tests;
namespace Drupal\Tests\content_translation\Kernel;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
/**
* Tests the content translation settings API.
......
core/modules/content_translation/src/Tests/ContentTranslationSyncUnitTest.php → core/modules/content_translation/tests/src/Kernel/ContentTranslationSyncUnitTest.php
View file @ 0db5b138
......@@ -2,13 +2,13 @@
/**
* @file
* Contains \Drupal\content_translation\Tests\ContentTranslationSyncUnitTest.
* Contains \Drupal\Tests\content_translation\Kernel\ContentTranslationSyncUnitTest.
*/
namespace Drupal\content_translation\Tests;
namespace Drupal\Tests\content_translation\Kernel;
use Drupal\simpletest\KernelTestBase;
use Drupal\content_translation\FieldTranslationSynchronizer;
use Drupal\KernelTests\KernelTestBase;
/**
* Tests the field synchronization logic.
......
core/modules/contextual/src/Tests/ContextualUnitTest.php → core/modules/contextual/tests/src/Kernel/ContextualUnitTest.php
View file @ 0db5b138
......@@ -2,12 +2,12 @@
/**
* @file
* Contains \Drupal\contextual\Tests\ContextualUnitTest.
* Contains \Drupal\Tests\contextual\Kernel\ContextualUnitTest.
*/
namespace Drupal\contextual\Tests;
namespace Drupal\Tests\contextual\Kernel;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
/**
* Tests all edge cases of converting from #contextual_links to ids and vice
......
core/modules/dblog/src/Tests/DbLogFormInjectionTest.php → core/modules/dblog/tests/src/Kernel/DbLogFormInjectionTest.php
View file @ 0db5b138
<?php
/**
* @file
* Contains \Drupal\dblog\Tests\DbLogFormInjectionTest.
* Contains \Drupal\Tests\dblog\Kernel\DbLogFormInjectionTest.
*/
namespace Drupal\dblog\Tests;
namespace Drupal\Tests\dblog\Kernel;
use Drupal\Core\DependencyInjection\DependencySerializationTrait;
use Drupal\Core\Form\FormInterface;
use Drupal\Core\Form\FormState;
use Drupal\Core\Form\FormStateInterface;
use Drupal\simpletest\KernelTestBase;
use Drupal\KernelTests\KernelTestBase;
use Drupal\user\Entity\User;
/**
......
core/modules/editor/src/Tests/EditorFileReferenceFilterTest.php → core/modules/editor/tests/src/Kernel/EditorFileReferenceFilterTest.php
View file @ 0db5b138
......@@ -2,15 +2,15 @@
/**
* @file
* Contains \Drupal\editor\Tests\EditorFileReferenceFilterTest.
* Contains \Drupal\Tests\editor\Kernel\EditorFileReferenceFilterTest.
*/
namespace Drupal\editor\Tests;
namespace Drupal\Tests\editor\Kernel;
use Drupal\Core\Cache\Cache;
use Drupal\file\Entity\File;
use Drupal\simpletest\KernelTestBase;
use Drupal\filter\FilterPluginCollection;
use Drupal\KernelTests\KernelTestBase;
/**
* Tests Editor module's file reference filter.
......
core/modules/editor/src/Tests/EditorFileUsageTest.php → core/modules/editor/tests/src/Kernel/EditorFileUsageTest.php
View file @ 0db5b138
......@@ -2,16 +2,16 @@
/**
* @file
* Contains \Drupal\editor\Tests\EditorFileUsageTest.
* Contains \Drupal\Tests\editor\Kernel\EditorFileUsageTest.
*/
namespace Drupal\editor\Tests;
namespace Drupal\Tests\editor\Kernel;
use Drupal\editor\Entity\Editor;
use Drupal\KernelTests\Core\Entity\EntityKernelTestBase;
use Drupal\node\Entity\Node;
use Drupal\node\Entity\NodeType;
use Drupal\file\Entity\File;
use Drupal\system\Tests\Entity\EntityUnitTestBase;
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\filter\Entity\FilterFormat;
......@@ -21,7 +21,7 @@
*
* @group editor
*/
class EditorFileUsageTest extends EntityUnitTestBase {
class EditorFileUsageTest extends EntityKernelTestBase {
/**
* Modules to enable.
......