diff --git a/core/modules/system/tests/src/Kernel/File/RemoteFileDirectoryTest.php b/core/modules/system/tests/src/Kernel/File/RemoteFileDirectoryTest.php index 6b43b2d..4033a4b 100644 --- a/core/modules/system/tests/src/Kernel/File/RemoteFileDirectoryTest.php +++ b/core/modules/system/tests/src/Kernel/File/RemoteFileDirectoryTest.php @@ -7,6 +7,8 @@ namespace Drupal\Tests\system\Kernel\File; +use Drupal\KernelTests\Core\File\DirectoryTest; + /** * Tests operations dealing with directories. * diff --git a/core/modules/system/tests/src/Kernel/File/RemoteFileScanDirectoryTest.php b/core/modules/system/tests/src/Kernel/File/RemoteFileScanDirectoryTest.php index 688764b..0388d63 100644 --- a/core/modules/system/tests/src/Kernel/File/RemoteFileScanDirectoryTest.php +++ b/core/modules/system/tests/src/Kernel/File/RemoteFileScanDirectoryTest.php @@ -6,6 +6,7 @@ */ namespace Drupal\Tests\system\Kernel\File; +use Drupal\KernelTests\Core\File\ScanDirectoryTest; /** * Tests the file_scan_directory() function. diff --git a/core/modules/system/tests/src/Kernel/Extension/ModuleImplementsAlterTest.php b/core/tests/Drupal/KernelTests/Core/Extension/ModuleImplementsAlterTest.php similarity index 96% rename from core/modules/system/tests/src/Kernel/Extension/ModuleImplementsAlterTest.php rename to core/tests/Drupal/KernelTests/Core/Extension/ModuleImplementsAlterTest.php index 324c9b2..ba43b18 100644 --- a/core/modules/system/tests/src/Kernel/Extension/ModuleImplementsAlterTest.php +++ b/core/tests/Drupal/KernelTests/Core/Extension/ModuleImplementsAlterTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\Extension\ModuleImplementsAlterTest. + * Contains \Drupal\KernelTests\Core\Extension\ModuleImplementsAlterTest. */ -namespace Drupal\Tests\system\Kernel\Extension; +namespace Drupal\KernelTests\Core\Extension; use Drupal\KernelTests\KernelTestBase; diff --git a/core/modules/system/tests/src/Kernel/File/DirectoryTest.php b/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php similarity index 98% rename from core/modules/system/tests/src/Kernel/File/DirectoryTest.php rename to core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php index 90dcc80..57063fa 100644 --- a/core/modules/system/tests/src/Kernel/File/DirectoryTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/DirectoryTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\File\DirectoryTest. + * Contains \Drupal\KernelTests\Core\File\DirectoryTest. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; use Drupal\Component\PhpStorage\FileStorage; @@ -15,6 +15,7 @@ * @group File */ class DirectoryTest extends FileTestBase { + /** * Test local directory handling functions. */ diff --git a/core/modules/system/tests/src/Kernel/File/FileTestBase.php b/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php similarity index 98% rename from core/modules/system/tests/src/Kernel/File/FileTestBase.php rename to core/tests/Drupal/KernelTests/Core/File/FileTestBase.php index b6939ac..18ffc23 100644 --- a/core/modules/system/tests/src/Kernel/File/FileTestBase.php +++ b/core/tests/Drupal/KernelTests/Core/File/FileTestBase.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\File\FileTestBase. + * Contains \Drupal\KernelTests\Core\File\FileTestBase. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\KernelTests\KernelTestBase; diff --git a/core/modules/system/tests/src/Kernel/File/MimeTypeTest.php b/core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php similarity index 97% rename from core/modules/system/tests/src/Kernel/File/MimeTypeTest.php rename to core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php index 8e217b8..fcf890a 100644 --- a/core/modules/system/tests/src/Kernel/File/MimeTypeTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/MimeTypeTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\File\MimeTypeTest. + * Contains \Drupal\KernelTests\Core\File\MimeTypeTest. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; /** * Tests filename mimetype detection. diff --git a/core/modules/system/tests/src/Kernel/File/NameMungingTest.php b/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php similarity index 97% rename from core/modules/system/tests/src/Kernel/File/NameMungingTest.php rename to core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php index cbda7b3..a5ab799 100644 --- a/core/modules/system/tests/src/Kernel/File/NameMungingTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/NameMungingTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\File\NameMungingTest. + * Contains \Drupal\KernelTests\Core\File\NameMungingTest. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; /** * Tests filename munging and unmunging. diff --git a/core/modules/system/tests/src/Kernel/File/ReadOnlyStreamWrapperTest.php b/core/tests/Drupal/KernelTests/Core/File/ReadOnlyStreamWrapperTest.php similarity index 97% rename from core/modules/system/tests/src/Kernel/File/ReadOnlyStreamWrapperTest.php rename to core/tests/Drupal/KernelTests/Core/File/ReadOnlyStreamWrapperTest.php index d2403b3..c3c3155 100644 --- a/core/modules/system/tests/src/Kernel/File/ReadOnlyStreamWrapperTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/ReadOnlyStreamWrapperTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\File\ReadOnlyStreamWrapperTest. + * Contains \Drupal\KernelTests\Core\File\ReadOnlyStreamWrapperTest. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; /** * Tests the read-only stream wrapper write functions. diff --git a/core/modules/system/tests/src/Kernel/File/RemoteFileUnmanagedCopyTest.php b/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedCopyTest.php similarity index 86% rename from core/modules/system/tests/src/Kernel/File/RemoteFileUnmanagedCopyTest.php rename to core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedCopyTest.php index bb34e6f..26868a5 100644 --- a/core/modules/system/tests/src/Kernel/File/RemoteFileUnmanagedCopyTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedCopyTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\File\RemoteFileUnmanagedCopyTest. + * Contains \Drupal\KernelTests\Core\File\RemoteFileUnmanagedCopyTest. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; /** * Tests the unmanaged file copy function. diff --git a/core/modules/system/tests/src/Kernel/File/RemoteFileUnmanagedDeleteRecursiveTest.php b/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedDeleteRecursiveTest.php similarity index 86% rename from core/modules/system/tests/src/Kernel/File/RemoteFileUnmanagedDeleteRecursiveTest.php rename to core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedDeleteRecursiveTest.php index 3bf86da..5ef8807 100644 --- a/core/modules/system/tests/src/Kernel/File/RemoteFileUnmanagedDeleteRecursiveTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedDeleteRecursiveTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\File\RemoteFileUnmanagedDeleteRecursiveTest. + * Contains \Drupal\KernelTests\Core\File\RemoteFileUnmanagedDeleteRecursiveTest. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; /** * Tests the unmanaged file delete recursive function. diff --git a/core/modules/system/tests/src/Kernel/File/RemoteFileUnmanagedDeleteTest.php b/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedDeleteTest.php similarity index 86% rename from core/modules/system/tests/src/Kernel/File/RemoteFileUnmanagedDeleteTest.php rename to core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedDeleteTest.php index 78e99dc..56ea976 100644 --- a/core/modules/system/tests/src/Kernel/File/RemoteFileUnmanagedDeleteTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedDeleteTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\File\RemoteFileUnmanagedDeleteTest. + * Contains \Drupal\KernelTests\Core\File\RemoteFileUnmanagedDeleteTest. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; /** * Tests the unmanaged file delete function. diff --git a/core/modules/system/tests/src/Kernel/File/RemoteFileUnmanagedMoveTest.php b/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedMoveTest.php similarity index 86% rename from core/modules/system/tests/src/Kernel/File/RemoteFileUnmanagedMoveTest.php rename to core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedMoveTest.php index 170ffb1..32723e6 100644 --- a/core/modules/system/tests/src/Kernel/File/RemoteFileUnmanagedMoveTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedMoveTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\File\RemoteFileUnmanagedMoveTest. + * Contains \Drupal\KernelTests\Core\File\RemoteFileUnmanagedMoveTest. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; /** * Tests the unmanaged file move function. diff --git a/core/modules/system/tests/src/Kernel/File/RemoteFileUnmanagedSaveDataTest.php b/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedSaveDataTest.php similarity index 86% rename from core/modules/system/tests/src/Kernel/File/RemoteFileUnmanagedSaveDataTest.php rename to core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedSaveDataTest.php index 8ad87ff..7a210d8 100644 --- a/core/modules/system/tests/src/Kernel/File/RemoteFileUnmanagedSaveDataTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/RemoteFileUnmanagedSaveDataTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\File\RemoteFileUnmanagedSaveDataTest. + * Contains \Drupal\KernelTests\Core\File\RemoteFileUnmanagedSaveDataTest. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; /** * Tests the unmanaged file save data function. diff --git a/core/modules/system/tests/src/Kernel/File/ScanDirectoryTest.php b/core/tests/Drupal/KernelTests/Core/File/ScanDirectoryTest.php similarity index 98% rename from core/modules/system/tests/src/Kernel/File/ScanDirectoryTest.php rename to core/tests/Drupal/KernelTests/Core/File/ScanDirectoryTest.php index 3ac512e..fd21ce3 100644 --- a/core/modules/system/tests/src/Kernel/File/ScanDirectoryTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/ScanDirectoryTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\File\ScanDirectoryTest. + * Contains \Drupal\KernelTests\Core\File\ScanDirectoryTest. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; /** * Tests the file_scan_directory() function. diff --git a/core/modules/system/tests/src/Kernel/File/StreamWrapperTest.php b/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php similarity index 97% rename from core/modules/system/tests/src/Kernel/File/StreamWrapperTest.php rename to core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php index 16e4e25..333d7df 100644 --- a/core/modules/system/tests/src/Kernel/File/StreamWrapperTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/StreamWrapperTest.php @@ -2,14 +2,15 @@ /** * @file - * Contains \Drupal\system\Tests\File\StreamWrapperTest. + * Contains \Drupal\KernelTests\Core\File\StreamWrapperTest. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; use Drupal\Core\DrupalKernel; use Drupal\Core\Site\Settings; use Drupal\Core\StreamWrapper\PublicStream; +use Drupal\KernelTests\Core\File\FileTestBase; use Symfony\Component\HttpFoundation\Request; /** diff --git a/core/modules/system/tests/src/Kernel/File/UnmanagedCopyTest.php b/core/tests/Drupal/KernelTests/Core/File/UnmanagedCopyTest.php similarity index 97% rename from core/modules/system/tests/src/Kernel/File/UnmanagedCopyTest.php rename to core/tests/Drupal/KernelTests/Core/File/UnmanagedCopyTest.php index ae36584..0e03031 100644 --- a/core/modules/system/tests/src/Kernel/File/UnmanagedCopyTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/UnmanagedCopyTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\File\UnmanagedCopyTest. + * Contains \Drupal\KernelTests\Core\File\UnmanagedCopyTest. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; use Drupal\Core\Site\Settings; use Drupal\Core\File\FileSystem; diff --git a/core/modules/system/tests/src/Kernel/File/UnmanagedDeleteRecursiveTest.php b/core/tests/Drupal/KernelTests/Core/File/UnmanagedDeleteRecursiveTest.php similarity index 95% rename from core/modules/system/tests/src/Kernel/File/UnmanagedDeleteRecursiveTest.php rename to core/tests/Drupal/KernelTests/Core/File/UnmanagedDeleteRecursiveTest.php index 463df24..5537865 100644 --- a/core/modules/system/tests/src/Kernel/File/UnmanagedDeleteRecursiveTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/UnmanagedDeleteRecursiveTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\File\UnmanagedDeleteRecursiveTest. + * Contains \Drupal\KernelTests\Core\File\UnmanagedDeleteRecursiveTest. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; /** * Tests the unmanaged file delete recursive function. diff --git a/core/modules/system/tests/src/Kernel/File/UnmanagedDeleteTest.php b/core/tests/Drupal/KernelTests/Core/File/UnmanagedDeleteTest.php similarity index 91% rename from core/modules/system/tests/src/Kernel/File/UnmanagedDeleteTest.php rename to core/tests/Drupal/KernelTests/Core/File/UnmanagedDeleteTest.php index 7784485..f8b6eb9 100644 --- a/core/modules/system/tests/src/Kernel/File/UnmanagedDeleteTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/UnmanagedDeleteTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\File\UnmanagedDeleteTest. + * Contains \Drupal\KernelTests\Core\File\UnmanagedDeleteTest. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; /** * Tests the unmanaged file delete function. diff --git a/core/modules/system/tests/src/Kernel/File/UnmanagedMoveTest.php b/core/tests/Drupal/KernelTests/Core/File/UnmanagedMoveTest.php similarity index 96% rename from core/modules/system/tests/src/Kernel/File/UnmanagedMoveTest.php rename to core/tests/Drupal/KernelTests/Core/File/UnmanagedMoveTest.php index d3843a7..282fa53 100644 --- a/core/modules/system/tests/src/Kernel/File/UnmanagedMoveTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/UnmanagedMoveTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\File\UnmanagedMoveTest. + * Contains \Drupal\KernelTests\Core\File\UnmanagedMoveTest. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; use Drupal\Core\Site\Settings; use Drupal\Core\File\FileSystem; diff --git a/core/modules/system/tests/src/Kernel/File/UnmanagedSaveDataTest.php b/core/tests/Drupal/KernelTests/Core/File/UnmanagedSaveDataTest.php similarity index 91% rename from core/modules/system/tests/src/Kernel/File/UnmanagedSaveDataTest.php rename to core/tests/Drupal/KernelTests/Core/File/UnmanagedSaveDataTest.php index 9c460a3..2370760 100644 --- a/core/modules/system/tests/src/Kernel/File/UnmanagedSaveDataTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/UnmanagedSaveDataTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\File\UnmanagedSaveDataTest. + * Contains \Drupal\KernelTests\Core\File\UnmanagedSaveDataTest. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; /** * Tests the file_unmanaged_save_data() function. diff --git a/core/modules/system/tests/src/Kernel/File/UrlRewritingTest.php b/core/tests/Drupal/KernelTests/Core/File/UrlRewritingTest.php similarity index 98% rename from core/modules/system/tests/src/Kernel/File/UrlRewritingTest.php rename to core/tests/Drupal/KernelTests/Core/File/UrlRewritingTest.php index 2bd9eda..901231e 100644 --- a/core/modules/system/tests/src/Kernel/File/UrlRewritingTest.php +++ b/core/tests/Drupal/KernelTests/Core/File/UrlRewritingTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\File\UrlRewritingTest. + * Contains \Drupal\KernelTests\Core\File\UrlRewritingTest. */ -namespace Drupal\Tests\system\Kernel\File; +namespace Drupal\KernelTests\Core\File; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/system/tests/src/Kernel/Form/ExternalFormUrlTest.php b/core/tests/Drupal/KernelTests/Core/Form/ExternalFormUrlTest.php similarity index 96% rename from core/modules/system/tests/src/Kernel/Form/ExternalFormUrlTest.php rename to core/tests/Drupal/KernelTests/Core/Form/ExternalFormUrlTest.php index 0d161a2..a512668 100644 --- a/core/modules/system/tests/src/Kernel/Form/ExternalFormUrlTest.php +++ b/core/tests/Drupal/KernelTests/Core/Form/ExternalFormUrlTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\Form\ExternalFormUrlTest. + * Contains \Drupal\KernelTests\Core\Form\ExternalFormUrlTest. */ -namespace Drupal\Tests\system\Kernel\Form; +namespace Drupal\KernelTests\Core\Form; use Drupal\Core\Form\FormInterface; use Drupal\Core\Form\FormStateInterface; diff --git a/core/modules/system/tests/src/Kernel/Form/FormCacheTest.php b/core/tests/Drupal/KernelTests/Core/Form/FormCacheTest.php similarity index 97% rename from core/modules/system/tests/src/Kernel/Form/FormCacheTest.php rename to core/tests/Drupal/KernelTests/Core/Form/FormCacheTest.php index bc8ed81..ec2c552 100644 --- a/core/modules/system/tests/src/Kernel/Form/FormCacheTest.php +++ b/core/tests/Drupal/KernelTests/Core/Form/FormCacheTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\Form\FormCacheTest. + * Contains \Drupal\KernelTests\Core\Form\FormCacheTest. */ -namespace Drupal\Tests\system\Kernel\Form; +namespace Drupal\KernelTests\Core\Form; use Drupal\Core\Form\FormState; use Drupal\Core\Session\AnonymousUserSession; diff --git a/core/modules/system/tests/src/Kernel/Form/FormDefaultHandlersTest.php b/core/tests/Drupal/KernelTests/Core/Form/FormDefaultHandlersTest.php similarity index 96% rename from core/modules/system/tests/src/Kernel/Form/FormDefaultHandlersTest.php rename to core/tests/Drupal/KernelTests/Core/Form/FormDefaultHandlersTest.php index a86bea4..21bf4be 100644 --- a/core/modules/system/tests/src/Kernel/Form/FormDefaultHandlersTest.php +++ b/core/tests/Drupal/KernelTests/Core/Form/FormDefaultHandlersTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\Form\FormDefaultHandlersTest. + * Contains \Drupal\KernelTests\Core\Form\FormDefaultHandlersTest. */ -namespace Drupal\Tests\system\Kernel\Form; +namespace Drupal\KernelTests\Core\Form; use Drupal\Core\Form\FormInterface; use Drupal\Core\Form\FormState; diff --git a/core/modules/system/tests/src/Kernel/KeyValueStore/DatabaseStorageExpirableTest.php b/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php similarity index 97% rename from core/modules/system/tests/src/Kernel/KeyValueStore/DatabaseStorageExpirableTest.php rename to core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php index 3ef0711..7165439 100644 --- a/core/modules/system/tests/src/Kernel/KeyValueStore/DatabaseStorageExpirableTest.php +++ b/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageExpirableTest.php @@ -2,14 +2,13 @@ /** * @file - * Contains \Drupal\system\Tests\KeyValueStore\DatabaseStorageExpirableTest. + * Contains \Drupal\KernelTests\Core\KeyValueStore\DatabaseStorageExpirableTest. */ -namespace Drupal\Tests\system\Kernel\KeyValueStore; +namespace Drupal\KernelTests\Core\KeyValueStore; use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\KeyValueStore\KeyValueFactory; -use Drupal\KernelTests\Core\KeyValueStore\StorageTestBase; /** * Tests the key-value database storage. diff --git a/core/modules/system/tests/src/Kernel/KeyValueStore/DatabaseStorageTest.php b/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageTest.php similarity index 80% rename from core/modules/system/tests/src/Kernel/KeyValueStore/DatabaseStorageTest.php rename to core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageTest.php index 454c205..6fc42a1 100644 --- a/core/modules/system/tests/src/Kernel/KeyValueStore/DatabaseStorageTest.php +++ b/core/tests/Drupal/KernelTests/Core/KeyValueStore/DatabaseStorageTest.php @@ -2,14 +2,13 @@ /** * @file - * Contains \Drupal\system\Tests\KeyValueStore\DatabaseStorageTest. + * Contains \Drupal\KernelTests\Core\KeyValueStore\DatabaseStorageTest. */ -namespace Drupal\Tests\system\Kernel\KeyValueStore; +namespace Drupal\KernelTests\Core\KeyValueStore; use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\KeyValueStore\KeyValueFactory; -use Drupal\KernelTests\Core\KeyValueStore\StorageTestBase; /** * Tests the key-value database storage. diff --git a/core/modules/system/tests/src/Kernel/KeyValueStore/GarbageCollectionTest.php b/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php similarity index 94% rename from core/modules/system/tests/src/Kernel/KeyValueStore/GarbageCollectionTest.php rename to core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php index 491a7b3..fa8c0a7 100644 --- a/core/modules/system/tests/src/Kernel/KeyValueStore/GarbageCollectionTest.php +++ b/core/tests/Drupal/KernelTests/Core/KeyValueStore/GarbageCollectionTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\KeyValueStore\GarbageCollectionTest. + * Contains \Drupal\KernelTests\Core\KeyValueStore\GarbageCollectionTest. */ -namespace Drupal\Tests\system\Kernel\KeyValueStore; +namespace Drupal\KernelTests\Core\KeyValueStore; use Drupal\Component\Serialization\PhpSerialize; use Drupal\Core\Database\Database; diff --git a/core/modules/system/tests/src/Kernel/Menu/MenuLinkTreeTest.php b/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkTreeTest.php similarity index 98% rename from core/modules/system/tests/src/Kernel/Menu/MenuLinkTreeTest.php rename to core/tests/Drupal/KernelTests/Core/Menu/MenuLinkTreeTest.php index de2da19..181602a 100644 --- a/core/modules/system/tests/src/Kernel/Menu/MenuLinkTreeTest.php +++ b/core/tests/Drupal/KernelTests/Core/Menu/MenuLinkTreeTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\Menu\MenuLinkTreeTest. + * Contains \Drupal\KernelTests\Core\Menu\MenuLinkTreeTest. */ -namespace Drupal\Tests\system\Kernel\Menu; +namespace Drupal\KernelTests\Core\Menu; use Drupal\Core\Menu\MenuLinkTreeElement; use Drupal\Core\Menu\MenuTreeParameters; diff --git a/core/modules/system/tests/src/Kernel/Plugin/Condition/RequestPathTest.php b/core/tests/Drupal/KernelTests/Core/Plugin/Condition/RequestPathTest.php similarity index 97% rename from core/modules/system/tests/src/Kernel/Plugin/Condition/RequestPathTest.php rename to core/tests/Drupal/KernelTests/Core/Plugin/Condition/RequestPathTest.php index 949ede5..71cb8f4 100644 --- a/core/modules/system/tests/src/Kernel/Plugin/Condition/RequestPathTest.php +++ b/core/tests/Drupal/KernelTests/Core/Plugin/Condition/RequestPathTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\Plugin\Condition\RequestPathTest. + * Contains \Drupal\KernelTests\Core\Plugin\Condition\RequestPathTest. */ -namespace Drupal\Tests\system\Kernel\Plugin\Condition; +namespace Drupal\KernelTests\Core\Plugin\Condition; use Drupal\Core\Path\CurrentPathStack; use Drupal\KernelTests\KernelTestBase; diff --git a/core/modules/system/tests/src/Kernel/Plugin/ContextPluginTest.php b/core/tests/Drupal/KernelTests/Core/Plugin/ContextPluginTest.php similarity index 99% rename from core/modules/system/tests/src/Kernel/Plugin/ContextPluginTest.php rename to core/tests/Drupal/KernelTests/Core/Plugin/ContextPluginTest.php index fdb9c76..0104d01 100644 --- a/core/modules/system/tests/src/Kernel/Plugin/ContextPluginTest.php +++ b/core/tests/Drupal/KernelTests/Core/Plugin/ContextPluginTest.php @@ -5,7 +5,7 @@ * Contains \Drupal\system\Tests\Plugin\ContextPluginTest. */ -namespace Drupal\Tests\system\Kernel\Plugin; +namespace Drupal\KernelTests\Core\Plugin; use Drupal\Component\Plugin\Exception\ContextException; use Drupal\Core\Plugin\Context\ContextDefinition; diff --git a/core/modules/system/tests/src/Kernel/Queue/QueueSerializationTest.php b/core/tests/Drupal/KernelTests/Core/Queue/QueueSerializationTest.php similarity index 98% rename from core/modules/system/tests/src/Kernel/Queue/QueueSerializationTest.php rename to core/tests/Drupal/KernelTests/Core/Queue/QueueSerializationTest.php index f58b2dd..1a0c60d 100644 --- a/core/modules/system/tests/src/Kernel/Queue/QueueSerializationTest.php +++ b/core/tests/Drupal/KernelTests/Core/Queue/QueueSerializationTest.php @@ -4,7 +4,7 @@ * Contains \Drupal\system\Tests\Queue\QueueSerializationTest. */ -namespace Drupal\Tests\system\Kernel\Queue; +namespace Drupal\KernelTests\Core\Queue; use Drupal\Core\DependencyInjection\DependencySerializationTrait; use Drupal\Core\Form\FormInterface; diff --git a/core/modules/system/tests/src/Kernel/Render/Element/TableTest.php b/core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php similarity index 97% rename from core/modules/system/tests/src/Kernel/Render/Element/TableTest.php rename to core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php index 706475b..1b0b5a1 100644 --- a/core/modules/system/tests/src/Kernel/Render/Element/TableTest.php +++ b/core/tests/Drupal/KernelTests/Core/Render/Element/TableTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\Render\Element\TableTest. + * Contains \Drupal\KernelTests\Core\Render\Element\TableTest. */ -namespace Drupal\Tests\system\Kernel\Render\Element; +namespace Drupal\KernelTests\Core\Render\Element; use Drupal\KernelTests\KernelTestBase; @@ -24,15 +24,6 @@ class TableTest extends KernelTestBase { public static $modules = ['system', 'form_test']; /** - * {@inheritdoc} - */ - protected function setUp() { - parent::setUp(); - - \Drupal::service('router.builder')->rebuild(); - } - - /** * Tableheader.js provides 'sticky' table headers, and is included by default. */ function testThemeTableStickyHeaders() { diff --git a/core/modules/system/tests/src/Kernel/Render/RenderCacheTest.php b/core/tests/Drupal/KernelTests/Core/Render/RenderCacheTest.php similarity index 97% rename from core/modules/system/tests/src/Kernel/Render/RenderCacheTest.php rename to core/tests/Drupal/KernelTests/Core/Render/RenderCacheTest.php index 2f299db..b48ada6 100644 --- a/core/modules/system/tests/src/Kernel/Render/RenderCacheTest.php +++ b/core/tests/Drupal/KernelTests/Core/Render/RenderCacheTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\Render\RenderCacheTest. + * Contains \Drupal\KernelTests\Core\Render\RenderCacheTest. */ -namespace Drupal\Tests\system\Kernel\Render; +namespace Drupal\KernelTests\Core\Render; use Drupal\KernelTests\KernelTestBase; use Drupal\simpletest\UserCreationTrait; diff --git a/core/modules/system/tests/src/Kernel/RouteProcessor/RouteNoneTest.php b/core/tests/Drupal/KernelTests/Core/RouteProcessor/RouteNoneTest.php similarity index 96% rename from core/modules/system/tests/src/Kernel/RouteProcessor/RouteNoneTest.php rename to core/tests/Drupal/KernelTests/Core/RouteProcessor/RouteNoneTest.php index 0511166..bd4bf44 100644 --- a/core/modules/system/tests/src/Kernel/RouteProcessor/RouteNoneTest.php +++ b/core/tests/Drupal/KernelTests/Core/RouteProcessor/RouteNoneTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\system\Tests\RouteProcessor\RouteNoneTest. + * Contains \Drupal\KernelTests\Core\RouteProcessor\RouteNoneTest. */ -namespace Drupal\Tests\system\Kernel\RouteProcessor; +namespace Drupal\KernelTests\Core\RouteProcessor; use Drupal\Core\Cache\Cache; use Drupal\Core\GeneratedUrl; @@ -42,8 +42,6 @@ class RouteNoneTest extends KernelTestBase { protected function setUp() { parent::setUp(); - \Drupal::service('router.builder')->rebuild(); - $this->urlGenerator = \Drupal::urlGenerator(); } diff --git a/core/modules/system/tests/src/Kernel/RouteProcessor/RouteProcessorCurrentIntegrationTest.php b/core/tests/Drupal/KernelTests/Core/RouteProcessor/RouteProcessorCurrentIntegrationTest.php similarity index 98% rename from core/modules/system/tests/src/Kernel/RouteProcessor/RouteProcessorCurrentIntegrationTest.php rename to core/tests/Drupal/KernelTests/Core/RouteProcessor/RouteProcessorCurrentIntegrationTest.php index 39dd77b..75b9724 100644 --- a/core/modules/system/tests/src/Kernel/RouteProcessor/RouteProcessorCurrentIntegrationTest.php +++ b/core/tests/Drupal/KernelTests/Core/RouteProcessor/RouteProcessorCurrentIntegrationTest.php @@ -5,7 +5,7 @@ * Contains \Drupal\system\Tests\RouteProcessor\RouteProcessorCurrentIntegrationTest. */ -namespace Drupal\Tests\system\Kernel\RouteProcessor; +namespace Drupal\KernelTests\Core\RouteProcessor; use Drupal\Core\Cache\Cache; use Drupal\Core\GeneratedUrl; @@ -41,8 +41,6 @@ class RouteProcessorCurrentIntegrationTest extends KernelTestBase { protected function setUp() { parent::setUp(); - \Drupal::service('router.builder')->rebuild(); - $this->urlGenerator = \Drupal::urlGenerator(); } diff --git a/core/modules/system/tests/src/Kernel/Routing/ContentNegotiationRoutingTest.php b/core/tests/Drupal/KernelTests/Core/Routing/ContentNegotiationRoutingTest.php similarity index 95% rename from core/modules/system/tests/src/Kernel/Routing/ContentNegotiationRoutingTest.php rename to core/tests/Drupal/KernelTests/Core/Routing/ContentNegotiationRoutingTest.php index 0f71607..43ff7e7 100644 --- a/core/modules/system/tests/src/Kernel/Routing/ContentNegotiationRoutingTest.php +++ b/core/tests/Drupal/KernelTests/Core/Routing/ContentNegotiationRoutingTest.php @@ -5,7 +5,7 @@ * Contains \Drupal\system\Tests\Routing\ContentNegotiationRoutingTest. */ -namespace Drupal\Tests\system\Kernel\Routing; +namespace Drupal\KernelTests\Core\Routing; use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\KernelTests\KernelTestBase; @@ -22,17 +22,7 @@ class ContentNegotiationRoutingTest extends KernelTestBase { /** * {@inheritdoc} */ - public static $modules = ['system', 'conneg_test']; - - /** - * {@inheritdoc} - */ - protected function setUp() { - \Drupal::unsetContainer(); - parent::setUp(); - - \Drupal::service('router.builder')->rebuild(); - } + public static $modules = ['conneg_test']; /** * {@inheritdoc} diff --git a/core/modules/system/tests/src/Kernel/Routing/ExceptionHandlingTest.php b/core/tests/Drupal/KernelTests/Core/Routing/ExceptionHandlingTest.php similarity index 97% rename from core/modules/system/tests/src/Kernel/Routing/ExceptionHandlingTest.php rename to core/tests/Drupal/KernelTests/Core/Routing/ExceptionHandlingTest.php index 9c28daf..04931a9 100644 --- a/core/modules/system/tests/src/Kernel/Routing/ExceptionHandlingTest.php +++ b/core/tests/Drupal/KernelTests/Core/Routing/ExceptionHandlingTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\Tests\system\Kernel\Routing\ExceptionHandlingTest. + * Contains \Drupal\KernelTests\Core\Routing\ExceptionHandlingTest. */ -namespace Drupal\Tests\system\Kernel\Routing; +namespace Drupal\KernelTests\Core\Routing; use Drupal\Component\Utility\Html; use Drupal\KernelTests\KernelTestBase; @@ -31,7 +31,6 @@ protected function setUp() { parent::setUp(); $this->installEntitySchema('date_format'); - \Drupal::service('router.builder')->rebuild(); } /** diff --git a/core/modules/system/tests/src/Kernel/Routing/RouteProviderTest.php b/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php similarity index 94% rename from core/modules/system/tests/src/Kernel/Routing/RouteProviderTest.php rename to core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php index 409ef24..95dc74c 100644 --- a/core/modules/system/tests/src/Kernel/Routing/RouteProviderTest.php +++ b/core/tests/Drupal/KernelTests/Core/Routing/RouteProviderTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\Tests\system\Kernel\Routing\RouteProviderTest. + * Contains \Drupal\KernelTests\Core\Routing\RouteProviderTest. */ -namespace Drupal\Tests\system\Kernel\Routing; +namespace Drupal\KernelTests\Core\Routing; use Drupal\Core\Cache\MemoryBackend; use Drupal\Core\Database\Database; @@ -185,7 +185,8 @@ function testOutlinePathMatch() { // All of the matching paths have the correct pattern. foreach ($routes as $route) { - $this->assertEqual($route->compile()->getPatternOutline(), '/path/%/one', 'Found path has correct pattern'); + $this->assertEqual($route->compile() + ->getPatternOutline(), '/path/%/one', 'Found path has correct pattern'); } $this->assertEqual(count($routes), 2, 'The correct number of routes was found.'); @@ -214,7 +215,8 @@ function testOutlinePathMatchTrailingSlash() { // All of the matching paths have the correct pattern. foreach ($routes as $route) { - $this->assertEqual($route->compile()->getPatternOutline(), '/path/%/one', 'Found path has correct pattern'); + $this->assertEqual($route->compile() + ->getPatternOutline(), '/path/%/one', 'Found path has correct pattern'); } $this->assertEqual(count($routes), 2, 'The correct number of routes was found.'); @@ -249,13 +251,13 @@ function testOutlinePathMatchDefaults() { // All of the matching paths have the correct pattern. foreach ($routes as $route) { - $this->assertEqual($route->compile()->getPatternOutline(), '/some/path', 'Found path has correct pattern'); + $this->assertEqual($route->compile() + ->getPatternOutline(), '/some/path', 'Found path has correct pattern'); } $this->assertEqual(count($routes), 1, 'The correct number of routes was found.'); $this->assertNotNull($routes->get('poink'), 'The first matching route was found.'); - } - catch (ResourceNotFoundException $e) { + } catch (ResourceNotFoundException $e) { $this->fail('No matching route found with default argument value.'); } } @@ -288,13 +290,13 @@ function testOutlinePathMatchDefaultsCollision() { // All of the matching paths have the correct pattern. foreach ($routes as $route) { - $this->assertEqual($route->compile()->getPatternOutline(), '/some/path', 'Found path has correct pattern'); + $this->assertEqual($route->compile() + ->getPatternOutline(), '/some/path', 'Found path has correct pattern'); } $this->assertEqual(count($routes), 1, 'The correct number of routes was found.'); $this->assertNotNull($routes->get('poink'), 'The first matching route was found.'); - } - catch (ResourceNotFoundException $e) { + } catch (ResourceNotFoundException $e) { $this->fail('No matching route found with default argument value.'); } } @@ -328,12 +330,14 @@ function testOutlinePathMatchDefaultsCollision2() { $routes_array = $routes->all(); $this->assertEqual(count($routes), 2, 'The correct number of routes was found.'); - $this->assertEqual(array('narf', 'poink'), array_keys($routes_array), 'Ensure the fitness was taken into account.'); + $this->assertEqual(array( + 'narf', + 'poink' + ), array_keys($routes_array), 'Ensure the fitness was taken into account.'); $this->assertNotNull($routes->get('narf'), 'The first matching route was found.'); $this->assertNotNull($routes->get('poink'), 'The second matching route was found.'); $this->assertNull($routes->get('eep'), 'Non-matching route was not found.'); - } - catch (ResourceNotFoundException $e) { + } catch (ResourceNotFoundException $e) { $this->fail('No matching route found with default argument value.'); } } @@ -367,12 +371,14 @@ function testOutlinePathMatchDefaultsCollision3() { $routes_array = $routes->all(); $this->assertEqual(count($routes), 2, 'The correct number of routes was found.'); - $this->assertEqual(array('poink', 'poink2'), array_keys($routes_array), 'Ensure the fitness and name were taken into account in the sort.'); + $this->assertEqual(array( + 'poink', + 'poink2' + ), array_keys($routes_array), 'Ensure the fitness and name were taken into account in the sort.'); $this->assertNotNull($routes->get('poink'), 'The first matching route was found.'); $this->assertNotNull($routes->get('poink2'), 'The second matching route was found.'); $this->assertNull($routes->get('eep'), 'Non-matching route was not found.'); - } - catch (ResourceNotFoundException $e) { + } catch (ResourceNotFoundException $e) { $this->fail('No matching route found with default argument value.'); } } @@ -402,12 +408,12 @@ public function testOutlinePathMatchZero() { // All of the matching paths have the correct pattern. foreach ($routes as $route) { - $this->assertEqual($route->compile()->getPatternOutline(), '/some/path/%', 'Found path has correct pattern'); + $this->assertEqual($route->compile() + ->getPatternOutline(), '/some/path/%', 'Found path has correct pattern'); } $this->assertEqual(count($routes), 1, 'The correct number of routes was found.'); - } - catch (ResourceNotFoundException $e) { + } catch (ResourceNotFoundException $e) { $this->fail('No matchout route found with 0 as argument value'); } } @@ -522,13 +528,16 @@ public function testRouteByName() { $exception_thrown = FALSE; try { $provider->getRouteByName('invalid_name'); - } - catch (RouteNotFoundException $e) { + } catch (RouteNotFoundException $e) { $exception_thrown = TRUE; } $this->assertTrue($exception_thrown, 'Random route was not found.'); - $routes = $provider->getRoutesByNames(array('route_c', 'route_d', $this->randomMachineName())); + $routes = $provider->getRoutesByNames(array( + 'route_c', + 'route_d', + $this->randomMachineName() + )); $this->assertEqual(count($routes), 2, 'Only two valid routes found.'); $this->assertEqual($routes['route_c']->getPath(), '/path/two'); $this->assertEqual($routes['route_d']->getPath(), '/path/three'); diff --git a/core/modules/system/tests/src/Kernel/Routing/UrlIntegrationTest.php b/core/tests/Drupal/KernelTests/Core/Routing/UrlIntegrationTest.php similarity index 90% rename from core/modules/system/tests/src/Kernel/Routing/UrlIntegrationTest.php rename to core/tests/Drupal/KernelTests/Core/Routing/UrlIntegrationTest.php index 83b805e..27e2b2d 100644 --- a/core/modules/system/tests/src/Kernel/Routing/UrlIntegrationTest.php +++ b/core/tests/Drupal/KernelTests/Core/Routing/UrlIntegrationTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\Tests\system\Kernel\Routing\UrlIntegrationTest. + * Contains \Drupal\KernelTests\Core\Routing\UrlIntegrationTest. */ -namespace Drupal\Tests\system\Kernel\Routing; +namespace Drupal\KernelTests\Core\Routing; use Drupal\Core\Url; use Drupal\KernelTests\KernelTestBase; @@ -30,7 +30,6 @@ class UrlIntegrationTest extends KernelTestBase { * Ensures that the access() method on \Drupal\Core\Url objects works. */ public function testAccess() { - \Drupal::service('router.builder')->rebuild(); /** @var \Drupal\user\RoleInterface $role_with_access */ $role_with_access = Role::create(['id' => 'role_with_access']); $role_with_access->grantPermission('administer users'); diff --git a/core/modules/system/tests/src/Kernel/ServiceProvider/ServiceProviderTest.php b/core/tests/Drupal/KernelTests/Core/ServiceProvider/ServiceProviderTest.php similarity index 92% rename from core/modules/system/tests/src/Kernel/ServiceProvider/ServiceProviderTest.php rename to core/tests/Drupal/KernelTests/Core/ServiceProvider/ServiceProviderTest.php index 863b9c2..0653894 100644 --- a/core/modules/system/tests/src/Kernel/ServiceProvider/ServiceProviderTest.php +++ b/core/tests/Drupal/KernelTests/Core/ServiceProvider/ServiceProviderTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\Tests\system\Kernel\ServiceProvider\ServiceProviderTest. + * Contains \Drupal\KernelTests\Core\ServiceProvider\ServiceProviderTest. */ -namespace Drupal\Tests\system\Kernel\ServiceProvider; +namespace Drupal\KernelTests\Core\ServiceProvider; use Drupal\KernelTests\KernelTestBase; diff --git a/core/modules/system/tests/src/Kernel/Theme/ImageTest.php b/core/tests/Drupal/KernelTests/Core/Theme/ImageTest.php similarity index 97% rename from core/modules/system/tests/src/Kernel/Theme/ImageTest.php rename to core/tests/Drupal/KernelTests/Core/Theme/ImageTest.php index f281c5d..0bf5de8 100644 --- a/core/modules/system/tests/src/Kernel/Theme/ImageTest.php +++ b/core/tests/Drupal/KernelTests/Core/Theme/ImageTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\Tests\system\Kernel\Theme\ImageTest. + * Contains \Drupal\KernelTests\Core\Theme\ImageTest. */ -namespace Drupal\Tests\system\Kernel\Theme; +namespace Drupal\KernelTests\Core\Theme; use Drupal\KernelTests\KernelTestBase; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/system/tests/src/Kernel/Theme/MessageTest.php b/core/tests/Drupal/KernelTests/Core/Theme/MessageTest.php similarity index 88% rename from core/modules/system/tests/src/Kernel/Theme/MessageTest.php rename to core/tests/Drupal/KernelTests/Core/Theme/MessageTest.php index 81befb9..74ad110 100644 --- a/core/modules/system/tests/src/Kernel/Theme/MessageTest.php +++ b/core/tests/Drupal/KernelTests/Core/Theme/MessageTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\Tests\system\Kernel\Theme\MessageTest. + * Contains \Drupal\KernelTests\Core\Theme\MessageTest. */ -namespace Drupal\Tests\system\Kernel\Theme; +namespace Drupal\KernelTests\Core\Theme; use Drupal\KernelTests\KernelTestBase; diff --git a/core/modules/system/tests/src/Kernel/Theme/RegistryTest.php b/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php similarity index 98% rename from core/modules/system/tests/src/Kernel/Theme/RegistryTest.php rename to core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php index 724c6ae..c94a421 100644 --- a/core/modules/system/tests/src/Kernel/Theme/RegistryTest.php +++ b/core/tests/Drupal/KernelTests/Core/Theme/RegistryTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\Tests\system\Kernel\Theme\RegistryTest. + * Contains \Drupal\KernelTests\Core\Theme\RegistryTest. */ -namespace Drupal\Tests\system\Kernel\Theme; +namespace Drupal\KernelTests\Core\Theme; use Drupal\Core\Theme\Registry; use Drupal\Core\Utility\ThemeRegistry; diff --git a/core/modules/system/tests/src/Kernel/Theme/StableThemeTest.php b/core/tests/Drupal/KernelTests/Core/Theme/StableThemeTest.php similarity index 94% rename from core/modules/system/tests/src/Kernel/Theme/StableThemeTest.php rename to core/tests/Drupal/KernelTests/Core/Theme/StableThemeTest.php index 5312541..a61e81f 100644 --- a/core/modules/system/tests/src/Kernel/Theme/StableThemeTest.php +++ b/core/tests/Drupal/KernelTests/Core/Theme/StableThemeTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\Tests\system\Kernel\Theme\StableThemeTest. + * Contains \Drupal\KernelTests\Core\Theme\StableThemeTest. */ -namespace Drupal\Tests\system\Kernel\Theme; +namespace Drupal\KernelTests\Core\Theme; use Drupal\KernelTests\KernelTestBase; diff --git a/core/modules/system/tests/src/Kernel/Theme/ThemeSettingsTest.php b/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php similarity index 94% rename from core/modules/system/tests/src/Kernel/Theme/ThemeSettingsTest.php rename to core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php index ab5fa2d..50ddf00 100644 --- a/core/modules/system/tests/src/Kernel/Theme/ThemeSettingsTest.php +++ b/core/tests/Drupal/KernelTests/Core/Theme/ThemeSettingsTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\Tests\system\Kernel\Theme\ThemeSettingsTest. + * Contains \Drupal\KernelTests\Core\Theme\ThemeSettingsTest. */ -namespace Drupal\Tests\system\Kernel\Theme; +namespace Drupal\KernelTests\Core\Theme; use Drupal\Core\Config\InstallStorage; use Drupal\Core\Extension\ExtensionDiscovery; diff --git a/core/modules/system/tests/src/Kernel/Theme/TwigEnvironmentTest.php b/core/tests/Drupal/KernelTests/Core/Theme/TwigEnvironmentTest.php similarity index 97% rename from core/modules/system/tests/src/Kernel/Theme/TwigEnvironmentTest.php rename to core/tests/Drupal/KernelTests/Core/Theme/TwigEnvironmentTest.php index 9d89f09..cb6b54a 100644 --- a/core/modules/system/tests/src/Kernel/Theme/TwigEnvironmentTest.php +++ b/core/tests/Drupal/KernelTests/Core/Theme/TwigEnvironmentTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\Tests\system\Kernel\Theme\TwigEnvironmentTest. + * Contains \Drupal\KernelTests\Core\Theme\TwigEnvironmentTest. */ -namespace Drupal\Tests\system\Kernel\Theme; +namespace Drupal\KernelTests\Core\Theme; use Drupal\Component\Utility\Html; use Drupal\Core\Site\Settings; diff --git a/core/modules/system/tests/src/Kernel/Theme/TwigWhiteListTest.php b/core/tests/Drupal/KernelTests/Core/Theme/TwigWhiteListTest.php similarity index 96% rename from core/modules/system/tests/src/Kernel/Theme/TwigWhiteListTest.php rename to core/tests/Drupal/KernelTests/Core/Theme/TwigWhiteListTest.php index e656762..7f0c2cc 100644 --- a/core/modules/system/tests/src/Kernel/Theme/TwigWhiteListTest.php +++ b/core/tests/Drupal/KernelTests/Core/Theme/TwigWhiteListTest.php @@ -1,10 +1,10 @@ setUpFilesystem(); + $GLOBALS['config_directories'] = array( CONFIG_SYNC_DIRECTORY => $this->siteDirectory . '/files/config/sync', ); @@ -411,8 +413,6 @@ private function bootKernel() { // While this should be enforced via settings.php prior to installation, // some tests expect to be able to test mail system implementations. $GLOBALS['config']['system.mail']['interface']['default'] = 'test_mail_collector'; - - $this->setUpFilesystem(); } /**