Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
ee9f19cf
Commit
ee9f19cf
authored
Mar 15, 2016
by
alexpott
Browse files
Issue
#2553655
by dawehner, Berdir, martin107: Convert ViewKernelTestBase to use KernelTestBaseTNG
parent
e6f491d8
Changes
101
Hide whitespace changes
Inline
Side-by-side
core/lib/Drupal/Core/DependencyInjection/DependencySerializationTrait.php
View file @
ee9f19cf
...
...
@@ -49,6 +49,10 @@ public function __sleep() {
* {@inheritdoc}
*/
public
function
__wakeup
()
{
// Tests in isolation potentially unserialize in the parent process.
if
(
isset
(
$GLOBALS
[
'__PHPUNIT_BOOTSTRAP'
])
&&
!
\
Drupal
::
hasContainer
())
{
return
;
}
$container
=
\
Drupal
::
getContainer
();
foreach
(
$this
->
_serviceIds
as
$key
=>
$service_id
)
{
$this
->
$key
=
$container
->
get
(
$service_id
);
...
...
core/modules/aggregator/
src/Tests
/Views/AggregatorFeedViewsFieldAccessTest.php
→
core/modules/aggregator/
tests/src/Kernel
/Views/AggregatorFeedViewsFieldAccessTest.php
View file @
ee9f19cf
...
...
@@ -2,13 +2,13 @@
/**
* @file
* Contains \Drupal\aggregator\
Tests
\Views\AggregatorFeedViewsFieldAccessTest.
* Contains \Drupal\
Tests\
aggregator\
Kernel
\Views\AggregatorFeedViewsFieldAccessTest.
*/
namespace
Drupal\aggregator\
Tests
\Views
;
namespace
Drupal\
Tests\
aggregator\
Kernel
\Views
;
use
Drupal\aggregator\Entity\Feed
;
use
Drupal\
views\Tests
\Handler\FieldFieldAccessTestBase
;
use
Drupal\
Tests\views\Kernel
\Handler\FieldFieldAccessTestBase
;
/**
* Tests base field access in Views for the aggregator_feed entity.
...
...
core/modules/aggregator/
src/Tests
/Views/AggregatorItemViewsFieldAccessTest.php
→
core/modules/aggregator/
tests/src/Kernel
/Views/AggregatorItemViewsFieldAccessTest.php
View file @
ee9f19cf
...
...
@@ -2,14 +2,14 @@
/**
* @file
* Contains \Drupal\aggregator\
Tests
\Views\AggregatorItemViewsFieldAccessTest.
* Contains \Drupal\
Tests\
aggregator\
Kernel
\Views\AggregatorItemViewsFieldAccessTest.
*/
namespace
Drupal\aggregator\
Tests
\Views
;
namespace
Drupal\
Tests\
aggregator\
Kernel
\Views
;
use
Drupal\aggregator\Entity\Feed
;
use
Drupal\aggregator\Entity\Item
;
use
Drupal\
views\Tests
\Handler\FieldFieldAccessTestBase
;
use
Drupal\
Tests\views\Kernel
\Handler\FieldFieldAccessTestBase
;
/**
* Tests base field access in Views for the aggregator_item entity.
...
...
core/modules/aggregator/
src/Tests
/Views/IntegrationTest.php
→
core/modules/aggregator/
tests/src/Kernel
/Views/IntegrationTest.php
View file @
ee9f19cf
...
...
@@ -2,24 +2,24 @@
/**
* @file
* Contains \Drupal\aggregator\
Tests
\Views\IntegrationTest.
* Contains \Drupal\
Tests\
aggregator\
Kernel
\Views\IntegrationTest.
*/
namespace
Drupal\aggregator\
Tests
\Views
;
namespace
Drupal\
Tests\
aggregator\
Kernel
\Views
;
use
Drupal\Component\Utility\Xss
;
use
Drupal\Core\Render\RenderContext
;
use
Drupal\Core\Url
;
use
Drupal\Tests\views\Kernel\ViewsKernelTestBase
;
use
Drupal\views\Views
;
use
Drupal\views\Tests\ViewTestData
;
use
Drupal\views\Tests\ViewKernelTestBase
;
/**
* Tests basic integration of views data from the aggregator module.
*
* @group aggregator
*/
class
IntegrationTest
extends
ViewKernelTestBase
{
class
IntegrationTest
extends
View
s
KernelTestBase
{
/**
* Modules to install.
...
...
@@ -52,7 +52,7 @@ class IntegrationTest extends ViewKernelTestBase {
/**
* {@inheritdoc}
*/
protected
function
setUp
()
{
protected
function
setUp
(
$import_test_views
=
TRUE
)
{
parent
::
setUp
();
$this
->
installEntitySchema
(
'aggregator_item'
);
...
...
@@ -120,7 +120,7 @@ public function testAggregatorItemView() {
$output
=
$renderer
->
executeInRenderContext
(
new
RenderContext
(),
function
()
use
(
$view
,
$row
)
{
return
$view
->
field
[
'title'
]
->
advancedRender
(
$row
);
});
$this
->
assertEqual
(
$output
,
$expected_link
,
'Ensure the right link is generated'
);
$this
->
assertEqual
(
$output
,
$expected_link
->
getGeneratedLink
()
,
'Ensure the right link is generated'
);
$expected_author
=
Xss
::
filter
(
$items
[
$iid
]
->
getAuthor
(),
_aggregator_allowed_tags
());
$output
=
$renderer
->
executeInRenderContext
(
new
RenderContext
(),
function
()
use
(
$view
,
$row
)
{
...
...
core/modules/comment/
src/Tests
/Views/CommentLinksTest.php
→
core/modules/comment/
tests/src/Kernel
/Views/CommentLinksTest.php
View file @
ee9f19cf
...
...
@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\comment\
Tests
\Views\CommentLinksTest.
* Contains \Drupal\
Tests\
comment\
Kernel
\Views\CommentLinksTest.
*/
namespace
Drupal\comment\
Tests
\Views
;
namespace
Drupal\
Tests\
comment\
Kernel
\Views
;
use
Drupal\comment\CommentInterface
;
use
Drupal\comment\CommentManagerInterface
;
...
...
@@ -21,7 +21,7 @@
*
* @group comment
*/
class
CommentLinksTest
extends
CommentViewKernelTestBase
{
class
CommentLinksTest
extends
CommentView
s
KernelTestBase
{
/**
* Views used by this test.
...
...
core/modules/comment/
src/Tests
/Views/CommentUserNameTest.php
→
core/modules/comment/
tests/src/Kernel
/Views/CommentUserNameTest.php
View file @
ee9f19cf
...
...
@@ -2,17 +2,17 @@
/**
* @file
* Contains \Drupal\comment\
Tests
\Views\CommentUserNameTest.
* Contains \Drupal\
Tests\
comment\
Kernel
\Views\CommentUserNameTest.
*/
namespace
Drupal\comment\
Tests
\Views
;
namespace
Drupal\
Tests\
comment\
Kernel
\Views
;
use
Drupal\comment\Entity\Comment
;
use
Drupal\Core\Session\AnonymousUserSession
;
use
Drupal\Tests\views\Kernel\ViewsKernelTestBase
;
use
Drupal\user\Entity\Role
;
use
Drupal\user\Entity\User
;
use
Drupal\views\Entity\View
;
use
Drupal\views\Tests\ViewKernelTestBase
;
use
Drupal\views\Views
;
/**
...
...
@@ -20,7 +20,7 @@
*
* @group comment
*/
class
CommentUserNameTest
extends
ViewKernelTestBase
{
class
CommentUserNameTest
extends
View
s
KernelTestBase
{
/**
* Admin user.
...
...
core/modules/comment/
src/Tests
/Views/CommentViewsFieldAccessTest.php
→
core/modules/comment/
tests/src/Kernel
/Views/CommentViewsFieldAccessTest.php
View file @
ee9f19cf
...
...
@@ -2,14 +2,14 @@
/**
* @file
* Contains \Drupal\comment\
Tests
\Views\CommentViewsFieldAccessTest.
* Contains \Drupal\
Tests\
comment\
Kernel
\Views\CommentViewsFieldAccessTest.
*/
namespace
Drupal\comment\
Tests
\Views
;
namespace
Drupal\
Tests\
comment\
Kernel
\Views
;
use
Drupal\comment\Entity\Comment
;
use
Drupal\user\Entity\User
;
use
Drupal\
views\Tests
\Handler\FieldFieldAccessTestBase
;
use
Drupal\
Tests\views\Kernel
\Handler\FieldFieldAccessTestBase
;
/**
* Tests base field access in Views for the comment entity.
...
...
core/modules/comment/
src/Tests
/Views/CommentViewKernelTestBase.php
→
core/modules/comment/
tests/src/Kernel
/Views/CommentView
s
KernelTestBase.php
View file @
ee9f19cf
...
...
@@ -2,19 +2,19 @@
/**
* @file
* Contains \Drupal\comment\
Tests
\Views\CommentViewKernelTestBase.
* Contains \Drupal\
Tests\
comment\
Kernel
\Views\CommentView
s
KernelTestBase.
*/
namespace
Drupal\comment\
Tests
\Views
;
namespace
Drupal\
Tests\
comment\
Kernel
\Views
;
use
Drupal\Tests\views\Kernel\ViewsKernelTestBase
;
use
Drupal\user\Entity\Role
;
use
Drupal\views\Tests\ViewKernelTestBase
;
use
Drupal\views\Tests\ViewTestData
;
/**
* Provides a common test base for comment views tests.
*/
abstract
class
CommentViewKernelTestBase
extends
ViewKernelTestBase
{
abstract
class
CommentView
s
KernelTestBase
extends
View
s
KernelTestBase
{
/**
* Modules to enable.
...
...
core/modules/dblog/
src/Tests
/Views/ViewsIntegrationTest.php
→
core/modules/dblog/
tests/src/Kernel
/Views/ViewsIntegrationTest.php
View file @
ee9f19cf
...
...
@@ -2,25 +2,25 @@
/**
* @file
* Contains \Drupal\
dblog\Tests
\Views\ViewsIntegrationTest.
* Contains \Drupal\
Tests\dblog\Kernel
\Views\ViewsIntegrationTest.
*/
namespace
Drupal\
dblog\Tests
\Views
;
namespace
Drupal\
Tests\dblog\Kernel
\Views
;
use
Drupal\Component\Utility\SafeMarkup
;
use
Drupal\Component\Utility\Xss
;
use
Drupal\Core\Logger\RfcLogLevel
;
use
Drupal\Core\Url
;
use
Drupal\Tests\views\Kernel\ViewsKernelTestBase
;
use
Drupal\views\Views
;
use
Drupal\views\Tests\ViewTestData
;
use
Drupal\views\Tests\ViewKernelTestBase
;
/**
* Tests the views integration of dblog module.
*
* @group dblog
*/
class
ViewsIntegrationTest
extends
ViewKernelTestBase
{
class
ViewsIntegrationTest
extends
View
s
KernelTestBase
{
/**
* Views used by this test.
...
...
@@ -39,7 +39,7 @@ class ViewsIntegrationTest extends ViewKernelTestBase {
/**
* {@inheritdoc}
*/
protected
function
setUp
()
{
protected
function
setUp
(
$import_test_views
=
TRUE
)
{
parent
::
setUp
();
// Rebuild the router, otherwise we can't generate links.
...
...
core/modules/field/
src/Tests
/EntityReference/Views/EntityReferenceRelationshipTest.php
→
core/modules/field/
tests/src/Kernel
/EntityReference/Views/EntityReferenceRelationshipTest.php
View file @
ee9f19cf
...
...
@@ -2,16 +2,16 @@
/**
* @file
* Contains \Drupal\
field\Tests
\EntityReference\Views\EntityReferenceRelationshipTest.
* Contains \Drupal\
Tests\field\Kernel
\EntityReference\Views\EntityReferenceRelationshipTest.
*/
namespace
Drupal\
field\Tests
\EntityReference\Views
;
namespace
Drupal\
Tests\field\Kernel
\EntityReference\Views
;
use
Drupal\field\Tests\EntityReference\EntityReferenceTestTrait
;
use
Drupal\entity_test
\
Entity\EntityTest
;
use
Drupal\entity_test
\
Entity\EntityTestMul
;
use
Drupal\Tests\views\Kernel\ViewsKernelTestBase
;
use
Drupal\views\Tests\ViewTestData
;
use
Drupal\views\Tests\ViewKernelTestBase
;
use
Drupal\views\Views
;
/**
...
...
@@ -21,7 +21,7 @@
*
* @see core_field_views_data()
*/
class
EntityReferenceRelationshipTest
extends
ViewKernelTestBase
{
class
EntityReferenceRelationshipTest
extends
View
s
KernelTestBase
{
use
EntityReferenceTestTrait
;
...
...
@@ -54,7 +54,7 @@ class EntityReferenceRelationshipTest extends ViewKernelTestBase {
/**
* {@inheritdoc}
*/
protected
function
setUp
()
{
protected
function
setUp
(
$import_test_views
=
TRUE
)
{
parent
::
setUp
();
$this
->
installEntitySchema
(
'user'
);
...
...
core/modules/file/
src/Tests
/Views/ExtensionViewsFieldTest.php
→
core/modules/file/
tests/src/Kernel
/Views/ExtensionViewsFieldTest.php
View file @
ee9f19cf
...
...
@@ -2,15 +2,15 @@
/**
* @file
* Contains \Drupal\
file\
Tests\Views\ExtensionViewsFieldTest.
* Contains \Drupal\Tests
\file\Kernel
\Views\ExtensionViewsFieldTest.
*/
namespace
Drupal\
file\
Tests\Views
;
namespace
Drupal\Tests
\file\Kernel
\Views
;
use
Drupal\Core\Render\RenderContext
;
use
Drupal\file\Entity\File
;
use
Drupal\Tests\views\Kernel\ViewsKernelTestBase
;
use
Drupal\views\Views
;
use
Drupal\views\Tests\ViewKernelTestBase
;
use
Drupal\views\Tests\ViewTestData
;
/**
...
...
@@ -18,7 +18,7 @@
*
* @group file
*/
class
ExtensionViewsFieldTest
extends
ViewKernelTestBase
{
class
ExtensionViewsFieldTest
extends
View
s
KernelTestBase
{
/**
* {@inheritdoc}
...
...
@@ -35,7 +35,7 @@ class ExtensionViewsFieldTest extends ViewKernelTestBase {
/**
* {@inheritdoc}
*/
protected
function
setUp
()
{
protected
function
setUp
(
$import_test_views
=
TRUE
)
{
parent
::
setUp
();
ViewTestData
::
createTestViews
(
get_class
(
$this
),
array
(
'file_test_views'
));
...
...
core/modules/file/
src/Tests
/Views/FileViewsFieldAccessTest.php
→
core/modules/file/
tests/src/Kernel
/Views/FileViewsFieldAccessTest.php
View file @
ee9f19cf
...
...
@@ -2,15 +2,15 @@
/**
* @file
* Contains \Drupal\
file\
Tests\Views\FileViewsFieldAccessTest.
* Contains \Drupal\Tests
\file\Kernel
\Views\FileViewsFieldAccessTest.
*/
namespace
Drupal\
file\
Tests\Views
;
namespace
Drupal\Tests
\file\Kernel
\Views
;
use
Drupal\file\Entity\File
;
use
Drupal\language\Entity\ConfigurableLanguage
;
use
Drupal\user\Entity\User
;
use
Drupal\
views\Tests
\Handler\FieldFieldAccessTestBase
;
use
Drupal\
Tests\views\Kernel
\Handler\FieldFieldAccessTestBase
;
/**
* Tests base field access in Views for the file entity.
...
...
core/modules/image/
src/Tests
/Views/ImageViewsDataTest.php
→
core/modules/image/
tests/src/Kernel
/Views/ImageViewsDataTest.php
View file @
ee9f19cf
...
...
@@ -2,14 +2,14 @@
/**
* @file
* Contains \Drupal\
image\Tests
\Views\ImageViewsDataTest.
* Contains \Drupal\
Tests\image\Kernel
\Views\ImageViewsDataTest.
*/
namespace
Drupal\
image\Tests
\Views
;
namespace
Drupal\
Tests\image\Kernel
\Views
;
use
Drupal\field\Entity\FieldStorageConfig
;
use
Drupal\field\Entity\FieldConfig
;
use
Drupal\
views\Tests
\ViewKernelTestBase
;
use
Drupal\
Tests\views\Kernel
\View
s
KernelTestBase
;
use
Drupal\views\Views
;
/**
...
...
@@ -17,7 +17,7 @@
*
* @group image
*/
class
ImageViewsDataTest
extends
ViewKernelTestBase
{
class
ImageViewsDataTest
extends
View
s
KernelTestBase
{
/**
* Modules to install.
...
...
core/modules/language/
src/Tests
/Views/ArgumentLanguageTest.php
→
core/modules/language/
tests/src/Kernel
/Views/ArgumentLanguageTest.php
View file @
ee9f19cf
...
...
@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\language\
Tests
\Views\ArgumentLanguageTest.
* Contains \Drupal\
Tests\
language\
Kernel
\Views\ArgumentLanguageTest.
*/
namespace
Drupal\language\
Tests
\Views
;
namespace
Drupal\
Tests\
language\
Kernel
\Views
;
use
Drupal\views\Views
;
...
...
core/modules/language/
src/Tests
/Views/FieldLanguageTest.php
→
core/modules/language/
tests/src/Kernel
/Views/FieldLanguageTest.php
View file @
ee9f19cf
...
...
@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\language\
Tests
\Views\FieldLanguageTest.
* Contains \Drupal\
Tests\
language\
Kernel
\Views\FieldLanguageTest.
*/
namespace
Drupal\language\
Tests
\Views
;
namespace
Drupal\
Tests\
language\
Kernel
\Views
;
use
Drupal\views\Views
;
...
...
core/modules/language/
src/Tests
/Views/FilterLanguageTest.php
→
core/modules/language/
tests/src/Kernel
/Views/FilterLanguageTest.php
View file @
ee9f19cf
...
...
@@ -2,10 +2,10 @@
/**
* @file
* Contains \Drupal\language\
Tests
\Views\FilterLanguageTest.
* Contains \Drupal\
Tests\
language\
Kernel
\Views\FilterLanguageTest.
*/
namespace
Drupal\language\
Tests
\Views
;
namespace
Drupal\
Tests\
language\
Kernel
\Views
;
use
Drupal\views\Views
;
...
...
core/modules/language/
src/Tests
/Views/LanguageTestBase.php
→
core/modules/language/
tests/src/Kernel
/Views/LanguageTestBase.php
View file @
ee9f19cf
...
...
@@ -2,18 +2,18 @@
/**
* @file
* Contains \Drupal\language\
Tests
\Views\LanguageTestBase.
* Contains \Drupal\
Tests\
language\
Kernel
\Views\LanguageTestBase.
*/
namespace
Drupal\language\
Tests
\Views
;
namespace
Drupal\
Tests\
language\
Kernel
\Views
;
use
Drupal\language\Entity\ConfigurableLanguage
;
use
Drupal\
views\Tests
\ViewKernelTestBase
;
use
Drupal\
Tests\views\Kernel
\View
s
KernelTestBase
;
/**
* Defines the base class for all Language handler tests.
*/
abstract
class
LanguageTestBase
extends
ViewKernelTestBase
{
abstract
class
LanguageTestBase
extends
View
s
KernelTestBase
{
/**
* Modules to enable.
...
...
@@ -22,7 +22,7 @@ abstract class LanguageTestBase extends ViewKernelTestBase {
*/
public
static
$modules
=
array
(
'system'
,
'language'
);
protected
function
setUp
()
{
protected
function
setUp
(
$import_test_views
=
TRUE
)
{
parent
::
setUp
();
$this
->
installConfig
(
array
(
'language'
));
...
...
core/modules/node/
src/Tests
/Views/NidArgumentTest.php
→
core/modules/node/
tests/src/Kernel
/Views/NidArgumentTest.php
View file @
ee9f19cf
...
...
@@ -2,13 +2,13 @@
/**
* @file
* Contains \Drupal\
node\
Tests\Views\NidArgumentTest.
* Contains \Drupal\Tests
\node\Kernel
\Views\NidArgumentTest.
*/
namespace
Drupal\
node\
Tests\Views
;
namespace
Drupal\Tests
\node\Kernel
\Views
;
use
Drupal\node\Entity\Node
;
use
Drupal\
views\Tests
\ViewKernelTestBase
;
use
Drupal\
Tests\views\Kernel
\View
s
KernelTestBase
;
use
Drupal\views\Tests\ViewTestData
;
use
Drupal\views\Views
;
...
...
@@ -18,7 +18,7 @@
* @group node
* @see \Drupal\node\Plugin\views\argument\Nid
*/
class
NidArgumentTest
extends
ViewKernelTestBase
{
class
NidArgumentTest
extends
View
s
KernelTestBase
{
/**
* {@inheritdoc}
...
...
core/modules/node/
src/Tests
/Views/NodeViewsFieldAccessTest.php
→
core/modules/node/
tests/src/Kernel
/Views/NodeViewsFieldAccessTest.php
View file @
ee9f19cf
...
...
@@ -2,15 +2,15 @@
/**
* @file
* Contains \Drupal\
node\
Tests\Views\NodeViewsFieldAccessTest.
* Contains \Drupal\Tests
\node\Kernel
\Views\NodeViewsFieldAccessTest.
*/
namespace
Drupal\
node\
Tests\Views
;
namespace
Drupal\Tests
\node\Kernel
\Views
;
use
Drupal\node\Entity\Node
;
use
Drupal\node\Entity\NodeType
;
use
Drupal\user\Entity\User
;
use
Drupal\
views\Tests
\Handler\FieldFieldAccessTestBase
;
use
Drupal\
Tests\views\Kernel
\Handler\FieldFieldAccessTestBase
;
/**
* Tests base field access in Views for the node entity.
...
...
core/modules/node/
src/Tests
/Views/RevisionCreateTimestampTest.php
→
core/modules/node/
tests/src/Kernel
/Views/RevisionCreateTimestampTest.php
View file @
ee9f19cf
...
...
@@ -2,14 +2,14 @@
/**
* @file
* Contains \Drupal\
node\
Tests\Views\RevisionCreateTimestampTest.
* Contains \Drupal\Tests
\node\Kernel
\Views\RevisionCreateTimestampTest.
*/
namespace
Drupal\
node\
Tests\Views
;
namespace
Drupal\Tests
\node\Kernel
\Views
;
use
Drupal\node\Entity\Node
;
use
Drupal\node\Entity\NodeType
;
use
Drupal\
views\Tests
\ViewKernelTestBase
;
use
Drupal\
Tests\views\Kernel
\View
s
KernelTestBase
;
use
Drupal\views\Tests\ViewTestData
;
use
Drupal\views\Views
;
...
...
@@ -18,7 +18,7 @@
*
* @group views
*/
class
RevisionCreateTimestampTest
extends
ViewKernelTestBase
{
class
RevisionCreateTimestampTest
extends
View
s
KernelTestBase
{
/**
* {@inheritdoc}
...
...
Prev
1
2
3
4
5
6
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment