From 5bb03f8a1e3991ac1208a0af507ec147ceff583c Mon Sep 17 00:00:00 2001 From: sun Date: Sat, 26 Jul 2014 19:22:41 +0200 Subject: [PATCH] Issue #2314123 by sun: Fixed lots of bogus tests. --- core/modules/block/src/Tests/BlockConfigSchemaTest.php | 1 + .../ckeditor/src/Tests/CKEditorPluginManagerTest.php | 3 +-- core/modules/ckeditor/src/Tests/CKEditorTest.php | 3 +-- .../src/Tests/CommentDefaultFormatterCacheTagsTest.php | 2 +- .../comment/src/Tests/CommentStringIdEntitiesTest.php | 1 + core/modules/config/src/Tests/ConfigEntityUnitTest.php | 3 +++ .../config/src/Tests/Storage/CachedStorageTest.php | 3 ++- .../config/src/Tests/Storage/ConfigStorageTestBase.php | 5 +++++ .../modules/config/src/Tests/Storage/FileStorageTest.php | 2 +- .../dblog/src/Tests/Views/ViewsIntegrationTest.php | 3 +-- core/modules/editor/src/Tests/EditorManagerTest.php | 3 +-- .../editor/src/Tests/QuickEditIntegrationTest.php | 8 +++++--- core/modules/entity/src/Tests/EntityDisplayTest.php | 7 +------ core/modules/entity/src/Tests/EntityFormDisplayTest.php | 6 +----- core/modules/field/src/Tests/Email/EmailItemTest.php | 7 ------- .../field/src/Tests/FieldImportDeleteUninstallTest.php | 2 +- core/modules/file/src/Tests/ValidatorTest.php | 11 +++++++++++ core/modules/hal/src/Tests/NormalizerTestBase.php | 2 +- core/modules/node/src/Tests/NodeLastChangedTest.php | 2 +- .../quickedit/src/Tests/MetadataGeneratorTest.php | 7 +++++-- core/modules/rdf/src/Tests/CrudTest.php | 15 +++++++++++++++ core/modules/rdf/src/Tests/Field/EmailFieldRdfaTest.php | 7 ++++++- .../src/Tests/Field/FieldRdfaDatatypeCallbackTest.php | 5 +++++ core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php | 4 ++-- .../system/src/Tests/Block/SystemMenuBlockTest.php | 2 +- .../system/src/Tests/Cache/ApcuBackendUnitTest.php | 5 ++++- .../src/Tests/Cache/GenericCacheBackendUnitTestBase.php | 2 +- .../system/src/Tests/Database/SelectComplexTest.php | 4 +--- .../src/Tests/DrupalKernel/DrupalKernelSiteTest.php | 2 +- .../system/src/Tests/Entity/ConfigEntityQueryTest.php | 9 ++++----- .../modules/system/src/Tests/Entity/EntityAccessTest.php | 2 +- .../system/src/Tests/Entity/EntityBundleFieldTest.php | 7 ------- .../system/src/Tests/Entity/EntityCrudHookTest.php | 1 - .../system/src/Tests/Entity/EntityLanguageTestBase.php | 7 +++++++ core/modules/system/src/Tests/Entity/EntityQueryTest.php | 4 ++-- .../system/src/Tests/Entity/FieldSqlStorageTest.php | 10 ++++++++++ .../system/src/Tests/Extension/ModuleHandlerTest.php | 5 +++++ .../system/src/Tests/Extension/ThemeHandlerTest.php | 2 +- core/modules/system/src/Tests/File/DirectoryTest.php | 6 +++--- core/modules/system/src/Tests/File/NameMungingTest.php | 16 ++++++++++++++++ core/modules/system/src/Tests/File/ScanDirectoryTest.php | 5 +++++ core/modules/system/src/Tests/Form/FormCacheTest.php | 15 +++++++++++++++ core/modules/system/src/Tests/Path/PathUnitTestBase.php | 5 +++++ core/modules/system/src/Tests/System/ScriptTest.php | 5 +++++ .../modules/system/src/Tests/TypedData/TypedDataTest.php | 4 ++-- .../text/src/Tests/Formatter/TextFormatterTest.php | 1 - .../text/src/Tests/Formatter/TextPlainUnitTest.php | 14 ++++++++++++++ .../modules/user/src/Tests/UserAccountFormFieldsTest.php | 1 + .../views/src/Tests/Entity/RowEntityRenderersTest.php | 2 +- .../views/src/Tests/Plugin/RelationshipJoinTestBase.php | 5 +++++ core/modules/views/src/Tests/Plugin/RowEntityTest.php | 2 +- core/modules/views/src/Tests/ViewExecutableTest.php | 2 +- core/modules/views/src/Tests/ViewStorageTest.php | 1 - .../views/src/Tests/Wizard/WizardPluginBaseUnitTest.php | 4 +--- 54 files changed, 185 insertions(+), 77 deletions(-) diff --git a/core/modules/block/src/Tests/BlockConfigSchemaTest.php b/core/modules/block/src/Tests/BlockConfigSchemaTest.php index 61408da..11ad4c4 100644 --- a/core/modules/block/src/Tests/BlockConfigSchemaTest.php +++ b/core/modules/block/src/Tests/BlockConfigSchemaTest.php @@ -32,6 +32,7 @@ class BlockConfigSchemaTest extends KernelTestBase { 'forum', 'node', 'statistics', + 'system', // BlockManager->getModuleName() -> system_get_info() 'taxonomy', ); diff --git a/core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php b/core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php index f84f73e..3a5a070 100644 --- a/core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php +++ b/core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php @@ -22,7 +22,7 @@ class CKEditorPluginManagerTest extends DrupalUnitTestBase { * * @var array */ - public static $modules = array('system', 'editor', 'ckeditor'); + public static $modules = array('system', 'user', 'filter', 'editor', 'ckeditor'); /** * The manager for "CKEditor plugin" plugins. @@ -36,7 +36,6 @@ function setUp() { // Install the Filter module. $this->installSchema('system', 'url_alias'); - $this->enableModules(array('user', 'filter')); // Create text format, associate CKEditor. $filtered_html_format = entity_create('filter_format', array( diff --git a/core/modules/ckeditor/src/Tests/CKEditorTest.php b/core/modules/ckeditor/src/Tests/CKEditorTest.php index 41b81b8..a80db68 100644 --- a/core/modules/ckeditor/src/Tests/CKEditorTest.php +++ b/core/modules/ckeditor/src/Tests/CKEditorTest.php @@ -23,7 +23,7 @@ class CKEditorTest extends DrupalUnitTestBase { * * @var array */ - public static $modules = array('system', 'editor', 'ckeditor', 'filter_test'); + public static $modules = array('system', 'user', 'filter', 'editor', 'ckeditor', 'filter_test'); /** * An instance of the "CKEditor" text editor plugin. @@ -44,7 +44,6 @@ function setUp() { // Install the Filter module. $this->installSchema('system', 'url_alias'); - $this->enableModules(array('user', 'filter')); // Create text format, associate CKEditor. $filtered_html_format = entity_create('filter_format', array( diff --git a/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php b/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php index 1e60dac..dda6b33 100644 --- a/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php +++ b/core/modules/comment/src/Tests/CommentDefaultFormatterCacheTagsTest.php @@ -24,7 +24,7 @@ class CommentDefaultFormatterCacheTagsTest extends EntityUnitTestBase { * * @var array */ - public static $modules = array('entity_test', 'comment', 'menu_link'); + public static $modules = array('entity_test', 'comment'); /** * {@inheritdoc} diff --git a/core/modules/comment/src/Tests/CommentStringIdEntitiesTest.php b/core/modules/comment/src/Tests/CommentStringIdEntitiesTest.php index a65aed0..638043d 100644 --- a/core/modules/comment/src/Tests/CommentStringIdEntitiesTest.php +++ b/core/modules/comment/src/Tests/CommentStringIdEntitiesTest.php @@ -29,6 +29,7 @@ class CommentStringIdEntitiesTest extends KernelTestBase { 'field_ui', 'entity', 'entity_test', + 'system', // EMAIL_MAX_LENGTH constant. 'text', ); diff --git a/core/modules/config/src/Tests/ConfigEntityUnitTest.php b/core/modules/config/src/Tests/ConfigEntityUnitTest.php index e78b252..b5cb4f7 100644 --- a/core/modules/config/src/Tests/ConfigEntityUnitTest.php +++ b/core/modules/config/src/Tests/ConfigEntityUnitTest.php @@ -71,6 +71,9 @@ public function testStorageMethods() { // Ensure that the configuration entity can be loaded by UUID. $entity_loaded_by_uuid = entity_load_by_uuid($entity_type->id(), $entity->uuid()); + if (!$entity_loaded_by_uuid) { + $this->fail(sprintf("Failed to load '%s' entity ID '%s' by UUID '%s'.", $entity_type->id(), $entity->id(), $entity->uuid())); + } // Compare UUIDs as the objects are not identical since // $entity->enforceIsNew is FALSE and $entity_loaded_by_uuid->enforceIsNew // is NULL. diff --git a/core/modules/config/src/Tests/Storage/CachedStorageTest.php b/core/modules/config/src/Tests/Storage/CachedStorageTest.php index bd02b7d..72beb6a 100644 --- a/core/modules/config/src/Tests/Storage/CachedStorageTest.php +++ b/core/modules/config/src/Tests/Storage/CachedStorageTest.php @@ -11,6 +11,7 @@ use Drupal\Core\Config\CachedStorage; use Drupal\Core\Database\Database; use Drupal\Core\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Reference; /** * Tests CachedStorage operations. @@ -89,7 +90,7 @@ public function containerBuild(ContainerBuilder $container) { parent::containerBuild($container); // Use the regular database cache backend to aid testing. $container->register('cache_factory', 'Drupal\Core\Cache\DatabaseBackendFactory') - ->addArgument(Database::getConnection()); + ->addArgument(new Reference('database')); } } diff --git a/core/modules/config/src/Tests/Storage/ConfigStorageTestBase.php b/core/modules/config/src/Tests/Storage/ConfigStorageTestBase.php index 2bc48fa..e3c4e76 100644 --- a/core/modules/config/src/Tests/Storage/ConfigStorageTestBase.php +++ b/core/modules/config/src/Tests/Storage/ConfigStorageTestBase.php @@ -29,6 +29,11 @@ protected $storage; /** + * @var \Drupal\Core\Config\StorageInterface; + */ + protected $invalidStorage; + + /** * Tests storage CRUD operations. * * @todo Coverage: Trigger PDOExceptions / Database exceptions. diff --git a/core/modules/config/src/Tests/Storage/FileStorageTest.php b/core/modules/config/src/Tests/Storage/FileStorageTest.php index 4aadad5..6165044 100644 --- a/core/modules/config/src/Tests/Storage/FileStorageTest.php +++ b/core/modules/config/src/Tests/Storage/FileStorageTest.php @@ -46,7 +46,7 @@ protected function delete($name) { /** * Tests the FileStorage::listAll method with a relative and absolute path. */ - protected function testlistAll() { + public function testlistAll() { $expected_files = array( 'core.extension', 'system.performance', diff --git a/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php b/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php index de7405f..50a984e 100644 --- a/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php +++ b/core/modules/dblog/src/Tests/Views/ViewsIntegrationTest.php @@ -32,7 +32,7 @@ class ViewsIntegrationTest extends ViewUnitTestBase { * * @var array */ - public static $modules = array('dblog_test_views'); + public static $modules = array('dblog', 'dblog_test_views'); /** * {@inheritdoc} @@ -40,7 +40,6 @@ class ViewsIntegrationTest extends ViewUnitTestBase { protected function setUp() { parent::setUp(); - $this->enableModules(array('system', 'dblog')); $this->installSchema('dblog', array('watchdog')); ViewTestData::createTestViews(get_class($this), array('dblog_test_views')); diff --git a/core/modules/editor/src/Tests/EditorManagerTest.php b/core/modules/editor/src/Tests/EditorManagerTest.php index 55f37da..9e071d9 100644 --- a/core/modules/editor/src/Tests/EditorManagerTest.php +++ b/core/modules/editor/src/Tests/EditorManagerTest.php @@ -22,7 +22,7 @@ class EditorManagerTest extends DrupalUnitTestBase { * * @var array */ - public static $modules = array('system', 'editor'); + public static $modules = array('system', 'user', 'filter', 'editor'); /** * The manager for text editor plugins. @@ -36,7 +36,6 @@ public function setUp() { // Install the Filter module. $this->installSchema('system', 'url_alias'); - $this->enableModules(array('user', 'filter')); // Add text formats. $filtered_html_format = entity_create('filter_format', array( diff --git a/core/modules/editor/src/Tests/QuickEditIntegrationTest.php b/core/modules/editor/src/Tests/QuickEditIntegrationTest.php index 531f1ac..f1c70dd 100644 --- a/core/modules/editor/src/Tests/QuickEditIntegrationTest.php +++ b/core/modules/editor/src/Tests/QuickEditIntegrationTest.php @@ -25,6 +25,11 @@ class QuickEditIntegrationTest extends QuickEditTestBase { /** + * {@inheritdoc} + */ + public static $modules = array('editor', 'editor_test'); + + /** * The manager for editor plug-ins. * * @var \Drupal\Component\Plugin\PluginManagerInterface @@ -66,9 +71,6 @@ public function setUp() { $this->installSchema('system', 'url_alias'); $this->enableModules(array('user', 'filter')); - // Enable the Text Editor and Text Editor Test module. - $this->enableModules(array('editor', 'editor_test')); - // Create a field. $this->field_name = 'field_textarea'; $this->createFieldWithInstance( diff --git a/core/modules/entity/src/Tests/EntityDisplayTest.php b/core/modules/entity/src/Tests/EntityDisplayTest.php index 1e6d05d..1efa671 100644 --- a/core/modules/entity/src/Tests/EntityDisplayTest.php +++ b/core/modules/entity/src/Tests/EntityDisplayTest.php @@ -16,7 +16,7 @@ */ class EntityDisplayTest extends DrupalUnitTestBase { - public static $modules = array('entity', 'field', 'entity_test', 'user', 'text', 'entity_test'); + public static $modules = array('entity', 'field', 'entity_test', 'user', 'text', 'field_test', 'node', 'system'); protected function setUp() { parent::setUp(); @@ -137,8 +137,6 @@ public function testExtraFieldComponent() { * Tests the behavior of a field component within an entity display object. */ public function testFieldComponent() { - $this->enableModules(array('field_test')); - $field_name = 'test_field'; // Create a field storage and an instance. $field_storage = entity_create('field_storage_config', array( @@ -264,7 +262,6 @@ public function testBaseFieldComponent() { * Tests renaming and deleting a bundle. */ public function testRenameDeleteBundle() { - $this->enableModules(array('field_test', 'node', 'system', 'text')); $this->installEntitySchema('node'); // Create a node bundle, display and form display object. @@ -314,8 +311,6 @@ public function testRenameDeleteBundle() { * Tests deleting field instance. */ public function testDeleteFieldInstance() { - $this->enableModules(array('field_test')); - $field_name = 'test_field'; // Create a field storage and an instance. $field_storage = entity_create('field_storage_config', array( diff --git a/core/modules/entity/src/Tests/EntityFormDisplayTest.php b/core/modules/entity/src/Tests/EntityFormDisplayTest.php index ee7eb9d..eaaec9a 100644 --- a/core/modules/entity/src/Tests/EntityFormDisplayTest.php +++ b/core/modules/entity/src/Tests/EntityFormDisplayTest.php @@ -16,7 +16,7 @@ */ class EntityFormDisplayTest extends DrupalUnitTestBase { - public static $modules = array('entity', 'field', 'entity_test', 'user', 'text'); + public static $modules = array('entity', 'field', 'entity_test', 'field_test', 'user', 'text'); protected function setUp() { parent::setUp(); @@ -47,8 +47,6 @@ public function testEntityGetFromDisplay() { * Tests the behavior of a field component within an EntityFormDisplay object. */ public function testFieldComponent() { - $this->enableModules(array('field_test')); - // Create a field storage and an instance. $field_name = 'test_field'; $field_storage = entity_create('field_storage_config', array( @@ -177,8 +175,6 @@ public function testBaseFieldComponent() { * Tests deleting field instance. */ public function testDeleteFieldInstance() { - $this->enableModules(array('field_sql_storage', 'field_test')); - $field_name = 'test_field'; // Create a field storage and an instance. $field_storage = entity_create('field_storage_config', array( diff --git a/core/modules/field/src/Tests/Email/EmailItemTest.php b/core/modules/field/src/Tests/Email/EmailItemTest.php index ecca155..926d1e2 100644 --- a/core/modules/field/src/Tests/Email/EmailItemTest.php +++ b/core/modules/field/src/Tests/Email/EmailItemTest.php @@ -18,13 +18,6 @@ */ class EmailItemTest extends FieldUnitTestBase { - /** - * Modules to enable. - * - * @var array - */ - public static $modules = array('email'); - public function setUp() { parent::setUp(); diff --git a/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php b/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php index 56ce852..2f0b67b 100644 --- a/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php +++ b/core/modules/field/src/Tests/FieldImportDeleteUninstallTest.php @@ -22,7 +22,7 @@ class FieldImportDeleteUninstallTest extends FieldUnitTestBase { * * @var array */ - public static $modules = array('telephone', 'menu_link'); + public static $modules = array('telephone'); public function setUp() { parent::setUp(); diff --git a/core/modules/file/src/Tests/ValidatorTest.php b/core/modules/file/src/Tests/ValidatorTest.php index cb767dd..8af270c 100644 --- a/core/modules/file/src/Tests/ValidatorTest.php +++ b/core/modules/file/src/Tests/ValidatorTest.php @@ -13,6 +13,17 @@ * @group file */ class ValidatorTest extends FileManagedUnitTestBase { + + /** + * @var \Drupal\file\Entity\File + */ + private $image; + + /** + * @var \Drupal\file\Entity\File + */ + private $non_image; + function setUp() { parent::setUp(); diff --git a/core/modules/hal/src/Tests/NormalizerTestBase.php b/core/modules/hal/src/Tests/NormalizerTestBase.php index 2ebff74..b5bb348 100644 --- a/core/modules/hal/src/Tests/NormalizerTestBase.php +++ b/core/modules/hal/src/Tests/NormalizerTestBase.php @@ -33,7 +33,7 @@ * * @var array */ - public static $modules = array('entity', 'entity_test', 'entity_reference', 'field', 'hal', 'language', 'rest', 'serialization', 'system', 'text', 'user', 'filter', 'menu_link'); + public static $modules = array('entity', 'entity_test', 'entity_reference', 'field', 'hal', 'language', 'rest', 'serialization', 'system', 'text', 'user', 'filter'); /** * The mock serializer. diff --git a/core/modules/node/src/Tests/NodeLastChangedTest.php b/core/modules/node/src/Tests/NodeLastChangedTest.php index f3e20fd..58b20b3 100644 --- a/core/modules/node/src/Tests/NodeLastChangedTest.php +++ b/core/modules/node/src/Tests/NodeLastChangedTest.php @@ -21,7 +21,7 @@ class NodeLastChangedTest extends DrupalUnitTestBase { * * @var array */ - public static $modules = array('entity', 'user', 'node', 'field', 'text', 'filter'); + public static $modules = array('entity', 'user', 'node', 'field', 'system', 'text', 'filter'); public function setUp() { parent::setUp(); diff --git a/core/modules/quickedit/src/Tests/MetadataGeneratorTest.php b/core/modules/quickedit/src/Tests/MetadataGeneratorTest.php index 5fd0425..cccd327 100644 --- a/core/modules/quickedit/src/Tests/MetadataGeneratorTest.php +++ b/core/modules/quickedit/src/Tests/MetadataGeneratorTest.php @@ -21,6 +21,11 @@ class MetadataGeneratorTest extends QuickEditTestBase { /** + * {@inheritdoc} + */ + public static $modules = array('quickedit_test'); + + /** * The manager for editor plugins. * * @var \Drupal\Component\Plugin\PluginManagerInterface @@ -125,8 +130,6 @@ public function testEditorWithCustomMetadata() { $this->installSchema('system', 'url_alias'); $this->enableModules(array('user', 'filter')); - // Enable edit_test module so that the WYSIWYG editor becomes available. - $this->enableModules(array('quickedit_test')); $this->editorManager = $this->container->get('plugin.manager.quickedit.editor'); $this->editorSelector = new EditorSelector($this->editorManager, $this->container->get('plugin.manager.field.formatter')); $this->metadataGenerator = new MetadataGenerator($this->accessChecker, $this->editorSelector, $this->editorManager); diff --git a/core/modules/rdf/src/Tests/CrudTest.php b/core/modules/rdf/src/Tests/CrudTest.php index 772ec4f..e530ed3 100644 --- a/core/modules/rdf/src/Tests/CrudTest.php +++ b/core/modules/rdf/src/Tests/CrudTest.php @@ -23,6 +23,21 @@ class CrudTest extends DrupalUnitTestBase { */ public static $modules = array('entity_test', 'rdf', 'system'); + /** + * @var string + */ + private $prefix; + + /** + * @var string + */ + private $entity_type; + + /** + * @var string + */ + private $bundle; + public function setUp() { parent::setUp(); $this->prefix = 'rdf.mapping'; diff --git a/core/modules/rdf/src/Tests/Field/EmailFieldRdfaTest.php b/core/modules/rdf/src/Tests/Field/EmailFieldRdfaTest.php index 7eb8d33..f103888 100644 --- a/core/modules/rdf/src/Tests/Field/EmailFieldRdfaTest.php +++ b/core/modules/rdf/src/Tests/Field/EmailFieldRdfaTest.php @@ -21,9 +21,14 @@ class EmailFieldRdfaTest extends FieldRdfaTestBase { protected $fieldType = 'email'; /** + * @var string + */ + private $testValue; + + /** * {@inheritdoc} */ - public static $modules = array('email', 'text'); + public static $modules = array('text'); public function setUp() { parent::setUp(); diff --git a/core/modules/rdf/src/Tests/Field/FieldRdfaDatatypeCallbackTest.php b/core/modules/rdf/src/Tests/Field/FieldRdfaDatatypeCallbackTest.php index 7d62d0e..4cd9e45 100644 --- a/core/modules/rdf/src/Tests/Field/FieldRdfaDatatypeCallbackTest.php +++ b/core/modules/rdf/src/Tests/Field/FieldRdfaDatatypeCallbackTest.php @@ -19,6 +19,11 @@ class FieldRdfaDatatypeCallbackTest extends FieldRdfaTestBase { protected $fieldType = 'text'; /** + * @var string + */ + private $test_value; + + /** * {@inheritdoc} */ public static $modules = array('text', 'filter'); diff --git a/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php b/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php index 9a26aca..9f4c266 100644 --- a/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php +++ b/core/modules/rdf/src/Tests/Field/FieldRdfaTestBase.php @@ -43,14 +43,14 @@ * * @var bool */ - protected $debug = TRUE; + protected $debug = FALSE; /** * Modules to enable. * * @var array */ - public static $modules = array('rdf', 'menu_link'); + public static $modules = array('rdf'); /** * {@inheritdoc} diff --git a/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php b/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php index 0d1d00b..654ed2e 100644 --- a/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php +++ b/core/modules/system/src/Tests/Block/SystemMenuBlockTest.php @@ -24,7 +24,7 @@ class SystemMenuBlockTest extends DrupalUnitTestBase { * * @var array */ - public static $modules = array('system', 'menu_link', 'block'); + public static $modules = array('system', 'block'); /** * Tests calculation of a system menu block's configuration dependencies. diff --git a/core/modules/system/src/Tests/Cache/ApcuBackendUnitTest.php b/core/modules/system/src/Tests/Cache/ApcuBackendUnitTest.php index 134de2c..f26e8a2 100644 --- a/core/modules/system/src/Tests/Cache/ApcuBackendUnitTest.php +++ b/core/modules/system/src/Tests/Cache/ApcuBackendUnitTest.php @@ -13,6 +13,7 @@ * Tests the APCu cache backend. * * @group Cache + * @requires extension apc */ class ApcuBackendUnitTest extends GenericCacheBackendUnitTestBase { @@ -38,7 +39,9 @@ protected function createCacheBackend($bin) { } public function tearDown() { - $this->backend->removeBin(); + if ($this->backend) { + $this->backend->removeBin(); + } parent::tearDown(); $this->backend = NULL; } diff --git a/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php b/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php index 96d850d..5ba6700 100644 --- a/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php +++ b/core/modules/system/src/Tests/Cache/GenericCacheBackendUnitTestBase.php @@ -94,7 +94,7 @@ public function tearDownCacheBackend() { * @return \Drupal\Core\Cache\CacheBackendInterface * Cache backend to test. */ - final function getCacheBackend($bin = null) { + protected function getCacheBackend($bin = null) { if (!isset($bin)) { $bin = $this->getTestBin(); } diff --git a/core/modules/system/src/Tests/Database/SelectComplexTest.php b/core/modules/system/src/Tests/Database/SelectComplexTest.php index 13f6589..2d6b41b 100644 --- a/core/modules/system/src/Tests/Database/SelectComplexTest.php +++ b/core/modules/system/src/Tests/Database/SelectComplexTest.php @@ -21,7 +21,7 @@ class SelectComplexTest extends DatabaseTestBase { * * @var array */ - public static $modules = array('node_access_test', 'field'); + public static $modules = array('system', 'user', 'node_access_test', 'field'); /** * Tests simple JOIN statements. @@ -322,9 +322,7 @@ function testJoinTwice() { * Tests that we can join on a query. */ function testJoinSubquery() { - $this->enableModules(array('system'), FALSE); $this->installSchema('system', 'sequences'); - $this->enableModules(array('field', 'user')); $account = entity_create('user', array( 'name' => $this->randomName(), diff --git a/core/modules/system/src/Tests/DrupalKernel/DrupalKernelSiteTest.php b/core/modules/system/src/Tests/DrupalKernel/DrupalKernelSiteTest.php index 7e78d6b..1a719d2 100644 --- a/core/modules/system/src/Tests/DrupalKernel/DrupalKernelSiteTest.php +++ b/core/modules/system/src/Tests/DrupalKernel/DrupalKernelSiteTest.php @@ -39,7 +39,7 @@ class: Drupal\Core\Cache\MemoryBackendFactory file_put_contents($this->siteDirectory . '/services.yml', $doc); // Rebuild the container. - $this->kernel->rebuildContainer(); + $this->container->get('kernel')->rebuildContainer(); $this->assertTrue($this->container->has('site.service.yml')); $this->assertIdentical(get_class($this->container->get('cache.backend.database')), 'Drupal\Core\Cache\MemoryBackendFactory'); diff --git a/core/modules/system/src/Tests/Entity/ConfigEntityQueryTest.php b/core/modules/system/src/Tests/Entity/ConfigEntityQueryTest.php index d29ed00..40a7909 100644 --- a/core/modules/system/src/Tests/Entity/ConfigEntityQueryTest.php +++ b/core/modules/system/src/Tests/Entity/ConfigEntityQueryTest.php @@ -22,7 +22,7 @@ class ConfigEntityQueryTest extends DrupalUnitTestBase { * * @var array */ - static $modules = array('config_test'); + static $modules = array('entity', 'config_test'); /** * Stores the search results for alter comparison. @@ -49,7 +49,6 @@ protected function setUp() { parent::setUp(); $this->entities = array(); - $this->enableModules(array('entity'), TRUE); $this->factory = $this->container->get('entity.query'); // These two are here to make sure that matchArray needs to go over several @@ -346,7 +345,7 @@ public function testConfigEntityQuery() { /** * Tests count query. */ - protected function testCount() { + public function testCount() { // Test count on no conditions. $count = $this->factory->get('config_query_test') ->count() @@ -372,7 +371,7 @@ protected function testCount() { /** * Tests sorting and range on config entity queries. */ - protected function testSortRange() { + public function testSortRange() { // Sort by simple ascending/descending. $this->queryResults = $this->factory->get('config_query_test') ->sort('number', 'DESC') @@ -428,7 +427,7 @@ protected function testSortRange() { /** * Tests dotted path matching. */ - protected function testDotted() { + public function testDotted() { $this->queryResults = $this->factory->get('config_query_test') ->condition('array.level1.*', 1) ->execute(); diff --git a/core/modules/system/src/Tests/Entity/EntityAccessTest.php b/core/modules/system/src/Tests/Entity/EntityAccessTest.php index 70f402b..6528f21 100644 --- a/core/modules/system/src/Tests/Entity/EntityAccessTest.php +++ b/core/modules/system/src/Tests/Entity/EntityAccessTest.php @@ -119,7 +119,7 @@ function testEntityTranslationAccess() { /** * Tests hook invocations. */ - protected function testHooks() { + public function testHooks() { $state = $this->container->get('state'); $entity = entity_create('entity_test', array( 'name' => 'test', diff --git a/core/modules/system/src/Tests/Entity/EntityBundleFieldTest.php b/core/modules/system/src/Tests/Entity/EntityBundleFieldTest.php index 9b51d86..334ab58 100644 --- a/core/modules/system/src/Tests/Entity/EntityBundleFieldTest.php +++ b/core/modules/system/src/Tests/Entity/EntityBundleFieldTest.php @@ -29,13 +29,6 @@ class EntityBundleFieldTest extends EntityUnitTestBase { protected $database; /** - * Modules to enable. - * - * @var array - */ - public static $modules = array('menu_link'); - - /** * {@inheritdoc} */ public function setUp() { diff --git a/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php b/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php index 2f41f43..56bbd98 100644 --- a/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php +++ b/core/modules/system/src/Tests/Entity/EntityCrudHookTest.php @@ -135,7 +135,6 @@ public function testBlockHooks() { */ public function testCommentHooks() { $account = $this->createUser(); - $this->enableModules(array('entity', 'filter')); entity_create('node_type', array( 'type' => 'article', 'name' => 'Article', diff --git a/core/modules/system/src/Tests/Entity/EntityLanguageTestBase.php b/core/modules/system/src/Tests/Entity/EntityLanguageTestBase.php index b257907..623d623 100644 --- a/core/modules/system/src/Tests/Entity/EntityLanguageTestBase.php +++ b/core/modules/system/src/Tests/Entity/EntityLanguageTestBase.php @@ -37,6 +37,13 @@ protected $field_name; /** + * Test field instances, keyed by entity type. + * + * @var array + */ + protected $instance; + + /** * The untranslatable test field name. * * @var string diff --git a/core/modules/system/src/Tests/Entity/EntityQueryTest.php b/core/modules/system/src/Tests/Entity/EntityQueryTest.php index 9e3d7b6..983fc0d 100644 --- a/core/modules/system/src/Tests/Entity/EntityQueryTest.php +++ b/core/modules/system/src/Tests/Entity/EntityQueryTest.php @@ -373,7 +373,7 @@ function testSort() { /** * Test tablesort(). */ - protected function testTableSort() { + public function testTableSort() { // While ordering on bundles do not give us a definite order, we can still // assert that all entities from one bundle are after the other as the // order dictates. @@ -422,7 +422,7 @@ protected function testTableSort() { /** * Test that count queries are separated across entity types. */ - protected function testCount() { + public function testCount() { // Create a field with the same name in a different entity type. $field_name = $this->figures; $field_storage = entity_create('field_storage_config', array( diff --git a/core/modules/system/src/Tests/Entity/FieldSqlStorageTest.php b/core/modules/system/src/Tests/Entity/FieldSqlStorageTest.php index ee1ca2c..aeadb01 100644 --- a/core/modules/system/src/Tests/Entity/FieldSqlStorageTest.php +++ b/core/modules/system/src/Tests/Entity/FieldSqlStorageTest.php @@ -37,6 +37,11 @@ class FieldSqlStorageTest extends EntityUnitTestBase { protected $field_name; /** + * @var int + */ + private $field_cardinality; + + /** * A field storage to use in this class. * * @var \Drupal\field\Entity\FieldStorageConfig @@ -51,6 +56,11 @@ class FieldSqlStorageTest extends EntityUnitTestBase { protected $instance; /** + * @var string + */ + private $table; + + /** * Name of the revision table of the field. * * @var string diff --git a/core/modules/system/src/Tests/Extension/ModuleHandlerTest.php b/core/modules/system/src/Tests/Extension/ModuleHandlerTest.php index 597bb03..820e4aa 100644 --- a/core/modules/system/src/Tests/Extension/ModuleHandlerTest.php +++ b/core/modules/system/src/Tests/Extension/ModuleHandlerTest.php @@ -21,6 +21,11 @@ class ModuleHandlerTest extends KernelTestBase { /** * {@inheritdoc} */ + public static $modules = array('system'); + + /** + * {@inheritdoc} + */ public function containerBuild(ContainerBuilder $container) { parent::containerBuild($container); // Put a fake route bumper on the container to be called during uninstall. diff --git a/core/modules/system/src/Tests/Extension/ThemeHandlerTest.php b/core/modules/system/src/Tests/Extension/ThemeHandlerTest.php index 03a94cf..7f5caad 100644 --- a/core/modules/system/src/Tests/Extension/ThemeHandlerTest.php +++ b/core/modules/system/src/Tests/Extension/ThemeHandlerTest.php @@ -23,7 +23,7 @@ class ThemeHandlerTest extends DrupalUnitTestBase { * * @var array */ - public static $modules = array('system', 'menu_link'); + public static $modules = array('system'); public function containerBuild(ContainerBuilder $container) { parent::containerBuild($container); diff --git a/core/modules/system/src/Tests/File/DirectoryTest.php b/core/modules/system/src/Tests/File/DirectoryTest.php index c4ca643..5d3bf93 100644 --- a/core/modules/system/src/Tests/File/DirectoryTest.php +++ b/core/modules/system/src/Tests/File/DirectoryTest.php @@ -30,8 +30,8 @@ function testFileCheckLocalDirectoryHandling() { $old_mode = fileperms($directory); // Create the directories. - $parent_path = $directory . DIRECTORY_SEPARATOR . $parent; - $child_path = $parent_path . DIRECTORY_SEPARATOR . $child; + $parent_path = $directory . '/' . $parent; + $child_path = $parent_path . '/' . $child; $this->assertTrue(drupal_mkdir($child_path, 0775, TRUE), t('No error reported when creating new local directories.'), 'File'); // Ensure new directories also exist. @@ -46,7 +46,7 @@ function testFileCheckLocalDirectoryHandling() { $this->assertDirectoryPermissions($directory, $old_mode); // Check creating a directory using an absolute path. - $absolute_path = drupal_realpath($directory) . DIRECTORY_SEPARATOR . $this->randomName() . DIRECTORY_SEPARATOR . $this->randomName(); + $absolute_path = drupal_realpath($directory) . '/' . $this->randomName() . '/' . $this->randomName(); $this->assertTrue(drupal_mkdir($absolute_path, 0775, TRUE), 'No error reported when creating new absolute directories.', 'File'); $this->assertDirectoryPermissions($absolute_path, 0775); } diff --git a/core/modules/system/src/Tests/File/NameMungingTest.php b/core/modules/system/src/Tests/File/NameMungingTest.php index 3dcb67c..61e3d49 100644 --- a/core/modules/system/src/Tests/File/NameMungingTest.php +++ b/core/modules/system/src/Tests/File/NameMungingTest.php @@ -13,6 +13,22 @@ * @group File */ class NameMungingTest extends FileTestBase { + + /** + * @var string + */ + private $bad_extension; + + /** + * @var string + */ + private $name; + + /** + * @var string + */ + private $name_with_uc_ext; + function setUp() { parent::setUp(); $this->bad_extension = 'php'; diff --git a/core/modules/system/src/Tests/File/ScanDirectoryTest.php b/core/modules/system/src/Tests/File/ScanDirectoryTest.php index cda57de..1690340 100644 --- a/core/modules/system/src/Tests/File/ScanDirectoryTest.php +++ b/core/modules/system/src/Tests/File/ScanDirectoryTest.php @@ -21,6 +21,11 @@ class ScanDirectoryTest extends FileTestBase { */ public static $modules = array('file_test'); + /** + * @var string + */ + private $path; + function setUp() { parent::setUp(); $this->path = drupal_get_path('module', 'simpletest') . '/files'; diff --git a/core/modules/system/src/Tests/Form/FormCacheTest.php b/core/modules/system/src/Tests/Form/FormCacheTest.php index f8056ba..ef9c852 100644 --- a/core/modules/system/src/Tests/Form/FormCacheTest.php +++ b/core/modules/system/src/Tests/Form/FormCacheTest.php @@ -25,6 +25,21 @@ class FormCacheTest extends DrupalUnitTestBase { */ public static $modules = array('system', 'user'); + /** + * @var string + */ + private $form_build_id; + + /** + * @var array + */ + private $form; + + /** + * @var array + */ + private $form_state; + public function setUp() { parent::setUp(); $this->installSchema('system', array('key_value_expire')); diff --git a/core/modules/system/src/Tests/Path/PathUnitTestBase.php b/core/modules/system/src/Tests/Path/PathUnitTestBase.php index 4807d47..618d72e 100644 --- a/core/modules/system/src/Tests/Path/PathUnitTestBase.php +++ b/core/modules/system/src/Tests/Path/PathUnitTestBase.php @@ -15,6 +15,11 @@ */ abstract class PathUnitTestBase extends DrupalUnitTestBase { + /** + * @var \Drupal\system\Tests\Path\UrlAliasFixtures + */ + protected $fixtures; + public function setUp() { parent::setUp(); $this->fixtures = new UrlAliasFixtures(); diff --git a/core/modules/system/src/Tests/System/ScriptTest.php b/core/modules/system/src/Tests/System/ScriptTest.php index 0be6217..6f6d871 100644 --- a/core/modules/system/src/Tests/System/ScriptTest.php +++ b/core/modules/system/src/Tests/System/ScriptTest.php @@ -16,6 +16,11 @@ */ class ScriptTest extends DrupalUnitTestBase { + protected function setUp() { + parent::setUp(); + require_once DRUPAL_ROOT . '/core/includes/install.inc'; + } + /** * Tests password-hash.sh. */ diff --git a/core/modules/system/src/Tests/TypedData/TypedDataTest.php b/core/modules/system/src/Tests/TypedData/TypedDataTest.php index bc9bd8c..7413592 100644 --- a/core/modules/system/src/Tests/TypedData/TypedDataTest.php +++ b/core/modules/system/src/Tests/TypedData/TypedDataTest.php @@ -273,12 +273,12 @@ public function testGetAndSet() { $this->assertEqual($typed_data->validate()->count(), 0); // Try setting by URI. $typed_data->setValue($files[1]->getFileUri()); - $this->assertEqual(is_resource($typed_data->getValue()), fopen($files[1]->getFileUri(), 'r'), 'Binary value was changed.'); + $this->assertEqual(fgets($typed_data->getValue()), fgets(fopen($files[1]->getFileUri(), 'r')), 'Binary value was changed.'); $this->assertTrue(is_string($typed_data->getString()), 'Binary value was converted to string'); $this->assertEqual($typed_data->validate()->count(), 0); // Try setting by resource. $typed_data->setValue(fopen($files[2]->getFileUri(), 'r')); - $this->assertEqual(is_resource($typed_data->getValue()), fopen($files[2]->getFileUri(), 'r'), 'Binary value was changed.'); + $this->assertEqual(fgets($typed_data->getValue()), fgets(fopen($files[2]->getFileUri(), 'r')), 'Binary value was changed.'); $this->assertTrue(is_string($typed_data->getString()), 'Binary value was converted to string'); $this->assertEqual($typed_data->validate()->count(), 0); $typed_data->setValue(NULL); diff --git a/core/modules/text/src/Tests/Formatter/TextFormatterTest.php b/core/modules/text/src/Tests/Formatter/TextFormatterTest.php index b9ba45a..5ce3701 100644 --- a/core/modules/text/src/Tests/Formatter/TextFormatterTest.php +++ b/core/modules/text/src/Tests/Formatter/TextFormatterTest.php @@ -119,7 +119,6 @@ public function testFormatters() { // Verify the unprocessed text field formatter's render array. $build = $entity->get('unprocessed_text')->view(array('type' => $formatter)); - debug($build[0]); $this->assertEqual($build[0]['#markup'], 'Hello, world!'); $this->assertTrue(!isset($build[0]['#cache']), format_string('The @formatter formatter has the expected cache tags when formatting an unprocessed text field.', array('@formatter' => $formatter))); } diff --git a/core/modules/text/src/Tests/Formatter/TextPlainUnitTest.php b/core/modules/text/src/Tests/Formatter/TextPlainUnitTest.php index 327e318..59c6636 100644 --- a/core/modules/text/src/Tests/Formatter/TextPlainUnitTest.php +++ b/core/modules/text/src/Tests/Formatter/TextPlainUnitTest.php @@ -30,6 +30,20 @@ class TextPlainUnitTest extends DrupalUnitTestBase { */ public static $modules = array('entity', 'field', 'text', 'entity_test', 'system', 'filter', 'user'); + private $entity_type; + private $bundle; + private $field_name; + private $field_type; + private $field_settings; + private $instance_settings; + private $formatter_type; + private $formatter_settings; + private $fieldStorage; + private $instance; + private $view_mode; + private $display; + private $langcode; + function setUp() { parent::setUp(); diff --git a/core/modules/user/src/Tests/UserAccountFormFieldsTest.php b/core/modules/user/src/Tests/UserAccountFormFieldsTest.php index 47849b9..492218f 100644 --- a/core/modules/user/src/Tests/UserAccountFormFieldsTest.php +++ b/core/modules/user/src/Tests/UserAccountFormFieldsTest.php @@ -30,6 +30,7 @@ class UserAccountFormFieldsTest extends DrupalUnitTestBase { */ function testInstallConfigureForm() { require_once DRUPAL_ROOT . '/core/includes/install.core.inc'; + require_once DRUPAL_ROOT . '/core/includes/install.inc'; $install_state = install_state_defaults(); $form_state = new FormState(); $form_state['build_info']['args'][] = &$install_state; diff --git a/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php b/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php index 5d8a5f9..ea395b4 100644 --- a/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php +++ b/core/modules/views/src/Tests/Entity/RowEntityRenderersTest.php @@ -24,7 +24,7 @@ class RowEntityRenderersTest extends ViewUnitTestBase { * * @var array */ - public static $modules = array('entity', 'field', 'filter', 'text', 'node', 'user', 'language', 'menu_link'); + public static $modules = array('entity', 'field', 'filter', 'text', 'node', 'user', 'language'); /** * 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 5542619..ba22db1 100644 --- a/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php +++ b/core/modules/views/src/Tests/Plugin/RelationshipJoinTestBase.php @@ -23,6 +23,11 @@ public static $modules = array('system', 'user', 'entity', 'field'); /** + * @var \Drupal\user\Entity\User + */ + protected $root_user; + + /** * Overrides \Drupal\views\Tests\ViewUnitTestBase::setUpFixtures(). */ protected function setUpFixtures() { diff --git a/core/modules/views/src/Tests/Plugin/RowEntityTest.php b/core/modules/views/src/Tests/Plugin/RowEntityTest.php index 6111f42..955281b 100644 --- a/core/modules/views/src/Tests/Plugin/RowEntityTest.php +++ b/core/modules/views/src/Tests/Plugin/RowEntityTest.php @@ -24,7 +24,7 @@ class RowEntityTest extends ViewUnitTestBase { * * @var array */ - public static $modules = array('taxonomy', 'text', 'filter', 'field', 'entity', 'system', 'menu_link'); + public static $modules = array('taxonomy', 'text', 'filter', 'field', 'entity', 'system'); /** * Views used by this test. diff --git a/core/modules/views/src/Tests/ViewExecutableTest.php b/core/modules/views/src/Tests/ViewExecutableTest.php index e84232d..44a52a8 100644 --- a/core/modules/views/src/Tests/ViewExecutableTest.php +++ b/core/modules/views/src/Tests/ViewExecutableTest.php @@ -30,7 +30,7 @@ */ class ViewExecutableTest extends ViewUnitTestBase { - public static $modules = array('system', 'node', 'comment', 'user', 'filter', 'entity', 'field', 'field_sql_storage', 'text'); + public static $modules = array('system', 'node', 'comment', 'user', 'filter', 'entity', 'field', 'text'); /** * Views used by this test. diff --git a/core/modules/views/src/Tests/ViewStorageTest.php b/core/modules/views/src/Tests/ViewStorageTest.php index 283c3b1..e54b197 100644 --- a/core/modules/views/src/Tests/ViewStorageTest.php +++ b/core/modules/views/src/Tests/ViewStorageTest.php @@ -186,7 +186,6 @@ protected function displayTests() { */ protected function displayMethodTests() { // Enable the system module so l() can work using url_alias table. - $this->enableModules(array('system')); $this->installSchema('system', 'url_alias'); $config['display'] = array( diff --git a/core/modules/views/src/Tests/Wizard/WizardPluginBaseUnitTest.php b/core/modules/views/src/Tests/Wizard/WizardPluginBaseUnitTest.php index a121e70..8c6cc42 100644 --- a/core/modules/views/src/Tests/Wizard/WizardPluginBaseUnitTest.php +++ b/core/modules/views/src/Tests/Wizard/WizardPluginBaseUnitTest.php @@ -25,7 +25,7 @@ class WizardPluginBaseUnitTest extends ViewUnitTestBase { * * @var array */ - public static $modules = array('language', 'system', 'user'); + public static $modules = array('language', 'system', 'user', 'views_ui'); /** * Contains thw wizard plugin manager. @@ -39,8 +39,6 @@ protected function setUp() { $this->installConfig(array('language')); - $this->enableModules(array('views_ui')); - $this->wizard = $this->container->get('plugin.manager.views.wizard')->createInstance('standard:views_test_data', array()); } -- 1.7.11.msysgit.1