diff --git a/core/modules/editor/src/Tests/QuickEditIntegrationTest.php b/core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php similarity index 98% rename from core/modules/editor/src/Tests/QuickEditIntegrationTest.php rename to core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php index 1b4798b..5106729 100644 --- a/core/modules/editor/src/Tests/QuickEditIntegrationTest.php +++ b/core/modules/editor/tests/src/Kernel/QuickEditIntegrationTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\editor\Tests\QuickEditIntegrationTest. + * Contains \Drupal\Tests\editor\Kernel\QuickEditIntegrationTest. */ -namespace Drupal\editor\Tests; +namespace Drupal\Tests\editor\Kernel; use Drupal\Component\Serialization\Json; use Drupal\Core\EventSubscriber\AjaxResponseSubscriber; @@ -13,7 +13,7 @@ use Drupal\editor\Entity\Editor; use Drupal\entity_test\Entity\EntityTest; use Drupal\quickedit\MetadataGenerator; -use Drupal\quickedit\Tests\QuickEditTestBase; +use Drupal\Tests\quickedit\Kernel\QuickEditTestBase; use Drupal\quickedit_test\MockEditEntityFieldAccessCheck; use Drupal\editor\EditorController; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/forum/src/Tests/ForumValidationTest.php b/core/modules/forum/tests/src/Kernel/ForumValidationTest.php similarity index 88% rename from core/modules/forum/src/Tests/ForumValidationTest.php rename to core/modules/forum/tests/src/Kernel/ForumValidationTest.php index c215c8e..3b66d3e 100644 --- a/core/modules/forum/src/Tests/ForumValidationTest.php +++ b/core/modules/forum/tests/src/Kernel/ForumValidationTest.php @@ -2,21 +2,21 @@ /** * @file - * Contains \Drupal\forum\Tests\ForumValidationTest. + * Contains \Drupal\Tests\forum\Kernel\ForumValidationTest. */ -namespace Drupal\forum\Tests; +namespace Drupal\Tests\forum\Kernel; +use Drupal\KernelTests\Core\Entity\EntityKernelTestBase; use Drupal\node\Entity\Node; use Drupal\taxonomy\Entity\Term; -use Drupal\system\Tests\Entity\EntityUnitTestBase; /** * Tests forum validation constraints. * * @group forum */ -class ForumValidationTest extends EntityUnitTestBase { +class ForumValidationTest extends EntityKernelTestBase { /** * Modules to install. diff --git a/core/modules/language/src/Tests/Condition/LanguageConditionTest.php b/core/modules/language/tests/src/Kernel/Condition/LanguageConditionTest.php similarity index 95% rename from core/modules/language/src/Tests/Condition/LanguageConditionTest.php rename to core/modules/language/tests/src/Kernel/Condition/LanguageConditionTest.php index e976ae0..713820b 100644 --- a/core/modules/language/src/Tests/Condition/LanguageConditionTest.php +++ b/core/modules/language/tests/src/Kernel/Condition/LanguageConditionTest.php @@ -2,13 +2,13 @@ /** * @file - * Contains \Drupal\language\Tests\Condition\LanguageConditionTest. + * Contains \Drupal\Tests\language\Kernel\Condition\LanguageConditionTest. */ -namespace Drupal\language\Tests\Condition; +namespace Drupal\Tests\language\Kernel\Condition; use Drupal\language\Entity\ConfigurableLanguage; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; /** * Tests that the language condition, provided by the language module, is diff --git a/core/modules/language/src/Tests/ConfigurableLanguageTest.php b/core/modules/language/tests/src/Kernel/ConfigurableLanguageTest.php similarity index 85% rename from core/modules/language/src/Tests/ConfigurableLanguageTest.php rename to core/modules/language/tests/src/Kernel/ConfigurableLanguageTest.php index c1d8889..832e9da 100644 --- a/core/modules/language/src/Tests/ConfigurableLanguageTest.php +++ b/core/modules/language/tests/src/Kernel/ConfigurableLanguageTest.php @@ -1,12 +1,12 @@ config('language.negotiation'); $config->set('url.prefixes', ['en' => 'en', 'es' => 'es', 'fr' => 'fr']) ->save(); - $this->kernel->rebuildContainer(); + + \Drupal::service('kernel')->rebuildContainer(); $this->createTranslatableEntity(); } diff --git a/core/modules/language/src/Tests/LanguageConfigOverrideInstallTest.php b/core/modules/language/tests/src/Kernel/LanguageConfigOverrideInstallTest.php similarity index 88% rename from core/modules/language/src/Tests/LanguageConfigOverrideInstallTest.php rename to core/modules/language/tests/src/Kernel/LanguageConfigOverrideInstallTest.php index b3cdd09..23b7440 100644 --- a/core/modules/language/src/Tests/LanguageConfigOverrideInstallTest.php +++ b/core/modules/language/tests/src/Kernel/LanguageConfigOverrideInstallTest.php @@ -2,13 +2,13 @@ /** * @file - * Contains \Drupal\language\Tests\LanguageConfigOverrideInstallTest. + * Contains \Drupal\Tests\language\Kernel\LanguageConfigOverrideInstallTest. */ -namespace Drupal\language\Tests; +namespace Drupal\Tests\language\Kernel; use Drupal\language\Entity\ConfigurableLanguage; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; /** * Ensures the language config overrides can be installed. diff --git a/core/modules/language/src/Tests/LanguageDependencyInjectionTest.php b/core/modules/language/tests/src/Kernel/LanguageDependencyInjectionTest.php similarity index 95% rename from core/modules/language/src/Tests/LanguageDependencyInjectionTest.php rename to core/modules/language/tests/src/Kernel/LanguageDependencyInjectionTest.php index fc13a61..755eb51 100644 --- a/core/modules/language/src/Tests/LanguageDependencyInjectionTest.php +++ b/core/modules/language/tests/src/Kernel/LanguageDependencyInjectionTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\language\Tests\LanguageDependencyInjectionTest. + * Contains \Drupal\Tests\language\Kernel\LanguageDependencyInjectionTest. */ -namespace Drupal\language\Tests; +namespace Drupal\Tests\language\Kernel; use Drupal\language\Entity\ConfigurableLanguage; use Drupal\language\Exception\DeleteDefaultLanguageException; diff --git a/core/modules/language/src/Tests/LanguageFallbackTest.php b/core/modules/language/tests/src/Kernel/LanguageFallbackTest.php similarity index 96% rename from core/modules/language/src/Tests/LanguageFallbackTest.php rename to core/modules/language/tests/src/Kernel/LanguageFallbackTest.php index c57df3d..3854f59 100644 --- a/core/modules/language/src/Tests/LanguageFallbackTest.php +++ b/core/modules/language/tests/src/Kernel/LanguageFallbackTest.php @@ -2,10 +2,10 @@ /** * @file - * Contains \Drupal\language\Tests\LanguageFallbackTest. + * Contains \Drupal\Tests\language\Kernel\LanguageFallbackTest. */ -namespace Drupal\language\Tests; +namespace Drupal\Tests\language\Kernel; use Drupal\Core\Language\LanguageInterface; use Drupal\language\Entity\ConfigurableLanguage; diff --git a/core/modules/language/src/Tests/LanguageTestBase.php b/core/modules/language/tests/src/Kernel/LanguageTestBase.php similarity index 85% rename from core/modules/language/src/Tests/LanguageTestBase.php rename to core/modules/language/tests/src/Kernel/LanguageTestBase.php index f06f203..47d08a3 100644 --- a/core/modules/language/src/Tests/LanguageTestBase.php +++ b/core/modules/language/tests/src/Kernel/LanguageTestBase.php @@ -2,12 +2,12 @@ /** * @file - * Contains \Drupal\language\Tests\LanguageTestBase. + * Contains \Drupal\Tests\language\Kernel\LanguageTestBase. */ -namespace Drupal\language\Tests; +namespace Drupal\Tests\language\Kernel; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; /** * Test for dependency injected language object. diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module index 74b76ec..aecad6c 100644 --- a/core/modules/locale/locale.module +++ b/core/modules/locale/locale.module @@ -1042,7 +1042,7 @@ function locale_string_is_safe($string) { // inject javascript. When \Drupal\Component\Utility\Xss::filter() removes // part of tokens, it causes the string to not be translatable when it should // be translatable. - // @see \Drupal\locale\Tests\LocaleStringIsSafeTest::testLocaleStringIsSafe() + // @see \Drupal\Tests\locale\Kernel\LocaleStringIsSafeTest::testLocaleStringIsSafe() // // We can recognize tokens since they are wrapped with brackets and are only // composed of alphanumeric characters, colon, underscore, and dashes. We can diff --git a/core/modules/locale/tests/modules/locale_test/config/schema/locale_test.schema.yml b/core/modules/locale/tests/modules/locale_test/config/schema/locale_test.schema.yml index f6cf7b9..958ce1b 100644 --- a/core/modules/locale/tests/modules/locale_test/config/schema/locale_test.schema.yml +++ b/core/modules/locale/tests/modules/locale_test/config/schema/locale_test.schema.yml @@ -7,7 +7,7 @@ locale_test.no_translation: test: type: string label: 'Test' - # See \Drupal\locale\Tests\LocaleConfigSubscriberTest + # See \Drupal\Tests\locale\Kernel\LocaleConfigSubscriberTest translatable: true locale_test.translation: @@ -17,5 +17,5 @@ locale_test.translation: test: type: string label: 'Test' - # See \Drupal\locale\Tests\LocaleConfigSubscriberTest + # See \Drupal\Tests\locale\Kernel\LocaleConfigSubscriberTest translatable: true diff --git a/core/modules/locale/src/Tests/LocaleConfigManagerTest.php b/core/modules/locale/tests/src/Kernel/LocaleConfigManagerTest.php similarity index 97% rename from core/modules/locale/src/Tests/LocaleConfigManagerTest.php rename to core/modules/locale/tests/src/Kernel/LocaleConfigManagerTest.php index 193f4fa..fd1c07d 100644 --- a/core/modules/locale/src/Tests/LocaleConfigManagerTest.php +++ b/core/modules/locale/tests/src/Kernel/LocaleConfigManagerTest.php @@ -2,14 +2,14 @@ /** * @file - * Contains \Drupal\locale\Tests\LocaleConfigManagerTest. + * Contains \Drupal\Tests\locale\Kernel\LocaleConfigManagerTest. */ -namespace Drupal\locale\Tests; +namespace Drupal\Tests\locale\Kernel; use Drupal\block\Entity\Block; use Drupal\language\Entity\ConfigurableLanguage; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; /** * Tests that the locale config manager operates correctly. diff --git a/core/modules/locale/src/Tests/LocaleConfigSubscriberForeignTest.php b/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberForeignTest.php similarity index 99% rename from core/modules/locale/src/Tests/LocaleConfigSubscriberForeignTest.php rename to core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberForeignTest.php index 00018f1..3179d8e 100644 --- a/core/modules/locale/src/Tests/LocaleConfigSubscriberForeignTest.php +++ b/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberForeignTest.php @@ -9,6 +9,7 @@ use Drupal\Core\Language\Language; use Drupal\language\Entity\ConfigurableLanguage; +use Drupal\Tests\locale\Kernel\LocaleConfigSubscriberTest; /** * Tests default configuration handling with a foreign default language. diff --git a/core/modules/locale/src/Tests/LocaleConfigSubscriberTest.php b/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php similarity index 98% rename from core/modules/locale/src/Tests/LocaleConfigSubscriberTest.php rename to core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php index 38e8ad0..01bba94 100644 --- a/core/modules/locale/src/Tests/LocaleConfigSubscriberTest.php +++ b/core/modules/locale/tests/src/Kernel/LocaleConfigSubscriberTest.php @@ -2,16 +2,16 @@ /** * @file - * Contains \Drupal\locale\Tests\LocaleConfigSubscriberTest. + * Contains \Drupal\Tests\locale\Kernel\LocaleConfigSubscriberTest. */ -namespace Drupal\locale\Tests; +namespace Drupal\Tests\locale\Kernel; use Drupal\language\Entity\ConfigurableLanguage; use Drupal\locale\Locale; use Drupal\locale\StringInterface; use Drupal\locale\TranslationString; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; /** * Tests that shipped configuration translations are updated correctly. @@ -23,7 +23,7 @@ class LocaleConfigSubscriberTest extends KernelTestBase { /** * {@inheritdoc} */ - public static $modules = ['language', 'locale', 'system']; + public static $modules = ['language', 'locale', 'system', 'locale_test']; /** * The configurable language manager used in this test. @@ -65,7 +65,6 @@ protected function setUp() { $this->setupLanguages(); - $this->enableModules(['locale_test']); $this->installConfig(['locale_test']); // Simulate this hook invoked which would happen if in a non-kernel test // or normal environment. diff --git a/core/modules/locale/src/Tests/LocaleConfigurableLanguageManagerTest.php b/core/modules/locale/tests/src/Kernel/LocaleConfigurableLanguageManagerTest.php similarity index 91% rename from core/modules/locale/src/Tests/LocaleConfigurableLanguageManagerTest.php rename to core/modules/locale/tests/src/Kernel/LocaleConfigurableLanguageManagerTest.php index 6bdbc43..f047953 100644 --- a/core/modules/locale/src/Tests/LocaleConfigurableLanguageManagerTest.php +++ b/core/modules/locale/tests/src/Kernel/LocaleConfigurableLanguageManagerTest.php @@ -2,14 +2,14 @@ /** * @file - * Contains \Drupal\locale\Tests\LocaleConfigurableLanguageManagerTest. + * Contains \Drupal\Tests\locale\Kernel\LocaleConfigurableLanguageManagerTest. */ -namespace Drupal\locale\Tests; +namespace Drupal\Tests\locale\Kernel; use Drupal\Core\Language\LanguageInterface; use Drupal\language\Entity\ConfigurableLanguage; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; /** diff --git a/core/modules/locale/src/Tests/LocaleStringIsSafeTest.php b/core/modules/locale/tests/src/Kernel/LocaleStringIsSafeTest.php similarity index 96% rename from core/modules/locale/src/Tests/LocaleStringIsSafeTest.php rename to core/modules/locale/tests/src/Kernel/LocaleStringIsSafeTest.php index 603187f..c50ae6b 100644 --- a/core/modules/locale/src/Tests/LocaleStringIsSafeTest.php +++ b/core/modules/locale/tests/src/Kernel/LocaleStringIsSafeTest.php @@ -2,12 +2,12 @@ /** * @file - * Contains \Drupal\locale\Tests\LocaleStringIsSafeTest. + * Contains \Drupal\Tests\locale\Kernel\LocaleStringIsSafeTest. */ -namespace Drupal\locale\Tests; +namespace Drupal\Tests\locale\Kernel; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; /** * Tests locale translation safe string handling. diff --git a/core/modules/locale/src/Tests/LocaleTranslationProjectsTest.php b/core/modules/locale/tests/src/Kernel/LocaleTranslationProjectsTest.php similarity index 87% rename from core/modules/locale/src/Tests/LocaleTranslationProjectsTest.php rename to core/modules/locale/tests/src/Kernel/LocaleTranslationProjectsTest.php index 79b7f1f..08de6d9 100644 --- a/core/modules/locale/src/Tests/LocaleTranslationProjectsTest.php +++ b/core/modules/locale/tests/src/Kernel/LocaleTranslationProjectsTest.php @@ -2,12 +2,12 @@ /** * @file - * Contains \Drupal\locale\Tests\LocaleTranslationProjectsTest. + * Contains \Drupal\Tests\locale\Kernel\LocaleTranslationProjectsTest. */ -namespace Drupal\locale\Tests; +namespace Drupal\Tests\locale\Kernel; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; /** * Tests locale translation project handling. @@ -19,7 +19,7 @@ class LocaleTranslationProjectsTest extends KernelTestBase { /** * {@inheritdoc} */ - public static $modules = ['locale', 'locale_test']; + public static $modules = ['locale', 'locale_test', 'system']; /** * The module handler used in this test. diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentCacheabilityBubblingTest.php b/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentCacheabilityBubblingTest.php similarity index 96% rename from core/modules/menu_link_content/src/Tests/MenuLinkContentCacheabilityBubblingTest.php rename to core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentCacheabilityBubblingTest.php index 9e1dbf1..38b7ac5 100644 --- a/core/modules/menu_link_content/src/Tests/MenuLinkContentCacheabilityBubblingTest.php +++ b/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentCacheabilityBubblingTest.php @@ -2,17 +2,17 @@ /** * @file - * Contains \Drupal\menu_link_content\Tests\MenuLinkContentCacheabilityBubblingTest. + * Contains \Drupal\Tests\menu_link_content\Kernel\MenuLinkContentCacheabilityBubblingTest. */ -namespace Drupal\menu_link_content\Tests; +namespace Drupal\Tests\menu_link_content\Kernel; use Drupal\Core\Cache\Cache; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Menu\MenuTreeParameters; use Drupal\Core\Render\BubbleableMetadata; use Drupal\menu_link_content\Entity\MenuLinkContent; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; use Drupal\user\Entity\User; use Symfony\Cmf\Component\Routing\RouteObjectInterface; use Symfony\Component\HttpFoundation\Request; diff --git a/core/modules/menu_link_content/src/Tests/MenuLinkContentDeriverTest.php b/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentDeriverTest.php similarity index 95% rename from core/modules/menu_link_content/src/Tests/MenuLinkContentDeriverTest.php rename to core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentDeriverTest.php index defbaad..7dd3bc3 100644 --- a/core/modules/menu_link_content/src/Tests/MenuLinkContentDeriverTest.php +++ b/core/modules/menu_link_content/tests/src/Kernel/MenuLinkContentDeriverTest.php @@ -2,15 +2,15 @@ /** * @file - * Contains \Drupal\menu_link_content\Tests\MenuLinkContentDeriverTest. + * Contains \Drupal\Tests\menu_link_content\Kernel\MenuLinkContentDeriverTest. */ -namespace Drupal\menu_link_content\Tests; +namespace Drupal\Tests\menu_link_content\Kernel; use Drupal\Core\Menu\MenuTreeParameters; use Drupal\Core\StringTranslation\TranslatableMarkup; use Drupal\menu_link_content\Entity\MenuLinkContent; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; use Symfony\Component\Routing\Route; /** diff --git a/core/modules/menu_link_content/src/Tests/PathAliasMenuLinkContentTest.php b/core/modules/menu_link_content/tests/src/Kernel/PathAliasMenuLinkContentTest.php similarity index 91% rename from core/modules/menu_link_content/src/Tests/PathAliasMenuLinkContentTest.php rename to core/modules/menu_link_content/tests/src/Kernel/PathAliasMenuLinkContentTest.php index 7be92e1..c904225 100644 --- a/core/modules/menu_link_content/src/Tests/PathAliasMenuLinkContentTest.php +++ b/core/modules/menu_link_content/tests/src/Kernel/PathAliasMenuLinkContentTest.php @@ -2,16 +2,16 @@ /** * @file - * Contains \Drupal\menu_link_content\Tests\PathAliasMenuLinkContentTest. + * Contains \Drupal\Tests\menu_link_content\Kernel\PathAliasMenuLinkContentTest. */ -namespace Drupal\menu_link_content\Tests; +namespace Drupal\Tests\menu_link_content\Kernel; use Drupal\Core\DependencyInjection\ContainerBuilder; use Drupal\Core\Language\LanguageInterface; use Drupal\Core\Menu\MenuTreeParameters; use Drupal\menu_link_content\Entity\MenuLinkContent; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; /** * Ensures that the menu tree adapts to path alias changes. @@ -41,8 +41,8 @@ protected function setUp() { /** * {@inheritdoc} */ - public function containerBuild(ContainerBuilder $container) { - parent::containerBuild($container); + public function register(ContainerBuilder $container) { + parent::register($container); $definition = $container->getDefinition('path_processor_alias'); $definition diff --git a/core/modules/node/src/Tests/Config/NodeImportChangeTest.php b/core/modules/node/tests/src/Kernel/Config/NodeImportChangeTest.php similarity index 91% rename from core/modules/node/src/Tests/Config/NodeImportChangeTest.php rename to core/modules/node/tests/src/Kernel/Config/NodeImportChangeTest.php index 327173c..e4dc638 100644 --- a/core/modules/node/src/Tests/Config/NodeImportChangeTest.php +++ b/core/modules/node/tests/src/Kernel/Config/NodeImportChangeTest.php @@ -2,13 +2,13 @@ /** * @file - * Contains \Drupal\node\Tests\Config\NodeImportChangeTest. + * Contains \Drupal\Tests\node\Kernel\Config\NodeImportChangeTest. */ -namespace Drupal\node\Tests\Config; +namespace Drupal\Tests\node\Kernel\Config; use Drupal\node\Entity\NodeType; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; /** * Change content types during config create method invocation. diff --git a/core/modules/node/src/Tests/Config/NodeImportCreateTest.php b/core/modules/node/tests/src/Kernel/Config/NodeImportCreateTest.php similarity index 88% rename from core/modules/node/src/Tests/Config/NodeImportCreateTest.php rename to core/modules/node/tests/src/Kernel/Config/NodeImportCreateTest.php index fc87cf3..44d40a0 100644 --- a/core/modules/node/src/Tests/Config/NodeImportCreateTest.php +++ b/core/modules/node/tests/src/Kernel/Config/NodeImportCreateTest.php @@ -2,14 +2,14 @@ /** * @file - * Contains \Drupal\node\Tests\Config\NodeImportCreateTest. + * Contains \Drupal\Tests\node\Kernel\Config\NodeImportCreateTest. */ -namespace Drupal\node\Tests\Config; +namespace Drupal\Tests\node\Kernel\Config; use Drupal\field\Entity\FieldConfig; use Drupal\node\Entity\NodeType; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; /** * Create content types during config create method invocation. @@ -64,8 +64,8 @@ public function testImportCreate() { $sync = $this->container->get('config.storage.sync'); $this->copyConfig($active, $sync); // Manually add new node type. - $src_dir = drupal_get_path('module', 'node_test_config') . '/sync'; - $target_dir = $this->configDirectories[CONFIG_SYNC_DIRECTORY]; + $src_dir = __DIR__ . '/../../../modules/node_test_config/sync'; + $target_dir = config_get_config_directory(CONFIG_SYNC_DIRECTORY); $this->assertTrue(file_unmanaged_copy("$src_dir/$node_type_config_name.yml", "$target_dir/$node_type_config_name.yml")); // Import the content of the sync directory. diff --git a/core/modules/node/src/Tests/NodeBodyFieldStorageTest.php b/core/modules/node/tests/src/Kernel/NodeBodyFieldStorageTest.php similarity index 93% rename from core/modules/node/src/Tests/NodeBodyFieldStorageTest.php rename to core/modules/node/tests/src/Kernel/NodeBodyFieldStorageTest.php index 2441a57..562a5a1 100644 --- a/core/modules/node/src/Tests/NodeBodyFieldStorageTest.php +++ b/core/modules/node/tests/src/Kernel/NodeBodyFieldStorageTest.php @@ -2,15 +2,15 @@ /** * @file - * Contains \Drupal\node\Tests\NodeBodyFieldStorageTest. + * Contains \Drupal\Tests\node\Kernel\NodeBodyFieldStorageTest. */ -namespace Drupal\node\Tests; +namespace Drupal\Tests\node\Kernel; use Drupal\field\Entity\FieldConfig; use Drupal\field\Entity\FieldStorageConfig; use Drupal\node\Entity\NodeType; -use Drupal\simpletest\KernelTestBase; +use Drupal\KernelTests\KernelTestBase; /** * Tests node body field storage. diff --git a/core/modules/node/src/Tests/Condition/NodeConditionTest.php b/core/modules/node/tests/src/Kernel/NodeConditionTest.php similarity index 94% rename from core/modules/node/src/Tests/Condition/NodeConditionTest.php rename to core/modules/node/tests/src/Kernel/NodeConditionTest.php index 6af1d77..a365927 100644 --- a/core/modules/node/src/Tests/Condition/NodeConditionTest.php +++ b/core/modules/node/tests/src/Kernel/NodeConditionTest.php @@ -2,21 +2,21 @@ /** * @file - * Contains \Drupal\node\Tests\Condition\NodeConditionTest. + * Contains \Drupal\Tests\node\Kernel\NodeConditionTest. */ -namespace Drupal\node\Tests\Condition; +namespace Drupal\Tests\node\Kernel; +use Drupal\KernelTests\Core\Entity\EntityKernelTestBase; use Drupal\node\Entity\Node; use Drupal\node\Entity\NodeType; -use Drupal\system\Tests\Entity\EntityUnitTestBase; /** * Tests that conditions, provided by the node module, are working properly. * * @group node */ -class NodeConditionTest extends EntityUnitTestBase { +class NodeConditionTest extends EntityKernelTestBase { public static $modules = array('node'); diff --git a/core/modules/node/src/Tests/NodeFieldAccessTest.php b/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php similarity index 96% rename from core/modules/node/src/Tests/NodeFieldAccessTest.php rename to core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php index 2b18e15..62b7e93 100644 --- a/core/modules/node/src/Tests/NodeFieldAccessTest.php +++ b/core/modules/node/tests/src/Kernel/NodeFieldAccessTest.php @@ -1,22 +1,22 @@