diff --git a/core/modules/aggregator/src/Tests/Views/IntegrationTest.php b/core/modules/aggregator/src/Tests/Views/IntegrationTest.php
index 9444808648fa5622aa3fa99453cc636449cb761e..052b51164f2d8b2de4c7ce1db1d0b4e5cefdcd15 100644
--- a/core/modules/aggregator/src/Tests/Views/IntegrationTest.php
+++ b/core/modules/aggregator/src/Tests/Views/IntegrationTest.php
@@ -11,14 +11,14 @@
use Drupal\Core\Url;
use Drupal\views\Views;
use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
/**
* Tests basic integration of views data from the aggregator module.
*
* @group aggregator
*/
-class IntegrationTest extends ViewUnitTestBase {
+class IntegrationTest extends ViewKernelTestBase {
/**
* Modules to install.
diff --git a/core/modules/comment/src/Tests/Views/CommentUserNameTest.php b/core/modules/comment/src/Tests/Views/CommentUserNameTest.php
index f0ef7e6e73dad1ca378307452ef316a94ec19025..8b05c84df8229e68f4dc3225f8a36d893bc8db4b 100644
--- a/core/modules/comment/src/Tests/Views/CommentUserNameTest.php
+++ b/core/modules/comment/src/Tests/Views/CommentUserNameTest.php
@@ -12,7 +12,7 @@
use Drupal\user\Entity\Role;
use Drupal\user\Entity\User;
use Drupal\views\Entity\View;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -20,7 +20,7 @@
*
* @group comment
*/
-class CommentUserNameTest extends ViewUnitTestBase {
+class CommentUserNameTest extends ViewKernelTestBase {
/**
* Admin user.
diff --git a/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php b/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php
index 1a636c1af4575873089c80b5cd185816fef081c1..ae088e0040889b921ce620cdc49b34c209785f6b 100644
--- a/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php
+++ b/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php
@@ -13,14 +13,14 @@
use Drupal\Core\Url;
use Drupal\views\Views;
use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
/**
* Tests the views integration of dblog module.
*
* @group dblog
*/
-class ViewsIntegrationTest extends ViewUnitTestBase {
+class ViewsIntegrationTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/entity_reference/src/Tests/Views/EntityReferenceRelationshipTest.php b/core/modules/entity_reference/src/Tests/Views/EntityReferenceRelationshipTest.php
index 4190f174b6062622535e1570856ffb00d25e6cab..4003d069e9ada0af8eafdaac1ce90eacb77f7c42 100644
--- a/core/modules/entity_reference/src/Tests/Views/EntityReferenceRelationshipTest.php
+++ b/core/modules/entity_reference/src/Tests/Views/EntityReferenceRelationshipTest.php
@@ -11,7 +11,7 @@
use Drupal\entity_test\Entity\EntityTest;
use Drupal\entity_test\Entity\EntityTestMul;
use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -20,7 +20,7 @@
* @group entity_reference
* @see entity_reference_field_views_data()
*/
-class EntityReferenceRelationshipTest extends ViewUnitTestBase {
+class EntityReferenceRelationshipTest extends ViewKernelTestBase {
use EntityReferenceTestTrait;
diff --git a/core/modules/file/src/Tests/Views/ExtensionViewsFieldTest.php b/core/modules/file/src/Tests/Views/ExtensionViewsFieldTest.php
index f7d2b3fc098516ee2e65c959292d3ed9bbeb6e7f..aa4f6342acabe26b4bcd66d4fc6c7c499f892c4d 100644
--- a/core/modules/file/src/Tests/Views/ExtensionViewsFieldTest.php
+++ b/core/modules/file/src/Tests/Views/ExtensionViewsFieldTest.php
@@ -10,7 +10,7 @@
use Drupal\Core\Render\RenderContext;
use Drupal\file\Entity\File;
use Drupal\views\Views;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Tests\ViewTestData;
/**
@@ -18,7 +18,7 @@
*
* @group file
*/
-class ExtensionViewsFieldTest extends ViewUnitTestBase {
+class ExtensionViewsFieldTest extends ViewKernelTestBase {
/**
* {@inheritdoc}
diff --git a/core/modules/file/src/Tests/Views/FileViewsDataTest.php b/core/modules/file/src/Tests/Views/FileViewsDataTest.php
index 9ba1a644444ea5b54fe3d1cb25710578a0ff7f0c..89ff5ecbe5bf2d528f92072d4ec8ee8836aec40d 100644
--- a/core/modules/file/src/Tests/Views/FileViewsDataTest.php
+++ b/core/modules/file/src/Tests/Views/FileViewsDataTest.php
@@ -9,7 +9,7 @@
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\field\Entity\FieldConfig;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -17,7 +17,7 @@
*
* @group file
*/
-class FileViewsDataTest extends ViewUnitTestBase {
+class FileViewsDataTest extends ViewKernelTestBase {
/**
* Modules to install.
diff --git a/core/modules/image/src/Tests/Views/ImageViewsDataTest.php b/core/modules/image/src/Tests/Views/ImageViewsDataTest.php
index 82dd5906a062e210e54ef74af09b2d79e1377993..c9d1215947a0225641df1bf0e4341122f09badc2 100644
--- a/core/modules/image/src/Tests/Views/ImageViewsDataTest.php
+++ b/core/modules/image/src/Tests/Views/ImageViewsDataTest.php
@@ -9,7 +9,7 @@
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\field\Entity\FieldConfig;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -17,7 +17,7 @@
*
* @group image
*/
-class ImageViewsDataTest extends ViewUnitTestBase {
+class ImageViewsDataTest extends ViewKernelTestBase {
/**
* Modules to install.
diff --git a/core/modules/language/src/Tests/Views/LanguageTestBase.php b/core/modules/language/src/Tests/Views/LanguageTestBase.php
index 39e0355ff6004618368a6e101218d818c4f9135a..d52361b678c0722c7e637b89923f09abd1a449f2 100644
--- a/core/modules/language/src/Tests/Views/LanguageTestBase.php
+++ b/core/modules/language/src/Tests/Views/LanguageTestBase.php
@@ -8,12 +8,12 @@
namespace Drupal\language\Tests\Views;
use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
/**
* Defines the base class for all Language handler tests.
*/
-abstract class LanguageTestBase extends ViewUnitTestBase {
+abstract class LanguageTestBase extends ViewKernelTestBase {
/**
* Modules to enable.
diff --git a/core/modules/options/src/Tests/Views/OptionsTestBase.php b/core/modules/options/src/Tests/Views/OptionsTestBase.php
index e203c5093356373090adba27ae4eb16f7025f0dc..671216000486376099c13b434955f1381438a262 100644
--- a/core/modules/options/src/Tests/Views/OptionsTestBase.php
+++ b/core/modules/options/src/Tests/Views/OptionsTestBase.php
@@ -13,12 +13,12 @@
use Drupal\node\Entity\NodeType;
use Drupal\views\Tests\ViewTestBase;
use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
/**
* Base class for options views tests.
*/
-abstract class OptionsTestBase extends ViewUnitTestBase {
+abstract class OptionsTestBase extends ViewKernelTestBase {
/**
* Modules to enable.
diff --git a/core/modules/user/src/Tests/Views/HandlerFieldPermissionTest.php b/core/modules/user/src/Tests/Views/HandlerFieldPermissionTest.php
index 5fd046d30e19cbbb6e66b42cbec07ab915706079..0756858557362a46448756531940658e2c788fb3 100644
--- a/core/modules/user/src/Tests/Views/HandlerFieldPermissionTest.php
+++ b/core/modules/user/src/Tests/Views/HandlerFieldPermissionTest.php
@@ -8,8 +8,6 @@
namespace Drupal\user\Tests\Views;
use Drupal\views\Views;
-use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Tests\ViewUnitTestBase;
/**
* Tests the permission field handler.
@@ -17,7 +15,7 @@
* @group user
* @see \Drupal\user\Plugin\views\field\Permissions
*/
-class HandlerFieldPermissionTest extends UserUnitTestBase {
+class HandlerFieldPermissionTest extends UserKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/user/src/Tests/Views/HandlerFilterPermissionTest.php b/core/modules/user/src/Tests/Views/HandlerFilterPermissionTest.php
index 51673e4df061fc068255b6858c38bf19cf530c8a..5ea1b0f7363946c4841754fe15fff9d84e5b2e03 100644
--- a/core/modules/user/src/Tests/Views/HandlerFilterPermissionTest.php
+++ b/core/modules/user/src/Tests/Views/HandlerFilterPermissionTest.php
@@ -8,7 +8,6 @@
namespace Drupal\user\Tests\Views;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\user\Tests\Views\UserUnitTestBase;
use Drupal\views\Views;
/**
@@ -17,7 +16,7 @@
* @group user
* @see \Drupal\user\Plugin\views\filter\Permissions
*/
-class HandlerFilterPermissionTest extends UserUnitTestBase {
+class HandlerFilterPermissionTest extends UserKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/user/src/Tests/Views/HandlerFilterRolesTest.php b/core/modules/user/src/Tests/Views/HandlerFilterRolesTest.php
index 6ad9e4503a93d8b6baeff704c016122e3229fb21..3268eecf53f6b0f133164ec3da3ff8b4d8dcf684 100644
--- a/core/modules/user/src/Tests/Views/HandlerFilterRolesTest.php
+++ b/core/modules/user/src/Tests/Views/HandlerFilterRolesTest.php
@@ -8,7 +8,6 @@
namespace Drupal\user\Tests\Views;
use Drupal\user\Entity\Role;
-use Drupal\user\Tests\Views\UserUnitTestBase;
use Drupal\views\Entity\View;
use Drupal\views\Views;
@@ -19,7 +18,7 @@
*
* @see \Drupal\user\Plugin\views\filter\Roles
*/
-class HandlerFilterRolesTest extends UserUnitTestBase {
+class HandlerFilterRolesTest extends UserKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/user/src/Tests/Views/UserUnitTestBase.php b/core/modules/user/src/Tests/Views/UserKernelTestBase.php
similarity index 94%
rename from core/modules/user/src/Tests/Views/UserUnitTestBase.php
rename to core/modules/user/src/Tests/Views/UserKernelTestBase.php
index 433719f21b707768d1f175bb11726a024c8dcac4..6b92ae232072608e882b4c007256a84dbdf9ad3a 100644
--- a/core/modules/user/src/Tests/Views/UserUnitTestBase.php
+++ b/core/modules/user/src/Tests/Views/UserKernelTestBase.php
@@ -2,18 +2,18 @@
/**
* @file
- * Contains \Drupal\user\Tests\Views\UserUnitTestBase.
+ * Contains \Drupal\user\Tests\Views\UserKernelTestBase.
*/
namespace Drupal\user\Tests\Views;
use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
/**
* Provides a common test base for user views tests.
*/
-abstract class UserUnitTestBase extends ViewUnitTestBase {
+abstract class UserKernelTestBase extends ViewKernelTestBase {
/**
* Modules to enable.
diff --git a/core/modules/views/src/Tests/BasicTest.php b/core/modules/views/src/Tests/BasicTest.php
index 42d622fb5358aecbd13106ba95f58224d8ab48f8..69aacf064e0e0f36c71420b953343a2966e4551c 100644
--- a/core/modules/views/src/Tests/BasicTest.php
+++ b/core/modules/views/src/Tests/BasicTest.php
@@ -14,7 +14,7 @@
*
* @group views
*/
-class BasicTest extends ViewUnitTestBase {
+class BasicTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php b/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php
index 1037f455be2b8f2729fc4cbbfa54499e32ba5c23..af045bf292a270da15ea0ba57a830477e48e9306 100644
--- a/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php
+++ b/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php
@@ -9,7 +9,7 @@
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\node\Entity\NodeType;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -18,7 +18,7 @@
* @group views
* @see \Drupal\views\Entity\Render\RendererBase
*/
-class RowEntityRenderersTest extends ViewUnitTestBase {
+class RowEntityRenderersTest extends ViewKernelTestBase {
/**
* Modules to enable.
diff --git a/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php b/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php
index 8805214c7359808bf0818d4695274813ce641486..e8a7c1bd661a13a00df79440c3be95a56b7ef352 100644
--- a/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php
+++ b/core/modules/views/src/Tests/Entity/ViewEntityDependenciesTest.php
@@ -10,7 +10,7 @@
use Drupal\Component\Utility\Unicode;
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -18,7 +18,7 @@
*
* @group views
*/
-class ViewEntityDependenciesTest extends ViewUnitTestBase {
+class ViewEntityDependenciesTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php b/core/modules/views/src/Tests/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
index dba5b2a912857d890211922933fd3dc0670300cb..b7e29b54d9f1ddfa9b123dc4f4847c5e0135c67a 100644
--- a/core/modules/views/src/Tests/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
+++ b/core/modules/views/src/Tests/EventSubscriber/ViewsEntitySchemaSubscriberIntegrationTest.php
@@ -11,14 +11,14 @@
use Drupal\Core\Entity\EntityTypeEvents;
use Drupal\system\Tests\Entity\EntityDefinitionTestTrait;
use Drupal\views\Entity\View;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
/**
* Tests \Drupal\views\EventSubscriber\ViewsEntitySchemaSubscriber
*
* @group Views
*/
-class ViewsEntitySchemaSubscriberIntegrationTest extends ViewUnitTestBase {
+class ViewsEntitySchemaSubscriberIntegrationTest extends ViewKernelTestBase {
use EntityDefinitionTestTrait;
diff --git a/core/modules/views/src/Tests/Handler/AreaEntityTest.php b/core/modules/views/src/Tests/Handler/AreaEntityTest.php
index b97a87e634e6f7570e688200e5d39b2055fdc2c4..ff1f83f4257f77e1744556dc898ff29e5bc740e6 100644
--- a/core/modules/views/src/Tests/Handler/AreaEntityTest.php
+++ b/core/modules/views/src/Tests/Handler/AreaEntityTest.php
@@ -11,7 +11,7 @@
use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Form\FormState;
use Drupal\views\Entity\View;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -20,7 +20,7 @@
* @group views
* @see \Drupal\views\Plugin\views\area\Entity
*/
-class AreaEntityTest extends ViewUnitTestBase {
+class AreaEntityTest extends ViewKernelTestBase {
/**
* Modules to enable.
diff --git a/core/modules/views/src/Tests/Handler/AreaTextTest.php b/core/modules/views/src/Tests/Handler/AreaTextTest.php
index 7fa5c13171237441ac328748a6fed27dab9f945b..b0723d1cc691962977e883fcbe270e7df6535b8d 100644
--- a/core/modules/views/src/Tests/Handler/AreaTextTest.php
+++ b/core/modules/views/src/Tests/Handler/AreaTextTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -16,7 +16,7 @@
* @group views
* @see \Drupal\views\Plugin\views\area\Text
*/
-class AreaTextTest extends ViewUnitTestBase {
+class AreaTextTest extends ViewKernelTestBase {
public static $modules = array('system', 'user', 'filter');
diff --git a/core/modules/views/src/Tests/Handler/AreaTitleTest.php b/core/modules/views/src/Tests/Handler/AreaTitleTest.php
index 8df15ef7714215644443a7743c7f3b3b498458c5..06641a9f752580f2471a55c66afbdfce3bf1cb48 100644
--- a/core/modules/views/src/Tests/Handler/AreaTitleTest.php
+++ b/core/modules/views/src/Tests/Handler/AreaTitleTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -16,7 +16,7 @@
* @group views
* @see \Drupal\views\Plugin\views\area\Title
*/
-class AreaTitleTest extends ViewUnitTestBase {
+class AreaTitleTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Handler/AreaViewTest.php b/core/modules/views/src/Tests/Handler/AreaViewTest.php
index 858e4faaa72588ef10ce9b013b8c46d159ce9b00..f228937ae2f3e9a6d660bdb3061b31e9a95eb5b5 100644
--- a/core/modules/views/src/Tests/Handler/AreaViewTest.php
+++ b/core/modules/views/src/Tests/Handler/AreaViewTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -16,7 +16,7 @@
* @group views
* @see \Drupal\views\Plugin\views\area\View
*/
-class AreaViewTest extends ViewUnitTestBase {
+class AreaViewTest extends ViewKernelTestBase {
/**
* Modules to enable.
diff --git a/core/modules/views/src/Tests/Handler/ArgumentDateTest.php b/core/modules/views/src/Tests/Handler/ArgumentDateTest.php
index c6e295760d9b55eec85d8617a38db26156a11807..678698f121a9967a60257ff55eb55f076580cc88 100644
--- a/core/modules/views/src/Tests/Handler/ArgumentDateTest.php
+++ b/core/modules/views/src/Tests/Handler/ArgumentDateTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -16,7 +16,7 @@
* @group views
* @see \Drupal\views\Plugin\views\argument\Date
*/
-class ArgumentDateTest extends ViewUnitTestBase {
+class ArgumentDateTest extends ViewKernelTestBase {
/**
* Views used by this test.
@@ -35,7 +35,7 @@ class ArgumentDateTest extends ViewUnitTestBase {
);
/**
- * Overrides \Drupal\views\Tests\ViewUnitTestBase::viewsData().
+ * Overrides \Drupal\views\Tests\ViewKernelTestBase::viewsData().
*/
public function viewsData() {
$data = parent::viewsData();
diff --git a/core/modules/views/src/Tests/Handler/ArgumentNullTest.php b/core/modules/views/src/Tests/Handler/ArgumentNullTest.php
index b366d00bc5c719b4e4e69f6cd1f3074c72101aac..6f8be5379a3e14aeda927e9b37626813b741f414 100644
--- a/core/modules/views/src/Tests/Handler/ArgumentNullTest.php
+++ b/core/modules/views/src/Tests/Handler/ArgumentNullTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -15,7 +15,7 @@
*
* @group views
*/
-class ArgumentNullTest extends ViewUnitTestBase {
+class ArgumentNullTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Handler/FieldBooleanTest.php b/core/modules/views/src/Tests/Handler/FieldBooleanTest.php
index 38c6a531234fd62179c54e9a0515696b0bc465bf..da3248289bd8dd8a6dffa8c97bf8c05fc1a8363e 100644
--- a/core/modules/views/src/Tests/Handler/FieldBooleanTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldBooleanTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -15,7 +15,7 @@
*
* @group views
*/
-class FieldBooleanTest extends ViewUnitTestBase {
+class FieldBooleanTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Handler/FieldCounterTest.php b/core/modules/views/src/Tests/Handler/FieldCounterTest.php
index 9fe24743cd3e728f034935d70ae1dc96849fdd94..4561ad60eead795987b8f83754a06f65925bb0bd 100644
--- a/core/modules/views/src/Tests/Handler/FieldCounterTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldCounterTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -15,7 +15,7 @@
*
* @group views
*/
-class FieldCounterTest extends ViewUnitTestBase {
+class FieldCounterTest extends ViewKernelTestBase {
/**
* Modules to enable.
diff --git a/core/modules/views/src/Tests/Handler/FieldCustomTest.php b/core/modules/views/src/Tests/Handler/FieldCustomTest.php
index 4ea1d9d0144d949331736e77464db62bf3a1f523..a94e46dbfbbdbd4ecb679a97552c7b408e3d0494 100644
--- a/core/modules/views/src/Tests/Handler/FieldCustomTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldCustomTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -15,7 +15,7 @@
*
* @group views
*/
-class FieldCustomTest extends ViewUnitTestBase {
+class FieldCustomTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Handler/FieldDateTest.php b/core/modules/views/src/Tests/Handler/FieldDateTest.php
index 58086d503eb41cf225a40f43cf119e7390f8f5cf..004118f1a52b1af97f1f22e16ac57ce863e7e10c 100644
--- a/core/modules/views/src/Tests/Handler/FieldDateTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldDateTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -15,7 +15,7 @@
*
* @group views
*/
-class FieldDateTest extends ViewUnitTestBase {
+class FieldDateTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Handler/FieldEntityLinkTest.php b/core/modules/views/src/Tests/Handler/FieldEntityLinkTest.php
index 9076edf73a3decbec193908f3baad509da953b70..01a66ec7bb89d0662680d7fd564cf371e8144614 100644
--- a/core/modules/views/src/Tests/Handler/FieldEntityLinkTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldEntityLinkTest.php
@@ -10,7 +10,7 @@
use Drupal\Core\Session\AccountInterface;
use Drupal\entity_test\Entity\EntityTest;
use Drupal\simpletest\UserCreationTrait;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -18,7 +18,7 @@
*
* @group views
*/
-class FieldEntityLinkTest extends ViewUnitTestBase {
+class FieldEntityLinkTest extends ViewKernelTestBase {
use UserCreationTrait;
diff --git a/core/modules/views/src/Tests/Handler/FieldFieldAccessTestBase.php b/core/modules/views/src/Tests/Handler/FieldFieldAccessTestBase.php
index 9ab720b980844e352e7521d52e75e6e8ac2912a4..48bd00cb7765260248026a5c2949b4ab5d734c3f 100644
--- a/core/modules/views/src/Tests/Handler/FieldFieldAccessTestBase.php
+++ b/core/modules/views/src/Tests/Handler/FieldFieldAccessTestBase.php
@@ -10,13 +10,13 @@
use Drupal\user\Entity\Role;
use Drupal\user\Entity\User;
use Drupal\views\Entity\View;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
* Provides a base class for base field access in views.
*/
-abstract class FieldFieldAccessTestBase extends ViewUnitTestBase {
+abstract class FieldFieldAccessTestBase extends ViewKernelTestBase {
/**
* Stores an user entity with access to fields.
diff --git a/core/modules/views/src/Tests/Handler/FieldFieldTest.php b/core/modules/views/src/Tests/Handler/FieldFieldTest.php
index 5993385819379a0a12e32d9ff1cb1e836099992b..611c16154c5126f8df536c7091c002eff6c2e8ac 100644
--- a/core/modules/views/src/Tests/Handler/FieldFieldTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldFieldTest.php
@@ -14,7 +14,7 @@
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\user\Entity\User;
use Drupal\views\Plugin\views\field\Field;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -23,7 +23,7 @@
* @see \Drupal\views\Plugin\views\field\Field
* @group views
*/
-class FieldFieldTest extends ViewUnitTestBase {
+class FieldFieldTest extends ViewKernelTestBase {
/**
* {@inheritdoc}
diff --git a/core/modules/views/src/Tests/Handler/FieldFileSizeTest.php b/core/modules/views/src/Tests/Handler/FieldFileSizeTest.php
index 70edf227be7ece2c76a74f472f8c00222b21d6df..dd97f1b174ae2495c933b4628160ac67396aecb1 100644
--- a/core/modules/views/src/Tests/Handler/FieldFileSizeTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldFileSizeTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -16,7 +16,7 @@
* @group views
* @see CommonXssUnitTest
*/
-class FieldFileSizeTest extends ViewUnitTestBase {
+class FieldFileSizeTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Handler/FieldUnitTest.php b/core/modules/views/src/Tests/Handler/FieldKernelTest.php
similarity index 99%
rename from core/modules/views/src/Tests/Handler/FieldUnitTest.php
rename to core/modules/views/src/Tests/Handler/FieldKernelTest.php
index 7ad9cdca21088eda34dff9835a20bcbeb19eb8f1..b1897cd841d426eb03b409b3db4cd314c520b646 100644
--- a/core/modules/views/src/Tests/Handler/FieldUnitTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldKernelTest.php
@@ -2,13 +2,13 @@
/**
* @file
- * Contains \Drupal\views\Tests\Handler\FieldUnitTest.
+ * Contains \Drupal\views\Tests\Handler\FieldKernelTest.
*/
namespace Drupal\views\Tests\Handler;
use Drupal\Core\Render\RenderContext;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Plugin\views\field\FieldPluginBase;
use Drupal\views\Views;
@@ -18,7 +18,7 @@
* @group views
* @see \Drupal\views\Plugin\views\field\FieldPluginBase
*/
-class FieldUnitTest extends ViewUnitTestBase {
+class FieldKernelTest extends ViewKernelTestBase {
public static $modules = array('user');
diff --git a/core/modules/views/src/Tests/Handler/FieldUrlTest.php b/core/modules/views/src/Tests/Handler/FieldUrlTest.php
index 3f3e5bbac51e1f585be6b699887375739660559d..d3451aa0194dcde23fb1ec5504de4d187b341dd5 100644
--- a/core/modules/views/src/Tests/Handler/FieldUrlTest.php
+++ b/core/modules/views/src/Tests/Handler/FieldUrlTest.php
@@ -8,7 +8,7 @@
namespace Drupal\views\Tests\Handler;
use Drupal\Core\Url;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -16,7 +16,7 @@
*
* @group views
*/
-class FieldUrlTest extends ViewUnitTestBase {
+class FieldUrlTest extends ViewKernelTestBase {
public static $modules = array('system');
diff --git a/core/modules/views/src/Tests/Handler/FilterBooleanOperatorStringTest.php b/core/modules/views/src/Tests/Handler/FilterBooleanOperatorStringTest.php
index b82b2404e28f1fe48cceb5c21c780dbb682e6802..d3f368826ef150aca77a588f073237dadefb02e4 100644
--- a/core/modules/views/src/Tests/Handler/FilterBooleanOperatorStringTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterBooleanOperatorStringTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -17,7 +17,7 @@
* @group views
* @see \Drupal\views\Plugin\views\filter\BooleanOperatorString
*/
-class FilterBooleanOperatorStringTest extends ViewUnitTestBase {
+class FilterBooleanOperatorStringTest extends ViewKernelTestBase {
/**
* The modules to enable for this test.
diff --git a/core/modules/views/src/Tests/Handler/FilterBooleanOperatorTest.php b/core/modules/views/src/Tests/Handler/FilterBooleanOperatorTest.php
index fc43f50915aaade3251f15d0de0f295ba30a0619..049d439dbe8f7e53622868b1ed0bf81c9463bc0a 100644
--- a/core/modules/views/src/Tests/Handler/FilterBooleanOperatorTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterBooleanOperatorTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -16,7 +16,7 @@
* @group views
* @see \Drupal\views\Plugin\views\filter\BooleanOperator
*/
-class FilterBooleanOperatorTest extends ViewUnitTestBase {
+class FilterBooleanOperatorTest extends ViewKernelTestBase {
/**
* The modules to enable for this test.
diff --git a/core/modules/views/src/Tests/Handler/FilterCombineTest.php b/core/modules/views/src/Tests/Handler/FilterCombineTest.php
index f8c749561c5153989d5ef24cd2b8f65a1db64fc1..9ad83c33c31fd825c42d9559c50b2baf43e85631 100644
--- a/core/modules/views/src/Tests/Handler/FilterCombineTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterCombineTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -15,7 +15,7 @@
*
* @group views
*/
-class FilterCombineTest extends ViewUnitTestBase {
+class FilterCombineTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Handler/FilterEqualityTest.php b/core/modules/views/src/Tests/Handler/FilterEqualityTest.php
index bda80ee3b2609ce999f12bcef0a39dfe3e9658ba..a25d9ba230c223777aa7f8923c58950eb60d7dfa 100644
--- a/core/modules/views/src/Tests/Handler/FilterEqualityTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterEqualityTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -15,7 +15,7 @@
*
* @group views
*/
-class FilterEqualityTest extends ViewUnitTestBase {
+class FilterEqualityTest extends ViewKernelTestBase {
public static $modules = array('system');
diff --git a/core/modules/views/src/Tests/Handler/FilterInOperatorTest.php b/core/modules/views/src/Tests/Handler/FilterInOperatorTest.php
index 7f5609f301003f06b8db0b494bf12cf29bf43567..65c645c20c7858ad186d9b63537ed545698a005d 100644
--- a/core/modules/views/src/Tests/Handler/FilterInOperatorTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterInOperatorTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -15,7 +15,7 @@
*
* @group views
*/
-class FilterInOperatorTest extends ViewUnitTestBase {
+class FilterInOperatorTest extends ViewKernelTestBase {
public static $modules = array('system');
diff --git a/core/modules/views/src/Tests/Handler/FilterNumericTest.php b/core/modules/views/src/Tests/Handler/FilterNumericTest.php
index 9396b3bdf414d037509d1eb31a74b572ea3472ba..2da40ce176fef48714b7c81e25869c5873c5fc54 100644
--- a/core/modules/views/src/Tests/Handler/FilterNumericTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterNumericTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -15,7 +15,7 @@
*
* @group views
*/
-class FilterNumericTest extends ViewUnitTestBase {
+class FilterNumericTest extends ViewKernelTestBase {
public static $modules = array('system');
diff --git a/core/modules/views/src/Tests/Handler/FilterStringTest.php b/core/modules/views/src/Tests/Handler/FilterStringTest.php
index 1fe454dc833944d3088b539ba4cc14101d7b2ab4..acd3f50523d08462d38de8e98d341a4cd5c0d926 100644
--- a/core/modules/views/src/Tests/Handler/FilterStringTest.php
+++ b/core/modules/views/src/Tests/Handler/FilterStringTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -15,7 +15,7 @@
*
* @group views
*/
-class FilterStringTest extends ViewUnitTestBase {
+class FilterStringTest extends ViewKernelTestBase {
public static $modules = array('system');
diff --git a/core/modules/views/src/Tests/Handler/HandlerAliasTest.php b/core/modules/views/src/Tests/Handler/HandlerAliasTest.php
index 16318aa72cfdc27d5df58fefeea807727a2ab2f8..fdbe9ad6ac3a422be731ac69eaebc4406be27f00 100644
--- a/core/modules/views/src/Tests/Handler/HandlerAliasTest.php
+++ b/core/modules/views/src/Tests/Handler/HandlerAliasTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -15,7 +15,7 @@
*
* @group views
*/
-class HandlerAliasTest extends ViewUnitTestBase {
+class HandlerAliasTest extends ViewKernelTestBase {
public static $modules = array('user');
diff --git a/core/modules/views/src/Tests/Handler/SortDateTest.php b/core/modules/views/src/Tests/Handler/SortDateTest.php
index 371ba8d9510babf729b6144e3e59011fe26136ba..b494cf683647809d0d27edb4a2c21eef08b43fad 100644
--- a/core/modules/views/src/Tests/Handler/SortDateTest.php
+++ b/core/modules/views/src/Tests/Handler/SortDateTest.php
@@ -8,7 +8,7 @@
namespace Drupal\views\Tests\Handler;
use Drupal\Component\Utility\SafeMarkup;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -16,7 +16,7 @@
*
* @group views
*/
-class SortDateTest extends ViewUnitTestBase {
+class SortDateTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Handler/SortRandomTest.php b/core/modules/views/src/Tests/Handler/SortRandomTest.php
index 9c2c44b21b742edd31e3a7e8c95df1a2519a6c34..9a9b5a69355df7194476c488653da0625a080bc9 100644
--- a/core/modules/views/src/Tests/Handler/SortRandomTest.php
+++ b/core/modules/views/src/Tests/Handler/SortRandomTest.php
@@ -9,7 +9,7 @@
use Drupal\Core\Cache\Cache;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -17,7 +17,7 @@
*
* @group views
*/
-class SortRandomTest extends ViewUnitTestBase {
+class SortRandomTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Handler/SortTest.php b/core/modules/views/src/Tests/Handler/SortTest.php
index 0a1d8c83077aae35ff6abe1135bde807658f6588..e050a3ffdb87964678906a86fc6a7ea919e9ff3b 100644
--- a/core/modules/views/src/Tests/Handler/SortTest.php
+++ b/core/modules/views/src/Tests/Handler/SortTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -15,7 +15,7 @@
*
* @group views
*/
-class SortTest extends ViewUnitTestBase {
+class SortTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/ModuleTest.php b/core/modules/views/src/Tests/ModuleTest.php
index f46749ec268f97ef828d051a233ef35cfaa965e3..7d5a31b655975e8a6554217a86e612f2cbffa9e0 100644
--- a/core/modules/views/src/Tests/ModuleTest.php
+++ b/core/modules/views/src/Tests/ModuleTest.php
@@ -16,7 +16,7 @@
use Drupal\views\Views;
use Drupal\Component\Utility\SafeMarkup;
-class ModuleTest extends ViewUnitTestBase {
+class ModuleTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Plugin/ArgumentValidatorTest.php b/core/modules/views/src/Tests/Plugin/ArgumentValidatorTest.php
index 235635ae1b97b7c30a6c97ee04a6f91fca83376d..ecbcf51fd5f4e34fc8f64f14588ef053c87d6bf1 100644
--- a/core/modules/views/src/Tests/Plugin/ArgumentValidatorTest.php
+++ b/core/modules/views/src/Tests/Plugin/ArgumentValidatorTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Plugin;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -15,7 +15,7 @@
*
* @group views
*/
-class ArgumentValidatorTest extends ViewUnitTestBase {
+class ArgumentValidatorTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php b/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php
index b8488a19dd11446e4c8ab8eaccae6705c3c59be0..4d08d3ad67bd05f10e4b3c3bc47f84747a2c86f6 100644
--- a/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php
+++ b/core/modules/views/src/Tests/Plugin/BlockDependenciesTest.php
@@ -8,14 +8,14 @@
namespace Drupal\views\Tests\Plugin;
use Drupal\Core\Cache\Cache;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
/**
* Tests views block config dependencies functionality.
*
* @group views
*/
-class BlockDependenciesTest extends ViewUnitTestBase {
+class BlockDependenciesTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Plugin/CacheTest.php b/core/modules/views/src/Tests/Plugin/CacheTest.php
index 0d8c9075bd9b6e375eb297cbf25853acbea81cb3..be2377080f9691cc07ec541d70c1bad68c1f9b6e 100644
--- a/core/modules/views/src/Tests/Plugin/CacheTest.php
+++ b/core/modules/views/src/Tests/Plugin/CacheTest.php
@@ -9,7 +9,7 @@
use Drupal\Core\Render\RenderContext;
use Drupal\node\Entity\Node;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
use Drupal\views_test_data\Plugin\views\filter\FilterTest as FilterPlugin;
@@ -19,7 +19,7 @@
* @group views
* @see views_plugin_cache
*/
-class CacheTest extends ViewUnitTestBase {
+class CacheTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Plugin/DisplayUnitTest.php b/core/modules/views/src/Tests/Plugin/DisplayKernelTest.php
similarity index 96%
rename from core/modules/views/src/Tests/Plugin/DisplayUnitTest.php
rename to core/modules/views/src/Tests/Plugin/DisplayKernelTest.php
index 918f3bd1958726cae987bae60255443160d81f86..e07a536f971f4309a266d374fa11495a0715f67e 100644
--- a/core/modules/views/src/Tests/Plugin/DisplayUnitTest.php
+++ b/core/modules/views/src/Tests/Plugin/DisplayKernelTest.php
@@ -1,13 +1,13 @@
<?php
/**
* @file
- * Contains \Drupal\views\Tests\Plugin\DisplayUnitTest.
+ * Contains \Drupal\views\Tests\Plugin\DisplayKernelTest.
*/
namespace Drupal\views\Tests\Plugin;
use Drupal\views\Views;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Plugin\views\style\StylePluginBase;
use Drupal\views\Plugin\views\access\AccessPluginBase;
use Drupal\views\Plugin\views\exposed_form\ExposedFormPluginBase;
@@ -21,7 +21,7 @@
*
* @group views
*/
-class DisplayUnitTest extends ViewUnitTestBase {
+class DisplayKernelTest extends ViewKernelTestBase {
/**
* Modules to enable.
diff --git a/core/modules/views/src/Tests/Plugin/DisplayPageTest.php b/core/modules/views/src/Tests/Plugin/DisplayPageTest.php
index 373fe5afb87a571441e56ba95ae9e0c549fe58ad..49151ccd5bbf7eec95e748c92dc1c7777e2c193a 100644
--- a/core/modules/views/src/Tests/Plugin/DisplayPageTest.php
+++ b/core/modules/views/src/Tests/Plugin/DisplayPageTest.php
@@ -10,7 +10,7 @@
use Drupal\Core\Menu\MenuTreeParameters;
use Drupal\Core\Session\AnonymousUserSession;
use Drupal\views\Views;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\HttpKernelInterface;
@@ -21,7 +21,7 @@
* @group views
* @see \Drupal\views\Plugin\display\Page
*/
-class DisplayPageTest extends ViewUnitTestBase {
+class DisplayPageTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Plugin/PagerKernelTest.php b/core/modules/views/src/Tests/Plugin/PagerKernelTest.php
index 71a1c0b62a48b0ae0994c917a566319de5ab57cc..9edfa4c0959a7b6ef5870e7f57eeb70c7a6c2dc1 100644
--- a/core/modules/views/src/Tests/Plugin/PagerKernelTest.php
+++ b/core/modules/views/src/Tests/Plugin/PagerKernelTest.php
@@ -8,7 +8,7 @@
namespace Drupal\views\Tests\Plugin;
use Drupal\Core\Cache\CacheBackendInterface;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -16,7 +16,7 @@
*
* @group views
*/
-class PagerKernelTest extends ViewUnitTestBase {
+class PagerKernelTest extends ViewKernelTestBase {
/**
* {@inheritdoc}
diff --git a/core/modules/views/src/Tests/Plugin/PluginKernelTestBase.php b/core/modules/views/src/Tests/Plugin/PluginKernelTestBase.php
new file mode 100644
index 0000000000000000000000000000000000000000..d27a05fca09e943b7ff34e59823f1d2e3765c6d5
--- /dev/null
+++ b/core/modules/views/src/Tests/Plugin/PluginKernelTestBase.php
@@ -0,0 +1,17 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\views\Tests\Plugin\PluginKernelTestBase.
+ */
+
+namespace Drupal\views\Tests\Plugin;
+
+use Drupal\views\Tests\ViewKernelTestBase;
+
+/**
+ * Base test class for views plugin unit tests.
+ */
+abstract class PluginKernelTestBase extends ViewKernelTestBase {
+
+}
diff --git a/core/modules/views/src/Tests/Plugin/PluginUnitTestBase.php b/core/modules/views/src/Tests/Plugin/PluginUnitTestBase.php
deleted file mode 100644
index 96ebcda4b7b0cf5f6eeb26b999db48e6bf359849..0000000000000000000000000000000000000000
--- a/core/modules/views/src/Tests/Plugin/PluginUnitTestBase.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\views\Tests\Plugin\PluginUnitTestBase.
- */
-
-namespace Drupal\views\Tests\Plugin;
-
-use Drupal\views\Tests\ViewUnitTestBase;
-
-/**
- * Base test class for views plugin unit tests.
- */
-abstract class PluginUnitTestBase extends ViewUnitTestBase {
-
-}
diff --git a/core/modules/views/src/Tests/Plugin/QueryTest.php b/core/modules/views/src/Tests/Plugin/QueryTest.php
index 38ab1a032c1d9d425306f80e360222909765cab4..7dcff7eba9dcdde4ca1039ee169998f04e569398 100644
--- a/core/modules/views/src/Tests/Plugin/QueryTest.php
+++ b/core/modules/views/src/Tests/Plugin/QueryTest.php
@@ -8,7 +8,7 @@
namespace Drupal\views\Tests\Plugin;
use Drupal\views\Views;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views_test_data\Plugin\views\query\QueryTest as QueryTestPlugin;
/**
@@ -16,7 +16,7 @@
*
* @group views
*/
-class QueryTest extends ViewUnitTestBase {
+class QueryTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php b/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php
index 5620c0aa1557acdf1b64099e8acac8c71abfdcc4..7e317f2755ba65351f17f7506d7eaf2e58d8f888 100644
--- a/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php
+++ b/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php
@@ -15,7 +15,7 @@
* @see \Drupal\views\Tests\Handler\JoinTest
* @see \Drupal\views\Tests\Plugin\RelationshipTest
*/
-abstract class RelationshipJoinTestBase extends PluginUnitTestBase {
+abstract class RelationshipJoinTestBase extends PluginKernelTestBase {
/**
* Modules to enable.
@@ -30,7 +30,7 @@ abstract class RelationshipJoinTestBase extends PluginUnitTestBase {
protected $rootUser;
/**
- * Overrides \Drupal\views\Tests\ViewUnitTestBase::setUpFixtures().
+ * Overrides \Drupal\views\Tests\ViewKernelTestBase::setUpFixtures().
*/
protected function setUpFixtures() {
$this->installEntitySchema('user');
diff --git a/core/modules/views/src/Tests/Plugin/RowEntityTest.php b/core/modules/views/src/Tests/Plugin/RowEntityTest.php
index 7de030528ce741cb5528e6a13e534cff37f7b078..9723750412b73e97b5ce470549928f405003093d 100644
--- a/core/modules/views/src/Tests/Plugin/RowEntityTest.php
+++ b/core/modules/views/src/Tests/Plugin/RowEntityTest.php
@@ -9,7 +9,7 @@
use Drupal\Core\Form\FormState;
use Drupal\views\Views;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
/**
* Tests the generic entity row plugin.
@@ -17,7 +17,7 @@
* @group views
* @see \Drupal\views\Plugin\views\row\EntityRow
*/
-class RowEntityTest extends ViewUnitTestBase {
+class RowEntityTest extends ViewKernelTestBase {
/**
* Modules to enable.
diff --git a/core/modules/views/src/Tests/Plugin/RowRenderCacheTest.php b/core/modules/views/src/Tests/Plugin/RowRenderCacheTest.php
index d44e229b11f061bc22d24f5eacdcf8ddb79d8686..c00d584734555da12043b6d471aea8bf36178383 100644
--- a/core/modules/views/src/Tests/Plugin/RowRenderCacheTest.php
+++ b/core/modules/views/src/Tests/Plugin/RowRenderCacheTest.php
@@ -12,7 +12,7 @@
use Drupal\node\Entity\NodeType;
use Drupal\node\NodeInterface;
use Drupal\simpletest\UserCreationTrait;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -20,7 +20,7 @@
*
* @group views
*/
-class RowRenderCacheTest extends ViewUnitTestBase {
+class RowRenderCacheTest extends ViewKernelTestBase {
use UserCreationTrait;
diff --git a/core/modules/views/src/Tests/Plugin/SqlQueryTest.php b/core/modules/views/src/Tests/Plugin/SqlQueryTest.php
index 08e0f3c2371cd9cf7da522c3057ccebdae5a6d56..0880a072a94893316c5c3007df47830640bbd602 100644
--- a/core/modules/views/src/Tests/Plugin/SqlQueryTest.php
+++ b/core/modules/views/src/Tests/Plugin/SqlQueryTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Plugin;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -16,7 +16,7 @@
* @group views
* @see \Drupal\views\Plugin\views\query\Sql
*/
-class SqlQueryTest extends ViewUnitTestBase {
+class SqlQueryTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Plugin/StyleHtmlListTest.php b/core/modules/views/src/Tests/Plugin/StyleHtmlListTest.php
index 552a5b10fb2be64eb1128de10a053b6d5b85983d..1ff45b11f1afd053e4f3e421b94df467d30a78f0 100644
--- a/core/modules/views/src/Tests/Plugin/StyleHtmlListTest.php
+++ b/core/modules/views/src/Tests/Plugin/StyleHtmlListTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Plugin;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views\Views;
/**
@@ -16,7 +16,7 @@
* @group views
* @see \Drupal\views\Plugin\views\style\HtmlList
*/
-class StyleHtmlListTest extends ViewUnitTestBase {
+class StyleHtmlListTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Plugin/StyleTableUnitTest.php b/core/modules/views/src/Tests/Plugin/StyleTableUnitTest.php
index 28eff6b84e295aad38570d6f0e2f0992f70b86dc..54095e45256194a9115ced3cd86d528816079aa4 100644
--- a/core/modules/views/src/Tests/Plugin/StyleTableUnitTest.php
+++ b/core/modules/views/src/Tests/Plugin/StyleTableUnitTest.php
@@ -17,7 +17,7 @@
* @group views
* @see \Drupal\views\Plugin\views\style\Table
*/
-class StyleTableUnitTest extends PluginUnitTestBase {
+class StyleTableUnitTest extends PluginKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Plugin/StyleTestBase.php b/core/modules/views/src/Tests/Plugin/StyleTestBase.php
index 2369d98e901ca5137e834c0d14173e91eb83bfe8..38db4d9030bec585650fb23cb99090c163ce6670 100644
--- a/core/modules/views/src/Tests/Plugin/StyleTestBase.php
+++ b/core/modules/views/src/Tests/Plugin/StyleTestBase.php
@@ -7,13 +7,13 @@
namespace Drupal\views\Tests\Plugin;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Masterminds\HTML5;
/**
* Tests some general style plugin related functionality.
*/
-abstract class StyleTestBase extends ViewUnitTestBase {
+abstract class StyleTestBase extends ViewKernelTestBase {
/**
* Stores the SimpleXML representation of the output.
diff --git a/core/modules/views/src/Tests/Plugin/ViewsBlockTest.php b/core/modules/views/src/Tests/Plugin/ViewsBlockTest.php
index 7aa9381f5b18d0470767c3944596c2763ef0f71f..9e056a244b3f494faa3a30c92901702cc2cb82f1 100644
--- a/core/modules/views/src/Tests/Plugin/ViewsBlockTest.php
+++ b/core/modules/views/src/Tests/Plugin/ViewsBlockTest.php
@@ -10,14 +10,14 @@
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\views\Plugin\Block\ViewsBlock;
use Drupal\views\Tests\ViewTestData;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
/**
* Tests native behaviors of the block views plugin.
*
* @group views
*/
-class ViewsBlockTest extends ViewUnitTestBase {
+class ViewsBlockTest extends ViewKernelTestBase {
/**
* Modules to enable.
diff --git a/core/modules/views/src/Tests/PluginInstanceTest.php b/core/modules/views/src/Tests/PluginInstanceTest.php
index 3c819fbfd00efe05c0a024d9059e86607dfcf72d..86470307fc6bfc35098f1f979dfe9197a6fb466b 100644
--- a/core/modules/views/src/Tests/PluginInstanceTest.php
+++ b/core/modules/views/src/Tests/PluginInstanceTest.php
@@ -14,7 +14,7 @@
*
* @group views
*/
-class PluginInstanceTest extends ViewUnitTestBase {
+class PluginInstanceTest extends ViewKernelTestBase {
/**
* All views plugin types.
diff --git a/core/modules/views/src/Tests/QueryGroupByTest.php b/core/modules/views/src/Tests/QueryGroupByTest.php
index 4fb2062115ff7ef37af9ed79e63bc1c7386dee54..2a7ae227bd2dfa2c7394355fe1efba79b76f8f7e 100644
--- a/core/modules/views/src/Tests/QueryGroupByTest.php
+++ b/core/modules/views/src/Tests/QueryGroupByTest.php
@@ -18,7 +18,7 @@
*
* @group views
*/
-class QueryGroupByTest extends ViewUnitTestBase {
+class QueryGroupByTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/RenderCacheIntegrationTest.php b/core/modules/views/src/Tests/RenderCacheIntegrationTest.php
index 76a98576ea2a26ff40c8a6d99b2facc922a8bf60..a5b7cadf0752f71fa6b0dba7173f41d40b4172f6 100644
--- a/core/modules/views/src/Tests/RenderCacheIntegrationTest.php
+++ b/core/modules/views/src/Tests/RenderCacheIntegrationTest.php
@@ -19,7 +19,7 @@
*
* @group views
*/
-class RenderCacheIntegrationTest extends ViewUnitTestBase {
+class RenderCacheIntegrationTest extends ViewKernelTestBase {
use AssertViewsCacheTagsTrait;
diff --git a/core/modules/views/src/Tests/TokenReplaceTest.php b/core/modules/views/src/Tests/TokenReplaceTest.php
index 6410c90392d621891cf59016f5e1e1d1f1a23087..0462756b8d34d80d55997c8e7b607c821ba5fd23 100644
--- a/core/modules/views/src/Tests/TokenReplaceTest.php
+++ b/core/modules/views/src/Tests/TokenReplaceTest.php
@@ -15,7 +15,7 @@
*
* @group views
*/
-class TokenReplaceTest extends ViewUnitTestBase {
+class TokenReplaceTest extends ViewKernelTestBase {
public static $modules = array('system');
diff --git a/core/modules/views/src/Tests/ViewExecutableTest.php b/core/modules/views/src/Tests/ViewExecutableTest.php
index 26e381d9730c8392128e995f5690775145cbb691..4859f2a7e8a2e381be254c73f33a0b6547d179df 100644
--- a/core/modules/views/src/Tests/ViewExecutableTest.php
+++ b/core/modules/views/src/Tests/ViewExecutableTest.php
@@ -31,7 +31,7 @@
* @group views
* @see \Drupal\views\ViewExecutable
*/
-class ViewExecutableTest extends ViewUnitTestBase {
+class ViewExecutableTest extends ViewKernelTestBase {
use CommentTestTrait;
diff --git a/core/modules/views/src/Tests/ViewUnitTestBase.php b/core/modules/views/src/Tests/ViewKernelTestBase.php
similarity index 97%
rename from core/modules/views/src/Tests/ViewUnitTestBase.php
rename to core/modules/views/src/Tests/ViewKernelTestBase.php
index b5dfc422063090d25ea35fb876f5fd8658d1c59c..61036e02ff94ebd84bbec2496128867babe6b610 100644
--- a/core/modules/views/src/Tests/ViewUnitTestBase.php
+++ b/core/modules/views/src/Tests/ViewKernelTestBase.php
@@ -2,7 +2,7 @@
/**
* @file
- * Contains \Drupal\views\Tests\ViewUnitTestBase.
+ * Contains \Drupal\views\Tests\ViewKernelTestBase.
*/
namespace Drupal\views\Tests;
@@ -22,7 +22,7 @@
*
* @see \Drupal\views\Tests\ViewTestBase
*/
-abstract class ViewUnitTestBase extends KernelTestBase {
+abstract class ViewKernelTestBase extends KernelTestBase {
use ViewResultAssertionTrait;
diff --git a/core/modules/views/src/Tests/ViewStorageTest.php b/core/modules/views/src/Tests/ViewStorageTest.php
index e922ddf5c49717979ed23ea55e2c786ed6f8a608..357bfd8d7217d761e0f4710e6696c6770737c0e8 100644
--- a/core/modules/views/src/Tests/ViewStorageTest.php
+++ b/core/modules/views/src/Tests/ViewStorageTest.php
@@ -22,7 +22,7 @@
* @see \Drupal\views\Entity\View
* @see \Drupal\Core\Config\Entity\ConfigEntityStorage
*/
-class ViewStorageTest extends ViewUnitTestBase {
+class ViewStorageTest extends ViewKernelTestBase {
/**
* Properties that should be stored in the configuration.
diff --git a/core/modules/views/src/Tests/ViewTestBase.php b/core/modules/views/src/Tests/ViewTestBase.php
index 647ef92e2153d4a5d9010b8f7c91887776ed9552..ae67dcf2bebb7127efcac899285cd99330bf0821 100644
--- a/core/modules/views/src/Tests/ViewTestBase.php
+++ b/core/modules/views/src/Tests/ViewTestBase.php
@@ -15,10 +15,10 @@
* Defines a base class for Views testing in the full web test environment.
*
* Use this base test class if you need to emulate a full Drupal installation.
- * When possible, ViewUnitTestBase should be used instead. Both base classes
+ * When possible, ViewKernelTestBase should be used instead. Both base classes
* include the same methods.
*
- * @see \Drupal\views\Tests\ViewUnitTestBase
+ * @see \Drupal\views\Tests\ViewKernelTestBase
* @see \Drupal\simpletest\WebTestBase
*/
abstract class ViewTestBase extends WebTestBase {
diff --git a/core/modules/views/src/Tests/ViewTestData.php b/core/modules/views/src/Tests/ViewTestData.php
index 34fcd444dde1b903a09b919559ac6219005f14af..536470cefad8d303a9dcd1b0ddaa1ac3fac761a2 100644
--- a/core/modules/views/src/Tests/ViewTestData.php
+++ b/core/modules/views/src/Tests/ViewTestData.php
@@ -14,7 +14,7 @@
*
* The methods will be used by both views test base classes.
*
- * @see \Drupal\views\Tests\ViewUnitTestBase.
+ * @see \Drupal\views\Tests\ViewKernelTestBase.
* @see \Drupal\views\Tests\ViewTestBase.
*/
class ViewTestData {
diff --git a/core/modules/views/src/Tests/ViewsHooksTest.php b/core/modules/views/src/Tests/ViewsHooksTest.php
index 534df07b36df2ff612202fed9c11a77bc488f59f..2ed63e0021e09e879f41be97e41300adc6433ce8 100644
--- a/core/modules/views/src/Tests/ViewsHooksTest.php
+++ b/core/modules/views/src/Tests/ViewsHooksTest.php
@@ -16,7 +16,7 @@
* @see views_hook_info().
* @see field_hook_info().
*/
-class ViewsHooksTest extends ViewUnitTestBase {
+class ViewsHooksTest extends ViewKernelTestBase {
/**
* Views used by this test.
diff --git a/core/modules/views/src/Tests/Wizard/BasicTest.php b/core/modules/views/src/Tests/Wizard/BasicTest.php
index 32f570e4c9685729693faaf7fd2ef1f1b2ed83b0..d84722b01af7f2b37bc81a5dc5e735c9be1d6b68 100644
--- a/core/modules/views/src/Tests/Wizard/BasicTest.php
+++ b/core/modules/views/src/Tests/Wizard/BasicTest.php
@@ -203,7 +203,7 @@ public function testWizardDefaultValues() {
// Make sure the plugin types that should not have empty options don't have.
// Test against all values is unit tested.
- // @see \Drupal\views\Tests\Plugin\DisplayUnitTest
+ // @see \Drupal\views\Tests\Plugin\DisplayKernelTest
$view = Views::getView($random_id);
$displays = $view->storage->get('display');
diff --git a/core/modules/views/src/Tests/Wizard/WizardPluginBaseUnitTest.php b/core/modules/views/src/Tests/Wizard/WizardPluginBaseKernelTest.php
similarity index 92%
rename from core/modules/views/src/Tests/Wizard/WizardPluginBaseUnitTest.php
rename to core/modules/views/src/Tests/Wizard/WizardPluginBaseKernelTest.php
index fbd6682deac922846c12e089b41dd0dc0340b83f..009536e55d810931c572a07df1fb11a3bf6872cb 100644
--- a/core/modules/views/src/Tests/Wizard/WizardPluginBaseUnitTest.php
+++ b/core/modules/views/src/Tests/Wizard/WizardPluginBaseKernelTest.php
@@ -2,14 +2,14 @@
/**
* @file
- * Contains \Drupal\views\Tests\Wizard\WizardPluginBaseUnitTest.
+ * Contains \Drupal\views\Tests\Wizard\WizardPluginBaseKernelTest.
*/
namespace Drupal\views\Tests\Wizard;
use Drupal\Core\Form\FormState;
use Drupal\language\Entity\ConfigurableLanguage;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views_ui\ViewUI;
/**
@@ -18,7 +18,7 @@
* @group views
* @see \Drupal\views\Plugin\views\wizard\WizardPluginBase
*/
-class WizardPluginBaseUnitTest extends ViewUnitTestBase {
+class WizardPluginBaseKernelTest extends ViewKernelTestBase {
/**
* Modules to enable.
diff --git a/core/modules/views_ui/src/Tests/TagTest.php b/core/modules/views_ui/src/Tests/TagTest.php
index 673b91fbf3cee04ea2ee2bf96e987a11991a6dbf..0dd6f4f798144d0ed553577b4de1787fc329c496 100644
--- a/core/modules/views_ui/src/Tests/TagTest.php
+++ b/core/modules/views_ui/src/Tests/TagTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views_ui\Tests;
-use Drupal\views\Tests\ViewUnitTestBase;
+use Drupal\views\Tests\ViewKernelTestBase;
use Drupal\views_ui\Controller\ViewsUIController;
/**
@@ -15,7 +15,7 @@
*
* @group views_ui
*/
-class TagTest extends ViewUnitTestBase {
+class TagTest extends ViewKernelTestBase {
/**
* Modules to enable.