diff --git a/core/modules/comment/src/Tests/CommentItemTest.php b/core/modules/comment/tests/src/Kernel/CommentItemTest.php similarity index 88% rename from core/modules/comment/src/Tests/CommentItemTest.php rename to core/modules/comment/tests/src/Kernel/CommentItemTest.php index 9b28a58..4c8ed65 100644 --- a/core/modules/comment/src/Tests/CommentItemTest.php +++ b/core/modules/comment/tests/src/Kernel/CommentItemTest.php @@ -2,22 +2,23 @@ /** * @file - * Contains \Drupal\comment\Tests\CommentItemTest. + * Contains \Drupal\Tests\comment\Kernel\CommentItemTest. */ -namespace Drupal\comment\Tests; +namespace Drupal\Tests\comment\Kernel; use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface; +use Drupal\comment\Tests\CommentTestTrait; use Drupal\Core\Field\FieldItemListInterface; use Drupal\entity_test\Entity\EntityTest; -use Drupal\field\Tests\FieldUnitTestBase; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Tests the new entity API for the comment field type. * * @group comment */ -class CommentItemTest extends FieldUnitTestBase { +class CommentItemTest extends FieldKernelTestBase { use CommentTestTrait; diff --git a/core/modules/datetime/src/Tests/DateTimeItemTest.php b/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php similarity index 95% rename from core/modules/datetime/src/Tests/DateTimeItemTest.php rename to core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php index 03d72e9..0bf8d68 100644 --- a/core/modules/datetime/src/Tests/DateTimeItemTest.php +++ b/core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php @@ -2,16 +2,16 @@ /** * @file - * Contains \Drupal\datetime\Tests\DateTimeItemTest. + * Contains \Drupal\Tests\datetime\Kernel\DateTimeItemTest. */ -namespace Drupal\datetime\Tests; +namespace Drupal\Tests\datetime\Kernel; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\FieldItemInterface; use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; -use Drupal\field\Tests\FieldUnitTestBase; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; use Drupal\field\Entity\FieldStorageConfig; /** @@ -19,7 +19,7 @@ * * @group datetime */ -class DateTimeItemTest extends FieldUnitTestBase { +class DateTimeItemTest extends FieldKernelTestBase { /** * Modules to enable. diff --git a/core/modules/field/src/Tests/Boolean/BooleanFormatterTest.php b/core/modules/field/tests/src/Kernel/Boolean/BooleanFormatterTest.php similarity index 95% rename from core/modules/field/src/Tests/Boolean/BooleanFormatterTest.php rename to core/modules/field/tests/src/Kernel/Boolean/BooleanFormatterTest.php index 214590d..fb04f97 100644 --- a/core/modules/field/src/Tests/Boolean/BooleanFormatterTest.php +++ b/core/modules/field/tests/src/Kernel/Boolean/BooleanFormatterTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\field\Tests\Boolean\BooleanFormatterTest. + * Contains \Drupal\Tests\field\Kernel\Boolean\BooleanFormatterTest. */ -namespace Drupal\field\Tests\Boolean; +namespace Drupal\Tests\field\Kernel\Boolean; use Drupal\Component\Utility\Unicode; use Drupal\Core\Entity\Display\EntityViewDisplayInterface; @@ -13,7 +13,7 @@ use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; /** * Tests the boolean formatter. @@ -27,7 +27,7 @@ class BooleanFormatterTest extends KernelTestBase { * * @var array */ - public static $modules = ['field', 'text', 'entity_test', 'user']; + public static $modules = ['field', 'text', 'entity_test', 'user', 'system']; /** * @var string diff --git a/core/modules/field/src/Tests/Boolean/BooleanItemTest.php b/core/modules/field/tests/src/Kernel/Boolean/BooleanItemTest.php similarity index 91% rename from core/modules/field/src/Tests/Boolean/BooleanItemTest.php rename to core/modules/field/tests/src/Kernel/Boolean/BooleanItemTest.php index 8ae2259..68d6670 100644 --- a/core/modules/field/src/Tests/Boolean/BooleanItemTest.php +++ b/core/modules/field/tests/src/Kernel/Boolean/BooleanItemTest.php @@ -2,16 +2,16 @@ /** * @file - * Contains \Drupal\field\Tests\Boolean\BooleanItemTest. + * Contains \Drupal\Tests\field\Kernel\Boolean\BooleanItemTest. */ -namespace Drupal\field\Tests\Boolean; +namespace Drupal\Tests\field\Kernel\Boolean; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\FieldItemInterface; use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; -use Drupal\field\Tests\FieldUnitTestBase; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; use Drupal\field\Entity\FieldStorageConfig; /** @@ -19,7 +19,7 @@ * * @group field */ -class BooleanItemTest extends FieldUnitTestBase { +class BooleanItemTest extends FieldKernelTestBase { /** * {@inheritdoc} diff --git a/core/modules/field/src/Tests/BulkDeleteTest.php b/core/modules/field/tests/src/Kernel/BulkDeleteTest.php similarity index 98% rename from core/modules/field/src/Tests/BulkDeleteTest.php rename to core/modules/field/tests/src/Kernel/BulkDeleteTest.php index 2949867..73479d1 100644 --- a/core/modules/field/src/Tests/BulkDeleteTest.php +++ b/core/modules/field/tests/src/Kernel/BulkDeleteTest.php @@ -2,21 +2,22 @@ /** * @file - * Contains \Drupal\field\Tests\BulkDeleteTest. + * Contains \Drupal\Tests\field\Kernel\BulkDeleteTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\Core\Entity\EntityInterface; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Bulk delete storages and fields, and clean up afterwards. * * @group field */ -class BulkDeleteTest extends FieldUnitTestBase { +class BulkDeleteTest extends FieldKernelTestBase { /** * The fields to use in this test. diff --git a/core/modules/field/src/Tests/ConfigFieldDefinitionTest.php b/core/modules/field/tests/src/Kernel/ConfigFieldDefinitionTest.php similarity index 91% rename from core/modules/field/src/Tests/ConfigFieldDefinitionTest.php rename to core/modules/field/tests/src/Kernel/ConfigFieldDefinitionTest.php index 44e8c89..62fb2c3 100644 --- a/core/modules/field/src/Tests/ConfigFieldDefinitionTest.php +++ b/core/modules/field/tests/src/Kernel/ConfigFieldDefinitionTest.php @@ -2,20 +2,21 @@ /** * @file - * Contains \Drupal\field\Tests\ConfigFieldDefinitionTest. + * Contains \Drupal\Tests\field\Kernel\ConfigFieldDefinitionTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\Core\Field\FieldDefinitionInterface; use Drupal\Core\Field\FieldStorageDefinitionInterface; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Tests exposing field definitions for configurable fields. * * @group field */ -class ConfigFieldDefinitionTest extends FieldUnitTestBase { +class ConfigFieldDefinitionTest extends FieldKernelTestBase { /** * The entity manager service. diff --git a/core/modules/field/src/Tests/DisplayApiTest.php b/core/modules/field/tests/src/Kernel/DisplayApiTest.php similarity index 97% rename from core/modules/field/src/Tests/DisplayApiTest.php rename to core/modules/field/tests/src/Kernel/DisplayApiTest.php index 362699b..71373c4 100644 --- a/core/modules/field/src/Tests/DisplayApiTest.php +++ b/core/modules/field/tests/src/Kernel/DisplayApiTest.php @@ -2,22 +2,23 @@ /** * @file - * Contains \Drupal\field\Tests\DisplayApiTest. + * Contains \Drupal\Tests\field\Kernel\DisplayApiTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\Core\Entity\Entity\EntityViewMode; use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Tests the field display API. * * @group field */ -class DisplayApiTest extends FieldUnitTestBase { +class DisplayApiTest extends FieldKernelTestBase { /** * The field name to use in this test. @@ -61,6 +62,11 @@ class DisplayApiTest extends FieldUnitTestBase { */ protected $values; + /** + * {@inheritdoc} + */ + public static $modules = ['system']; + protected function setUp() { parent::setUp(); diff --git a/core/modules/field/src/Tests/Email/EmailItemTest.php b/core/modules/field/tests/src/Kernel/Email/EmailItemTest.php similarity index 91% rename from core/modules/field/src/Tests/Email/EmailItemTest.php rename to core/modules/field/tests/src/Kernel/Email/EmailItemTest.php index 4427e3f..76ed172 100644 --- a/core/modules/field/src/Tests/Email/EmailItemTest.php +++ b/core/modules/field/tests/src/Kernel/Email/EmailItemTest.php @@ -2,16 +2,16 @@ /** * @file - * Contains \Drupal\field\Tests\Email\EmailItemTest. + * Contains \Drupal\Tests\field\Kernel\Email\EmailItemTest. */ -namespace Drupal\field\Tests\Email; +namespace Drupal\Tests\field\Kernel\Email; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\FieldItemInterface; use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; -use Drupal\field\Tests\FieldUnitTestBase; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; use Drupal\field\Entity\FieldStorageConfig; /** @@ -19,7 +19,7 @@ * * @group field */ -class EmailItemTest extends FieldUnitTestBase { +class EmailItemTest extends FieldKernelTestBase { protected function setUp() { parent::setUp(); diff --git a/core/modules/field/src/Tests/EntityReference/EntityReferenceItemTest.php b/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php similarity index 98% rename from core/modules/field/src/Tests/EntityReference/EntityReferenceItemTest.php rename to core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php index 49dfa86..d949a9e 100644 --- a/core/modules/field/src/Tests/EntityReference/EntityReferenceItemTest.php +++ b/core/modules/field/tests/src/Kernel/EntityReference/EntityReferenceItemTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\field\Tests\EntityReference\EntityReferenceItemTest. + * Contains \Drupal\Tests\field\Kernel\EntityReference\EntityReferenceItemTest. */ -namespace Drupal\field\Tests\EntityReference; +namespace Drupal\Tests\field\Kernel\EntityReference; use Drupal\comment\Entity\Comment; use Drupal\Component\Render\FormattableMarkup; @@ -19,7 +19,8 @@ use Drupal\entity_test\Entity\EntityTestStringId; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; -use Drupal\field\Tests\FieldUnitTestBase; +use Drupal\field\Tests\EntityReference\EntityReferenceTestTrait; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; use Drupal\file\Entity\File; use Drupal\node\Entity\Node; use Drupal\taxonomy\Entity\Term; @@ -32,7 +33,7 @@ * * @group entity_reference */ -class EntityReferenceItemTest extends FieldUnitTestBase { +class EntityReferenceItemTest extends FieldKernelTestBase { use EntityReferenceTestTrait; diff --git a/core/modules/field/src/Tests/FieldAttachOtherTest.php b/core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php similarity index 98% rename from core/modules/field/src/Tests/FieldAttachOtherTest.php rename to core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php index 6c67793..6ee13af 100644 --- a/core/modules/field/src/Tests/FieldAttachOtherTest.php +++ b/core/modules/field/tests/src/Kernel/FieldAttachOtherTest.php @@ -2,13 +2,14 @@ /** * @file - * Contains \Drupal\field\Tests\FieldAttachOtherTest. + * Contains \Drupal\Tests\field\Kernel\FieldAttachOtherTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\Core\Form\FormState; use Drupal\entity_test\Entity\EntityTest; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Tests other Field API functions. @@ -16,7 +17,7 @@ * @group field * @todo move this to the Entity module */ -class FieldAttachOtherTest extends FieldUnitTestBase { +class FieldAttachOtherTest extends FieldKernelTestBase { protected function setUp() { parent::setUp(); diff --git a/core/modules/field/src/Tests/FieldAttachStorageTest.php b/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php similarity index 98% rename from core/modules/field/src/Tests/FieldAttachStorageTest.php rename to core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php index 596eb13..b9a4e45 100644 --- a/core/modules/field/src/Tests/FieldAttachStorageTest.php +++ b/core/modules/field/tests/src/Kernel/FieldAttachStorageTest.php @@ -2,13 +2,14 @@ /** * @file - * Contains \Drupal\field\Tests\FieldAttachStorageTest. + * Contains \Drupal\Tests\field\Kernel\FieldAttachStorageTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\Component\Utility\Unicode; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Tests storage-related Field Attach API functions. @@ -16,7 +17,7 @@ * @group field * @todo move this to the Entity module */ -class FieldAttachStorageTest extends FieldUnitTestBase { +class FieldAttachStorageTest extends FieldKernelTestBase { protected function setUp() { parent::setUp(); diff --git a/core/modules/field/src/Tests/FieldCrudTest.php b/core/modules/field/tests/src/Kernel/FieldCrudTest.php similarity index 98% rename from core/modules/field/src/Tests/FieldCrudTest.php rename to core/modules/field/tests/src/Kernel/FieldCrudTest.php index 72738ad..6959225 100644 --- a/core/modules/field/src/Tests/FieldCrudTest.php +++ b/core/modules/field/tests/src/Kernel/FieldCrudTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\field\Tests\FieldCrudTest. + * Contains \Drupal\Tests\field\Kernel\FieldCrudTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\Component\Utility\Unicode; use Drupal\Core\Entity\EntityStorageException; @@ -13,13 +13,14 @@ use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldStorageConfig; use Drupal\field\Entity\FieldConfig; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Create field entities by attaching fields to entities. * * @group field */ -class FieldCrudTest extends FieldUnitTestBase { +class FieldCrudTest extends FieldKernelTestBase { /** * The field storage entity. diff --git a/core/modules/field/src/Tests/FieldDataCountTest.php b/core/modules/field/tests/src/Kernel/FieldDataCountTest.php similarity index 97% rename from core/modules/field/src/Tests/FieldDataCountTest.php rename to core/modules/field/tests/src/Kernel/FieldDataCountTest.php index c146289..4f9e4bc 100644 --- a/core/modules/field/src/Tests/FieldDataCountTest.php +++ b/core/modules/field/tests/src/Kernel/FieldDataCountTest.php @@ -2,15 +2,16 @@ /** * @file - * Contains \Drupal\field\Tests\FieldDataCountTest. + * Contains \Drupal\Tests\field\Kernel\FieldDataCountTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\Core\Entity\Sql\SqlContentEntityStorage; use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Tests counting field data records and the hasData() method on @@ -20,7 +21,7 @@ * @see \Drupal\Core\Entity\FieldableEntityStorageInterface::countFieldData() * @see \Drupal\field\Entity\FieldStorageConfig::hasData() */ -class FieldDataCountTest extends FieldUnitTestBase { +class FieldDataCountTest extends FieldKernelTestBase { /** * @var \Drupal\Core\Entity\DynamicallyFieldableEntityStorageInterface diff --git a/core/modules/field/src/Tests/FieldImportChangeTest.php b/core/modules/field/tests/src/Kernel/FieldImportChangeTest.php similarity index 80% rename from core/modules/field/src/Tests/FieldImportChangeTest.php rename to core/modules/field/tests/src/Kernel/FieldImportChangeTest.php index 8cf3f9c..e22b1f3 100644 --- a/core/modules/field/src/Tests/FieldImportChangeTest.php +++ b/core/modules/field/tests/src/Kernel/FieldImportChangeTest.php @@ -2,26 +2,27 @@ /** * @file - * Contains \Drupal\field\Tests\FieldImportChangeTest. + * Contains \Drupal\Tests\field\Kernel\FieldImportChangeTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\field\Entity\FieldConfig; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Update field storage and fields during config change method invocation. * * @group field */ -class FieldImportChangeTest extends FieldUnitTestBase { +class FieldImportChangeTest extends FieldKernelTestBase { /** * Modules to enable. * * The default configuration provided by field_test_config is imported by - * \Drupal\field\Tests\FieldUnitTestBase::setUp() when it installs field - * configuration. + * \Drupal\Tests\field\Kernel\FieldKernelTestBase::setUp() when it installs + * field configuration. * * @var array */ diff --git a/core/modules/field/src/Tests/FieldImportCreateTest.php b/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php similarity index 94% rename from core/modules/field/src/Tests/FieldImportCreateTest.php rename to core/modules/field/tests/src/Kernel/FieldImportCreateTest.php index 82cb962..98b1e25 100644 --- a/core/modules/field/src/Tests/FieldImportCreateTest.php +++ b/core/modules/field/tests/src/Kernel/FieldImportCreateTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\field\Tests\FieldImportCreateTest. + * Contains \Drupal\Tests\field\Kernel\FieldImportCreateTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\field\Entity\FieldConfig; @@ -16,7 +16,7 @@ * * @group field */ -class FieldImportCreateTest extends FieldUnitTestBase { +class FieldImportCreateTest extends FieldKernelTestBase { /** * Tests creating field storages and fields during default config import. @@ -97,8 +97,8 @@ function testImportCreate() { $this->copyConfig($active, $sync); // Add the new files to the sync directory. - $src_dir = drupal_get_path('module', 'field_test_config') . '/sync'; - $target_dir = $this->configDirectories[CONFIG_SYNC_DIRECTORY]; + $src_dir = __DIR__ . '/../../modules/field_test_config/sync'; + $target_dir = config_get_config_directory(CONFIG_SYNC_DIRECTORY); $this->assertTrue(file_unmanaged_copy("$src_dir/$field_storage_config_name.yml", "$target_dir/$field_storage_config_name.yml")); $this->assertTrue(file_unmanaged_copy("$src_dir/$field_config_name.yml", "$target_dir/$field_config_name.yml")); $this->assertTrue(file_unmanaged_copy("$src_dir/$field_storage_config_name_2.yml", "$target_dir/$field_storage_config_name_2.yml")); diff --git a/core/modules/field/src/Tests/FieldImportDeleteTest.php b/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php similarity index 94% rename from core/modules/field/src/Tests/FieldImportDeleteTest.php rename to core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php index 279be69..ca3ef45 100644 --- a/core/modules/field/src/Tests/FieldImportDeleteTest.php +++ b/core/modules/field/tests/src/Kernel/FieldImportDeleteTest.php @@ -2,28 +2,29 @@ /** * @file - * Contains \Drupal\field\Tests\FieldImportDeleteTest. + * Contains \Drupal\Tests\field\Kernel\FieldImportDeleteTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\Component\Utility\SafeMarkup; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Delete field storages and fields during config delete method invocation. * * @group field */ -class FieldImportDeleteTest extends FieldUnitTestBase { +class FieldImportDeleteTest extends FieldKernelTestBase { /** * Modules to enable. * * The default configuration provided by field_test_config is imported by - * \Drupal\field\Tests\FieldUnitTestBase::setUp() when it installs field - * configuration. + * \Drupal\Tests\field\Kernel\FieldKernelTestBase::setUp() when it installs + * field configuration. * * @var array */ diff --git a/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php b/core/modules/field/tests/src/Kernel/FieldImportDeleteUninstallTest.php similarity index 96% rename from core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php rename to core/modules/field/tests/src/Kernel/FieldImportDeleteUninstallTest.php index 7cfed64..6e96fc5 100644 --- a/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php +++ b/core/modules/field/tests/src/Kernel/FieldImportDeleteUninstallTest.php @@ -2,14 +2,15 @@ /** * @file - * Contains \Drupal\field\Tests\FieldImportDeleteUninstallTest. + * Contains \Drupal\Tests\field\Kernel\FieldImportDeleteUninstallTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Delete field storages and fields during config synchronization and uninstall @@ -19,7 +20,7 @@ * @see \Drupal\field\ConfigImporterFieldPurger * @see field_config_import_steps_alter() */ -class FieldImportDeleteUninstallTest extends FieldUnitTestBase { +class FieldImportDeleteUninstallTest extends FieldKernelTestBase { /** * Modules to enable. diff --git a/core/modules/field/src/Tests/FieldUnitTestBase.php b/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php similarity index 97% rename from core/modules/field/src/Tests/FieldUnitTestBase.php rename to core/modules/field/tests/src/Kernel/FieldKernelTestBase.php index 3b05f98..0fc8cff 100644 --- a/core/modules/field/src/Tests/FieldUnitTestBase.php +++ b/core/modules/field/tests/src/Kernel/FieldKernelTestBase.php @@ -2,22 +2,22 @@ /** * @file - * Contains \Drupal\field\Tests\FieldUnitTestBase. + * Contains \Drupal\Tests\field\Kernel\FieldKernelTestBase. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\Component\Utility\Unicode; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\field\Entity\FieldConfig; -use Drupal\simpletest\KernelTestBase; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\KernelTests\KernelTestBase; /** * Parent class for Field API unit tests. */ -abstract class FieldUnitTestBase extends KernelTestBase { +abstract class FieldKernelTestBase extends KernelTestBase { /** * Modules to enable. diff --git a/core/modules/field/src/Tests/FieldStorageCrudTest.php b/core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php similarity index 98% rename from core/modules/field/src/Tests/FieldStorageCrudTest.php rename to core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php index 2b1dcee..1548af8 100644 --- a/core/modules/field/src/Tests/FieldStorageCrudTest.php +++ b/core/modules/field/tests/src/Kernel/FieldStorageCrudTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\field\Tests\FieldStorageCrudTest. + * Contains \Drupal\Tests\field\Kernel\FieldStorageCrudTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\Core\Entity\EntityStorageException; use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException; @@ -13,13 +13,14 @@ use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Tests field storage create, read, update, and delete. * * @group field */ -class FieldStorageCrudTest extends FieldUnitTestBase { +class FieldStorageCrudTest extends FieldKernelTestBase { /** * Modules to enable. diff --git a/core/modules/field/src/Tests/FieldTypePluginManagerTest.php b/core/modules/field/tests/src/Kernel/FieldTypePluginManagerTest.php similarity index 93% rename from core/modules/field/src/Tests/FieldTypePluginManagerTest.php rename to core/modules/field/tests/src/Kernel/FieldTypePluginManagerTest.php index 68e09d8..76afec4 100644 --- a/core/modules/field/src/Tests/FieldTypePluginManagerTest.php +++ b/core/modules/field/tests/src/Kernel/FieldTypePluginManagerTest.php @@ -2,21 +2,22 @@ /** * @file - * Contains \Drupal\field\Tests\FieldTypePluginManagerTest. + * Contains \Drupal\Tests\field\Kernel\FieldTypePluginManagerTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\Component\Utility\SafeMarkup; use Drupal\Core\Field\BaseFieldDefinition; use Drupal\entity_test\Entity\EntityTest; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Tests the field type manager. * * @group field */ -class FieldTypePluginManagerTest extends FieldUnitTestBase { +class FieldTypePluginManagerTest extends FieldKernelTestBase { /** * Tests the default settings convenience methods. diff --git a/core/modules/field/src/Tests/FieldValidationTest.php b/core/modules/field/tests/src/Kernel/FieldValidationTest.php similarity index 94% rename from core/modules/field/src/Tests/FieldValidationTest.php rename to core/modules/field/tests/src/Kernel/FieldValidationTest.php index 8f51b7a..d3a5059 100644 --- a/core/modules/field/src/Tests/FieldValidationTest.php +++ b/core/modules/field/tests/src/Kernel/FieldValidationTest.php @@ -2,17 +2,17 @@ /** * @file - * Contains \Drupal\field\Tests\FieldValidationTest. + * Contains \Drupal\Tests\field\Kernel\FieldValidationTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; /** * Tests field validation. * * @group field */ -class FieldValidationTest extends FieldUnitTestBase { +class FieldValidationTest extends FieldKernelTestBase { /** * @var string diff --git a/core/modules/field/src/Tests/FormatterPluginManagerTest.php b/core/modules/field/tests/src/Kernel/FormatterPluginManagerTest.php similarity index 89% rename from core/modules/field/src/Tests/FormatterPluginManagerTest.php rename to core/modules/field/tests/src/Kernel/FormatterPluginManagerTest.php index bc1c635..88edb05 100644 --- a/core/modules/field/src/Tests/FormatterPluginManagerTest.php +++ b/core/modules/field/tests/src/Kernel/FormatterPluginManagerTest.php @@ -2,10 +2,11 @@ /** * @file - * Contains \Drupal\field\Tests\FormatterPluginManagerTest. + * Contains \Drupal\Tests\field\Kernel\FormatterPluginManagerTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; + use Drupal\Core\Field\BaseFieldDefinition; use Drupal\Core\Field\FormatterPluginManager; @@ -14,7 +15,7 @@ * * @group field */ -class FormatterPluginManagerTest extends FieldUnitTestBase { +class FormatterPluginManagerTest extends FieldKernelTestBase { /** * Tests that getInstance falls back on default if current is not applicable. diff --git a/core/modules/field/src/Tests/Number/NumberItemTest.php b/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php similarity index 94% rename from core/modules/field/src/Tests/Number/NumberItemTest.php rename to core/modules/field/tests/src/Kernel/Number/NumberItemTest.php index 8e99d97..1cdf05b 100644 --- a/core/modules/field/src/Tests/Number/NumberItemTest.php +++ b/core/modules/field/tests/src/Kernel/Number/NumberItemTest.php @@ -2,16 +2,16 @@ /** * @file - * Contains \Drupal\field\Tests\Number\NumberItemTest. + * Contains \Drupal\Tests\field\Kernel\Number\NumberItemTest. */ -namespace Drupal\field\Tests\Number; +namespace Drupal\Tests\field\Kernel\Number; use Drupal\Core\Field\FieldItemInterface; use Drupal\Core\Field\FieldItemListInterface; use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; -use Drupal\field\Tests\FieldUnitTestBase; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; use Drupal\field\Entity\FieldStorageConfig; /** @@ -19,7 +19,7 @@ * * @group field */ -class NumberItemTest extends FieldUnitTestBase { +class NumberItemTest extends FieldKernelTestBase { /** * Modules to enable. diff --git a/core/modules/field/src/Tests/ShapeItemTest.php b/core/modules/field/tests/src/Kernel/ShapeItemTest.php similarity index 93% rename from core/modules/field/src/Tests/ShapeItemTest.php rename to core/modules/field/tests/src/Kernel/ShapeItemTest.php index 0a000ad..ce96c82 100644 --- a/core/modules/field/src/Tests/ShapeItemTest.php +++ b/core/modules/field/tests/src/Kernel/ShapeItemTest.php @@ -2,23 +2,24 @@ /** * @file - * Contains \Drupal\field\Tests\ShapeItemTest. + * Contains \Drupal\Tests\field\Kernel\ShapeItemTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\Core\Field\FieldItemInterface; use Drupal\Core\Field\FieldItemListInterface; use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Tests the new entity API for the shape field type. * * @group field */ -class ShapeItemTest extends FieldUnitTestBase { +class ShapeItemTest extends FieldKernelTestBase { /** * Modules to enable. diff --git a/core/modules/field/src/Tests/String/RawStringFormatterTest.php b/core/modules/field/tests/src/Kernel/String/RawStringFormatterTest.php similarity index 95% rename from core/modules/field/src/Tests/String/RawStringFormatterTest.php rename to core/modules/field/tests/src/Kernel/String/RawStringFormatterTest.php index a11b9f6..d47dbca 100644 --- a/core/modules/field/src/Tests/String/RawStringFormatterTest.php +++ b/core/modules/field/tests/src/Kernel/String/RawStringFormatterTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\field\Tests\String\RawStringFormatterTest. + * Contains \Drupal\Tests\field\Kernel\String\RawStringFormatterTest. */ -namespace Drupal\field\Tests\String; +namespace Drupal\Tests\field\Kernel\String; use Drupal\Component\Utility\Html; use Drupal\Component\Utility\Unicode; @@ -14,7 +14,7 @@ use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; /** * Tests the raw string formatter diff --git a/core/modules/field/src/Tests/String/StringFormatterTest.php b/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php similarity index 96% rename from core/modules/field/src/Tests/String/StringFormatterTest.php rename to core/modules/field/tests/src/Kernel/String/StringFormatterTest.php index c61e4bf..af2c679 100644 --- a/core/modules/field/src/Tests/String/StringFormatterTest.php +++ b/core/modules/field/tests/src/Kernel/String/StringFormatterTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\field\Tests\String\StringFormatterTest. + * Contains \Drupal\Tests\field\Kernel\String\StringFormatterTest. */ -namespace Drupal\field\Tests\String; +namespace Drupal\Tests\field\Kernel\String; use Drupal\Component\Utility\Html; use Drupal\Component\Utility\Unicode; @@ -14,7 +14,7 @@ use Drupal\entity_test\Entity\EntityTestRev; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; /** * Tests the creation of text fields. diff --git a/core/modules/field/src/Tests/String/UuidFormatterTest.php b/core/modules/field/tests/src/Kernel/String/UuidFormatterTest.php similarity index 91% rename from core/modules/field/src/Tests/String/UuidFormatterTest.php rename to core/modules/field/tests/src/Kernel/String/UuidFormatterTest.php index def8060..f25b49d 100644 --- a/core/modules/field/src/Tests/String/UuidFormatterTest.php +++ b/core/modules/field/tests/src/Kernel/String/UuidFormatterTest.php @@ -2,13 +2,13 @@ /** * @file - * Contains \Drupal\field\Tests\String\UuidFormatterTest. + * Contains \Drupal\Tests\field\Kernel\String\UuidFormatterTest. */ -namespace Drupal\field\Tests\String; +namespace Drupal\Tests\field\Kernel\String; -use Drupal\simpletest\KernelTestBase; use Drupal\entity_test\Entity\EntityTest; +use Drupal\KernelTests\KernelTestBase; /** * Tests the output of a UUID field. diff --git a/core/modules/field/src/Tests/TestItemTest.php b/core/modules/field/tests/src/Kernel/TestItemTest.php similarity index 93% rename from core/modules/field/src/Tests/TestItemTest.php rename to core/modules/field/tests/src/Kernel/TestItemTest.php index 08b0bae..71ba07b 100644 --- a/core/modules/field/src/Tests/TestItemTest.php +++ b/core/modules/field/tests/src/Kernel/TestItemTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\field\Tests\TestItemTest. + * Contains \Drupal\Tests\field\Kernel\TestItemTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\Core\Field\BaseFieldDefinition; use Drupal\Core\Field\FieldItemInterface; @@ -13,13 +13,14 @@ use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Tests the new entity API for the test field type. * * @group field */ -class TestItemTest extends FieldUnitTestBase { +class TestItemTest extends FieldKernelTestBase { /** * Modules to enable. diff --git a/core/modules/field/src/Tests/TestItemWithDependenciesTest.php b/core/modules/field/tests/src/Kernel/TestItemWithDependenciesTest.php similarity index 85% rename from core/modules/field/src/Tests/TestItemWithDependenciesTest.php rename to core/modules/field/tests/src/Kernel/TestItemWithDependenciesTest.php index 16d5a78..b98471c 100644 --- a/core/modules/field/src/Tests/TestItemWithDependenciesTest.php +++ b/core/modules/field/tests/src/Kernel/TestItemWithDependenciesTest.php @@ -2,20 +2,21 @@ /** * @file - * Contains \Drupal\field\Tests\TestItemWithDependenciesTest. + * Contains \Drupal\Tests\field\Kernel\TestItemWithDependenciesTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Tests the new entity API for the test field with dependencies type. * * @group field */ -class TestItemWithDependenciesTest extends FieldUnitTestBase { +class TestItemWithDependenciesTest extends FieldKernelTestBase { /** * Modules to enable. diff --git a/core/modules/field/src/Tests/Timestamp/TimestampFormatterTest.php b/core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php similarity index 95% rename from core/modules/field/src/Tests/Timestamp/TimestampFormatterTest.php rename to core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php index 2323b15..12f4653 100644 --- a/core/modules/field/src/Tests/Timestamp/TimestampFormatterTest.php +++ b/core/modules/field/tests/src/Kernel/Timestamp/TimestampFormatterTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\field\Tests\Timestamp\TimestampFormatterTest. + * Contains \Drupal\Tests\field\Kernel\Timestamp\TimestampFormatterTest. */ -namespace Drupal\field\Tests\Timestamp; +namespace Drupal\Tests\field\Kernel\Timestamp; use Drupal\Component\Utility\SafeMarkup; use Drupal\Component\Utility\Unicode; @@ -14,7 +14,7 @@ use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; /** * Tests the timestamp formatters. @@ -104,7 +104,7 @@ protected function renderEntityFields(FieldableEntityInterface $entity, EntityVi /** * Tests TimestampFormatter. */ - protected function testTimestampFormatter() { + public function testTimestampFormatter() { $data = []; // Test standard formats. @@ -142,7 +142,7 @@ protected function testTimestampFormatter() { /** * Tests TimestampAgoFormatter. */ - protected function testTimestampAgoFormatter() { + public function testTimestampAgoFormatter() { $data = []; foreach (array(1, 2, 3, 4, 5, 6) as $granularity) { diff --git a/core/modules/field/src/Tests/TranslationTest.php b/core/modules/field/tests/src/Kernel/TranslationTest.php similarity index 94% rename from core/modules/field/src/Tests/TranslationTest.php rename to core/modules/field/tests/src/Kernel/TranslationTest.php index efe1b7a..3a11b85 100644 --- a/core/modules/field/src/Tests/TranslationTest.php +++ b/core/modules/field/tests/src/Kernel/TranslationTest.php @@ -2,13 +2,14 @@ /** * @file - * Contains \Drupal\field\Tests\TranslationTest. + * Contains \Drupal\Tests\field\Kernel\TranslationTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\Component\Utility\Unicode; use Drupal\field\Entity\FieldConfig; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; use Drupal\language\Entity\ConfigurableLanguage; use Drupal\field\Entity\FieldStorageConfig; @@ -19,7 +20,7 @@ * * @group field */ -class TranslationTest extends FieldUnitTestBase { +class TranslationTest extends FieldKernelTestBase { /** * Modules to enable. @@ -193,7 +194,7 @@ function testTranslatableFieldSaveLoad() { } foreach ($entity->getTranslationLanguages() as $langcode => $language) { - $this->assertEqual($entity->getTranslation($langcode)->{$field_name_default}->getValue(), $empty_items, format_string('Empty value correctly populated for language %language.', array('%language' => $langcode))); + $this->assertEquals([], $entity->getTranslation($langcode)->{$field_name_default}->getValue(), format_string('Empty value correctly populated for language %language.', array('%language' => $langcode))); } } } diff --git a/core/modules/field/src/Tests/Uri/UriItemTest.php b/core/modules/field/tests/src/Kernel/Uri/UriItemTest.php similarity index 89% rename from core/modules/field/src/Tests/Uri/UriItemTest.php rename to core/modules/field/tests/src/Kernel/Uri/UriItemTest.php index ddef127..9d11ccd 100644 --- a/core/modules/field/src/Tests/Uri/UriItemTest.php +++ b/core/modules/field/tests/src/Kernel/Uri/UriItemTest.php @@ -2,16 +2,16 @@ /** * @file - * Contains \Drupal\field\Tests\Uri\UriItemTest. + * Contains \Drupal\Tests\field\Kernel\Uri\UriItemTest. */ -namespace Drupal\field\Tests\Uri; +namespace Drupal\Tests\field\Kernel\Uri; use Drupal\Component\Utility\Unicode; use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; -use Drupal\field\Tests\FieldUnitTestBase; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Tests URI field functionality. @@ -20,7 +20,7 @@ * * @group field */ -class UriItemTest extends FieldUnitTestBase { +class UriItemTest extends FieldKernelTestBase { /** * A field to use in this test class. diff --git a/core/modules/field/src/Tests/WidgetPluginManagerTest.php b/core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php similarity index 90% rename from core/modules/field/src/Tests/WidgetPluginManagerTest.php rename to core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php index d475541..564f4fa 100644 --- a/core/modules/field/src/Tests/WidgetPluginManagerTest.php +++ b/core/modules/field/tests/src/Kernel/WidgetPluginManagerTest.php @@ -2,19 +2,20 @@ /** * @file - * Contains \Drupal\field\Tests\WidgetPluginManagerTest. + * Contains \Drupal\Tests\field\Kernel\WidgetPluginManagerTest. */ -namespace Drupal\field\Tests; +namespace Drupal\Tests\field\Kernel; use Drupal\Core\Field\BaseFieldDefinition; use Drupal\Core\Field\WidgetPluginManager; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; /** * Tests the field widget manager. * * @group field */ -class WidgetPluginManagerTest extends FieldUnitTestBase { +class WidgetPluginManagerTest extends FieldKernelTestBase { /** * Tests that the widget definitions alter hook works. diff --git a/core/modules/file/src/Tests/FileItemTest.php b/core/modules/file/tests/src/Kernel/FileItemTest.php similarity index 96% rename from core/modules/file/src/Tests/FileItemTest.php rename to core/modules/file/tests/src/Kernel/FileItemTest.php index 2941f4c..b74e227 100644 --- a/core/modules/file/src/Tests/FileItemTest.php +++ b/core/modules/file/tests/src/Kernel/FileItemTest.php @@ -2,17 +2,17 @@ /** * @file - * Contains \Drupal\file\Tests\FileItemTest. + * Contains \Drupal\Tests\file\Kernel\FileItemTest. */ -namespace Drupal\file\Tests; +namespace Drupal\Tests\file\Kernel; use Drupal\Core\Field\FieldItemInterface; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; -use Drupal\field\Tests\FieldUnitTestBase; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; use Drupal\field\Entity\FieldStorageConfig; use Drupal\file\Entity\File; @@ -21,7 +21,7 @@ * * @group file */ -class FileItemTest extends FieldUnitTestBase { +class FileItemTest extends FieldKernelTestBase { /** * Modules to enable. diff --git a/core/modules/image/src/Tests/ImageItemTest.php b/core/modules/image/tests/src/Kernel/ImageItemTest.php similarity index 96% rename from core/modules/image/src/Tests/ImageItemTest.php rename to core/modules/image/tests/src/Kernel/ImageItemTest.php index 4682611..8eb7946 100644 --- a/core/modules/image/src/Tests/ImageItemTest.php +++ b/core/modules/image/tests/src/Kernel/ImageItemTest.php @@ -2,17 +2,17 @@ /** * @file - * Contains \Drupal\image\Tests\ImageItemTest. + * Contains \Drupal\Tests\image\Kernel\ImageItemTest. */ -namespace Drupal\image\Tests; +namespace Drupal\Tests\image\Kernel; use Drupal\Core\Field\FieldItemInterface; use Drupal\Core\Field\FieldItemListInterface; use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; -use Drupal\field\Tests\FieldUnitTestBase; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; use Drupal\field\Entity\FieldStorageConfig; use Drupal\file\Entity\File; @@ -21,7 +21,7 @@ * * @group image */ -class ImageItemTest extends FieldUnitTestBase { +class ImageItemTest extends FieldKernelTestBase { /** * Modules to enable. diff --git a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php index 96064a1..9245ba3 100644 --- a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php +++ b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkFormatter.php @@ -207,7 +207,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) { // field template wrapper, and set the URL value in a content // attribute. // @todo Does RDF need a URL rather than an internal URI here? - // @see \Drupal\rdf\Tests\Field\LinkFieldRdfaTest. + // @see \Drupal\Tests\rdf\Kernel\Field\LinkFieldRdfaTest. $content = str_replace('internal:/', '', $item->uri); $item->_attributes += array('content' => $content); } diff --git a/core/modules/link/src/Tests/LinkItemTest.php b/core/modules/link/tests/src/Kernel/LinkItemTest.php similarity index 97% rename from core/modules/link/src/Tests/LinkItemTest.php rename to core/modules/link/tests/src/Kernel/LinkItemTest.php index 870dc1a..342d8ed 100644 --- a/core/modules/link/src/Tests/LinkItemTest.php +++ b/core/modules/link/tests/src/Kernel/LinkItemTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\link\Tests\LinkItemTest. + * Contains \Drupal\Tests\link\Kernel\LinkItemTest. */ -namespace Drupal\link\Tests; +namespace Drupal\Tests\link\Kernel; use Drupal\Component\Utility\UrlHelper; use Drupal\Core\Field\FieldItemListInterface; @@ -13,7 +13,7 @@ use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; -use Drupal\field\Tests\FieldUnitTestBase; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; use Drupal\link\LinkItemInterface; /** @@ -21,7 +21,7 @@ * * @group link */ -class LinkItemTest extends FieldUnitTestBase { +class LinkItemTest extends FieldKernelTestBase { /** * Modules to enable. diff --git a/core/modules/options/src/Tests/OptionsFieldTest.php b/core/modules/options/tests/src/Kernel/OptionsFieldTest.php similarity index 96% rename from core/modules/options/src/Tests/OptionsFieldTest.php rename to core/modules/options/tests/src/Kernel/OptionsFieldTest.php index 402c9b4..4eb5f1d 100644 --- a/core/modules/options/src/Tests/OptionsFieldTest.php +++ b/core/modules/options/tests/src/Kernel/OptionsFieldTest.php @@ -2,15 +2,16 @@ /** * @file - * Contains \Drupal\options\Tests\OptionsFieldTest. + * Contains \Drupal\Tests\options\Kernel\OptionsFieldTest. */ -namespace Drupal\options\Tests; +namespace Drupal\Tests\options\Kernel; use Drupal\Core\Entity\Exception\FieldStorageDefinitionUpdateForbiddenException; use Drupal\entity_test\Entity\EntityTest; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; +use Drupal\Tests\options\Kernel\OptionsFieldUnitTestBase; /** * Tests for the 'Options' field types. diff --git a/core/modules/options/src/Tests/OptionsFieldUnitTestBase.php b/core/modules/options/tests/src/Kernel/OptionsFieldUnitTestBase.php similarity index 88% rename from core/modules/options/src/Tests/OptionsFieldUnitTestBase.php rename to core/modules/options/tests/src/Kernel/OptionsFieldUnitTestBase.php index 14d4b8d..33eab18 100644 --- a/core/modules/options/src/Tests/OptionsFieldUnitTestBase.php +++ b/core/modules/options/tests/src/Kernel/OptionsFieldUnitTestBase.php @@ -2,19 +2,19 @@ /** * @file - * Contains \Drupal\options\Tests\OptionsFieldUnitTestBase. + * Contains \Drupal\Tests\options\Kernel\OptionsFieldUnitTestBase. */ -namespace Drupal\options\Tests; +namespace Drupal\Tests\options\Kernel; use Drupal\field\Entity\FieldConfig; -use Drupal\field\Tests\FieldUnitTestBase; +use Drupal\Tests\field\Kernel\FieldKernelTestBase; use Drupal\field\Entity\FieldStorageConfig; /** * Base class for Options module integration tests. */ -abstract class OptionsFieldUnitTestBase extends FieldUnitTestBase { +abstract class OptionsFieldUnitTestBase extends FieldKernelTestBase { /** * Modules to enable. diff --git a/core/modules/options/src/Tests/OptionsFormattersTest.php b/core/modules/options/tests/src/Kernel/OptionsFormattersTest.php similarity index 86% rename from core/modules/options/src/Tests/OptionsFormattersTest.php rename to core/modules/options/tests/src/Kernel/OptionsFormattersTest.php index eb63051..6e7ae11 100644 --- a/core/modules/options/src/Tests/OptionsFormattersTest.php +++ b/core/modules/options/tests/src/Kernel/OptionsFormattersTest.php @@ -2,12 +2,13 @@ /** * @file - * Contains \Drupal\options\Tests\OptionsFormattersTest. + * Contains \Drupal\Tests\options\Kernel\OptionsFormattersTest. */ -namespace Drupal\options\Tests; +namespace Drupal\Tests\options\Kernel; use Drupal\entity_test\Entity\EntityTest; +use Drupal\Tests\options\Kernel\OptionsFieldUnitTestBase; /** * Tests the Options field type formatters. diff --git a/core/modules/rdf/src/Tests/Field/DateTimeFieldRdfaTest.php b/core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php similarity index 88% rename from core/modules/rdf/src/Tests/Field/DateTimeFieldRdfaTest.php rename to core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php index 97b3c9a..33f6d1c 100644 --- a/core/modules/rdf/src/Tests/Field/DateTimeFieldRdfaTest.php +++ b/core/modules/rdf/tests/src/Kernel/Field/DateTimeFieldRdfaTest.php @@ -1,12 +1,13 @@ debug) { - debug($output); - debug($graph->toRdfPhp()); + print_r($output); + print_r($graph->toRdfPhp()); } $this->assertTrue($graph->hasProperty($this->uri, $property, $expected_rdf_value), "Formatter {$formatter['type']} exposes data correctly for {$this->fieldType} fields."); diff --git a/core/modules/rdf/src/Tests/Field/LinkFieldRdfaTest.php b/core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php similarity index 96% rename from core/modules/rdf/src/Tests/Field/LinkFieldRdfaTest.php rename to core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php index 01e6977..405ba23 100644 --- a/core/modules/rdf/src/Tests/Field/LinkFieldRdfaTest.php +++ b/core/modules/rdf/tests/src/Kernel/Field/LinkFieldRdfaTest.php @@ -1,12 +1,13 @@ 'RouteProvider'] as $original_id => $class) { // While $container->get() does a recursive resolve, getDefinition() does // not, so do it ourselves. - foreach (['router.route_provider' => 'RouteProvider'] as $original_id => $class) { - for ($id = $original_id; $container->hasAlias($id); $id = (string) $container->getAlias($id)); - $definition = $container->getDefinition($id); - $definition->clearTag('needs_destruction'); - $container->setDefinition("simpletest.$original_id", $definition); - $container->setDefinition($id, new Definition('Drupal\simpletest\\' . $class)); - } + for ($id = $original_id; $container->hasAlias($id); $id = (string) $container->getAlias($id)); + $definition = $container->getDefinition($id); + $definition->clearTag('needs_destruction'); + $container->setDefinition("simpletest.$original_id", $definition); + $container->setDefinition($id, new Definition('Drupal\simpletest\\' . $class)); } } + } diff --git a/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php b/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php index fda12f1..b96ea79 100644 --- a/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php +++ b/core/modules/simpletest/tests/src/Unit/TestInfoParsingTest.php @@ -5,7 +5,7 @@ * Contains \Drupal\Tests\simpletest\Unit\TestInfoParsingTest. */ -namespace Drupal\Tests\simpletest\Unit; +namespace Drupal\Tests\simpletest\Unit { use Composer\Autoload\ClassLoader; use Drupal\Core\Extension\Extension; @@ -87,18 +87,18 @@ public function infoParserProvider() { $tests[] = [ // Expected result. [ - 'name' => 'Drupal\field\Tests\BulkDeleteTest', - 'group' => 'field', - 'description' => 'Bulk delete storages and fields, and clean up afterwards.', + 'name' => 'Drupal\simpletest\Tests\ExampleSimpleTest', + 'group' => 'simpletest', + 'description' => 'Tests the Simpletest UI internal browser.', 'type' => 'Simpletest', ], // Classname. - 'Drupal\field\Tests\BulkDeleteTest', + 'Drupal\simpletest\Tests\ExampleSimpleTest', // Doc block. "/** - * Bulk delete storages and fields, and clean up afterwards. + * Tests the Simpletest UI internal browser. * - * @group field + * @group simpletest */ ", ]; @@ -107,18 +107,19 @@ public function infoParserProvider() { $tests[] = [ // Expected result. [ - 'name' => 'Drupal\field\Tests\BulkDeleteTest', - 'group' => 'field', - 'description' => 'Bulk delete storages and fields, and clean up afterwards.', - 'type' => 'Simpletest' + 'name' => 'Drupal\simpletest\Tests\ExampleSimpleTest', + 'group' => 'simpletest', + 'description' => 'Tests the Simpletest UI internal browser.', + 'type' => 'Simpletest', ], // Classname. - 'Drupal\field\Tests\BulkDeleteTest', + 'Drupal\simpletest\Tests\ExampleSimpleTest', // Doc block. "/** - * Bulk delete storages and fields, and clean up afterwards. + * Tests the Simpletest UI internal browser. * - * @group field + * @group simpletest + */ */ ", ]; @@ -128,18 +129,18 @@ public function infoParserProvider() { $tests[] = [ // Expected result. [ - 'name' => 'Drupal\field\Tests\BulkDeleteTest', - 'group' => 'field', - 'description' => 'Bulk delete storages and fields, and clean up afterwards. * @', - 'type' => 'Simpletest' + 'name' => 'Drupal\simpletest\Tests\ExampleSimpleTest', + 'group' => 'simpletest', + 'description' => 'Tests the Simpletest UI internal browser. * @', + 'type' => 'Simpletest', ], // Classname. - 'Drupal\field\Tests\BulkDeleteTest', + 'Drupal\simpletest\Tests\ExampleSimpleTest', // Doc block. "/** - * Bulk delete storages and fields, and clean up afterwards. * @ + * Tests the Simpletest UI internal browser. * @ * - * @group field + * @group simpletest */ ", ]; @@ -148,19 +149,19 @@ public function infoParserProvider() { $tests[] = [ // Expected result. [ - 'name' => 'Drupal\field\Tests\BulkDeleteTest', + 'name' => 'Drupal\simpletest\Tests\ExampleSimpleTest', 'group' => 'Test', - 'description' => 'Bulk delete storages and fields, and clean up afterwards.', - 'type' => 'Simpletest' + 'description' => 'Tests the Simpletest UI internal browser.', + 'type' => 'Simpletest', ], // Classname. - 'Drupal\field\Tests\BulkDeleteTest', + 'Drupal\simpletest\Tests\ExampleSimpleTest', // Doc block. "/** - * Bulk delete storages and fields, and clean up afterwards. + * Tests the Simpletest UI internal browser. * * @group Test - * @group field + * @group simpletest */ ", ]; @@ -169,20 +170,20 @@ public function infoParserProvider() { $tests[] = [ // Expected result. [ - 'name' => 'Drupal\field\Tests\BulkDeleteTest', - 'group' => 'field', - 'description' => 'Bulk delete storages and fields, and clean up afterwards.', + 'name' => 'Drupal\simpletest\Tests\ExampleSimpleTest', + 'description' => 'Tests the Simpletest UI internal browser.', + 'type' => 'Simpletest', 'requires' => ['module' => ['test']], - 'type' => 'Simpletest' + 'group' => 'simpletest', ], // Classname. - 'Drupal\field\Tests\BulkDeleteTest', + 'Drupal\simpletest\Tests\ExampleSimpleTest', // Doc block. "/** - * Bulk delete storages and fields, and clean up afterwards. + * Tests the Simpletest UI internal browser. * * @dependencies test - * @group field + * @group simpletest */ ", ]; @@ -191,20 +192,20 @@ public function infoParserProvider() { $tests[] = [ // Expected result. [ - 'name' => 'Drupal\field\Tests\BulkDeleteTest', - 'group' => 'field', - 'description' => 'Bulk delete storages and fields, and clean up afterwards.', + 'name' => 'Drupal\simpletest\Tests\ExampleSimpleTest', + 'description' => 'Tests the Simpletest UI internal browser.', + 'type' => 'Simpletest', 'requires' => ['module' => ['test', 'test1', 'test2']], - 'type' => 'Simpletest' + 'group' => 'simpletest', ], // Classname. - 'Drupal\field\Tests\BulkDeleteTest', + 'Drupal\simpletest\Tests\ExampleSimpleTest', // Doc block. "/** - * Bulk delete storages and fields, and clean up afterwards. + * Tests the Simpletest UI internal browser. * - * @dependencies test, test1,test2 - * @group field + * @dependencies test, test1, test2 + * @group simpletest */ ", ]; @@ -213,18 +214,19 @@ public function infoParserProvider() { $tests[] = [ // Expected result. [ - 'name' => 'Drupal\field\Tests\BulkDeleteTest', - 'group' => 'field', - 'description' => 'Bulk delete storages and fields, and clean up afterwards. And the summary line continues and there is no gap to the annotation.', - 'type' => 'Simpletest' + 'name' => 'Drupal\simpletest\Tests\ExampleSimpleTest', + 'description' => 'Tests the Simpletest UI internal browser. And the summary line continues an there is no gap to the annotation.', + 'type' => 'Simpletest', + 'group' => 'simpletest', ], // Classname. - 'Drupal\field\Tests\BulkDeleteTest', + 'Drupal\simpletest\Tests\ExampleSimpleTest', // Doc block. "/** - * Bulk delete storages and fields, and clean up afterwards. And the summary - * line continues and there is no gap to the annotation. - * @group field + * Tests the Simpletest UI internal browser. And the summary line continues an + * there is no gap to the annotation. + * + * @group simpletest */ ", ]; @@ -234,10 +236,10 @@ public function infoParserProvider() { /** * @covers ::getTestInfo * @expectedException \Drupal\simpletest\Exception\MissingGroupException - * @expectedExceptionMessage Missing @group annotation in Drupal\field\Tests\BulkDeleteTest + * @expectedExceptionMessage Missing @group annotation in Drupal\KernelTests\field\BulkDeleteTest */ public function testTestInfoParserMissingGroup() { - $classname = 'Drupal\field\Tests\BulkDeleteTest'; + $classname = 'Drupal\KernelTests\field\BulkDeleteTest'; $doc_comment = <<installEntitySchema('entity_test_mul'); $this->installEntitySchema('entity_test_admin_routes'); - $router_builder = \Drupal::service('router.builder'); - $router_builder->rebuild(); - - /** @var \Drupal\Core\Routing\RouteBuilderInterface $router_builder */ - $router_builder = \Drupal::service('router.builder'); - $router_builder->rebuild(); - /** @var \Drupal\user\RoleInterface $role */ $role = Role::create([ 'id' => RoleInterface::ANONYMOUS_ID diff --git a/core/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php index 25ca3b7..9556fc6 100644 --- a/core/tests/Drupal/KernelTests/KernelTestBase.php +++ b/core/tests/Drupal/KernelTests/KernelTestBase.php @@ -25,6 +25,7 @@ use Drupal\simpletest\AssertContentTrait; use Drupal\simpletest\AssertHelperTrait; use Drupal\simpletest\RandomGeneratorTrait; +use Drupal\simpletest\TestServiceProvider; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\HttpFoundation\Request; use org\bovigo\vfs\vfsStream; @@ -601,6 +602,7 @@ public function register(ContainerBuilder $container) { $container->getDefinition('password') ->setArguments(array(1)); } + TestServiceProvider::addRouteProvider($container); } /** @@ -923,6 +925,12 @@ protected function disableModules(array $modules) { * The rendered string output (typically HTML). */ protected function render(array &$elements) { + // \Drupal\Core\Render\BareHtmlPageRenderer::renderBarePage calls out to + // system_page_attachments() directly. + if (!\Drupal::moduleHandler()->moduleExists('system')) { + throw new \Exception(__METHOD__ . ' requires system module to be installed.'); + } + // Use the bare HTML page renderer to render our links. $renderer = $this->container->get('bare_html_page_renderer'); $response = $renderer->renderBarePage(