Commit 8c6c340f authored by alexpott's avatar alexpott

Issue #2886547 by naveenvalecha, Mile23, longwave, impalash, Lendude,...

Issue #2886547 by naveenvalecha, Mile23, longwave, impalash, Lendude, dawehner, Mixologic, xjm, borisson_, catch: Add trigger_error to deprecated TestBase base classes/traits that have none, reference CR
parent 2a383d02
......@@ -2,6 +2,8 @@
namespace Drupal\aggregator\Tests;
@trigger_error(__NAMESPACE__ . '\AggregatorTestBase is deprecated for removal before Drupal 9.0.0. Use \Drupal\Tests\aggregator\Functional\AggregatorTestBase instead. See https://www.drupal.org/node/2999939', E_USER_DEPRECATED);
use Drupal\aggregator\Entity\Feed;
use Drupal\Component\Utility\Html;
use Drupal\Core\Database\Database;
......@@ -13,6 +15,8 @@
*
* @deprecated Scheduled for removal in Drupal 9.0.0.
* Use \Drupal\Tests\aggregator\Functional\AggregatorTestBase instead.
*
* @see https://www.drupal.org/node/2999939
*/
abstract class AggregatorTestBase extends WebTestBase {
......
......@@ -12,8 +12,8 @@
use Drupal\editor\Entity\Editor;
use Drupal\filter\Entity\FilterFormat;
use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\simpletest\ContentTypeCreationTrait;
use Drupal\simpletest\NodeCreationTrait;
use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
use Drupal\Tests\node\Traits\NodeCreationTrait;
/**
* BigPipe regression tests.
......
......@@ -5,7 +5,7 @@
use Drupal\block\Entity\Block;
use Drupal\Core\StringTranslation\TranslatableMarkup;
use Drupal\KernelTests\KernelTestBase;
use Drupal\simpletest\BlockCreationTrait;
use Drupal\Tests\block\Traits\BlockCreationTrait;
/**
* Tests block_rebuild().
......
......@@ -2,6 +2,8 @@
namespace Drupal\block_content\Tests;
@trigger_error(__NAMESPACE__ . '\BlockContentTestBase is deprecated for removal before Drupal 9.0.0. Use Drupal\Tests\block_content\Functional\BlockContentTestBase instead. See https://www.drupal.org/node/2999939', E_USER_DEPRECATED);
use Drupal\block_content\Entity\BlockContent;
use Drupal\block_content\Entity\BlockContentType;
use Drupal\simpletest\WebTestBase;
......@@ -11,6 +13,8 @@
*
* @deprecated Scheduled for removal in Drupal 9.0.0.
* Use \Drupal\Tests\block_content\Functional\BlockContentTestBase instead.
*
* @see https://www.drupal.org/node/2999939
*/
abstract class BlockContentTestBase extends WebTestBase {
......
......@@ -3,7 +3,7 @@
namespace Drupal\Tests\block_content\Functional;
use Drupal\block_content\Entity\BlockContent;
use Drupal\simpletest\BlockCreationTrait;
use Drupal\Tests\block\Traits\BlockCreationTrait;
use Drupal\Tests\BrowserTestBase;
/**
......
......@@ -2,7 +2,7 @@
namespace Drupal\Tests\book\Unit;
use Drupal\simpletest\AssertHelperTrait;
use Drupal\Tests\AssertHelperTrait;
use Drupal\Tests\UnitTestCase;
/**
......
......@@ -5,7 +5,7 @@
use Drupal\comment\Plugin\Field\FieldType\CommentItemInterface;
use Drupal\Core\Cache\Cache;
use Drupal\Core\Entity\Entity\EntityViewDisplay;
use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
use Drupal\Tests\system\Functional\Cache\AssertPageCacheContextsAndTagsTrait;
/**
* Tests comments as part of an RSS feed.
......
......@@ -2,10 +2,13 @@
namespace Drupal\config\Tests;
@trigger_error(__NAMESPACE__ . '\SchemaCheckTestTrait is deprecated as of 8.3.x, will be removed in before Drupal 9.0.0. Use \Drupal\Tests\SchemaCheckTestTrait instead.', E_USER_DEPRECATED);
/**
* Provides a class for checking configuration schema.
*
* @deprecated as of 8.3.x, will be removed in before Drupal 9.0.0.
* @deprecated as of 8.3.x, will be removed in before Drupal 9.0.0. Use
* \Drupal\Tests\SchemaCheckTestTrait instead.
*/
trait SchemaCheckTestTrait {
......
......@@ -2,8 +2,8 @@
namespace Drupal\Tests\config\Functional;
use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\system\Functional\Cache\AssertPageCacheContextsAndTagsTrait;
/**
* Tests if configuration overrides correctly affect cacheability metadata.
......
......@@ -3,9 +3,9 @@
namespace Drupal\Tests\content_moderation\Functional;
use Drupal\node\Entity\Node;
use Drupal\simpletest\ContentTypeCreationTrait;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
/**
* Test the content moderation actions.
......
......@@ -2,9 +2,9 @@
namespace Drupal\Tests\content_moderation\Functional;
use Drupal\simpletest\ContentTypeCreationTrait;
use Drupal\Tests\BrowserTestBase;
use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
/**
* Test revision revert.
......
......@@ -2,6 +2,8 @@
namespace Drupal\content_translation\Tests;
@trigger_error(__NAMESPACE__ . '\ContentTranslationTestBase is deprecated for removal before Drupal 9.0.0. Use Drupal\Tests\content_translation\Functional\ContentTranslationTestBase instead. See https://www.drupal.org/node/2999939', E_USER_DEPRECATED);
use Drupal\Core\Entity\Sql\SqlContentEntityStorage;
use Drupal\field\Entity\FieldConfig;
use Drupal\language\Entity\ConfigurableLanguage;
......@@ -13,6 +15,8 @@
*
* @deprecated Scheduled for removal in Drupal 9.0.0.
* Use \Drupal\Tests\content_translation\Functional\ContentTranslationTestBase instead.
*
* @see https://www.drupal.org/node/2999939
*/
abstract class ContentTranslationTestBase extends WebTestBase {
......
......@@ -2,6 +2,8 @@
namespace Drupal\content_translation\Tests;
@trigger_error(__NAMESPACE__ . '\ContentTranslationUITestBase is deprecated for removal before Drupal 9.0.0. Use Drupal\Tests\content_translation\Functional\ContentTranslationUITestBase instead. See https://www.drupal.org/node/2999939', E_USER_DEPRECATED);
use Drupal\Core\Cache\Cache;
use Drupal\Core\Entity\EntityChangedInterface;
use Drupal\Core\Entity\EntityInterface;
......@@ -17,6 +19,8 @@
*
* @deprecated Scheduled for removal in Drupal 9.0.0.
* Use \Drupal\Tests\content_translation\Functional\ContentTranslationUITestBase instead.
*
* @see https://www.drupal.org/node/2999939
*/
abstract class ContentTranslationUITestBase extends ContentTranslationTestBase {
......
......@@ -2,6 +2,8 @@
namespace Drupal\field\Tests;
@trigger_error(__NAMESPACE__ . '\FieldTestBase is deprecated for removal before Drupal 9.0.0. Use Drupal\Tests\field\Functional\FieldTestBase instead. See https://www.drupal.org/node/2999939', E_USER_DEPRECATED);
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Language\LanguageInterface;
use Drupal\simpletest\WebTestBase;
......@@ -11,6 +13,8 @@
*
* @deprecated Scheduled for removal in Drupal 9.0.0.
* Use \Drupal\Tests\field\Functional\FieldTestBase instead.
*
* @see https://www.drupal.org/node/2999939
*/
abstract class FieldTestBase extends WebTestBase {
......
......@@ -2,7 +2,7 @@
namespace Drupal\Tests\field\Unit;
use Drupal\simpletest\AssertHelperTrait;
use Drupal\Tests\AssertHelperTrait;
use Drupal\Tests\UnitTestCase;
/**
......
......@@ -2,7 +2,7 @@
namespace Drupal\Tests\filter\Unit;
use Drupal\simpletest\AssertHelperTrait;
use Drupal\Tests\AssertHelperTrait;
use Drupal\Tests\UnitTestCase;
/**
......
......@@ -3,7 +3,7 @@
namespace Drupal\Tests\forum\Unit;
use Drupal\Core\Url;
use Drupal\simpletest\AssertHelperTrait;
use Drupal\Tests\AssertHelperTrait;
use Drupal\Tests\UnitTestCase;
/**
......
......@@ -5,7 +5,7 @@
use Drupal\Core\Field\FieldStorageDefinitionInterface;
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\Tests\TestFileCreationTrait;
use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
use Drupal\Tests\system\Functional\Cache\AssertPageCacheContextsAndTagsTrait;
use Drupal\user\RoleInterface;
use Drupal\image\Entity\ImageStyle;
......
......@@ -2,6 +2,8 @@
namespace Drupal\node\Tests;
@trigger_error(__NAMESPACE__ . '\NodeTestBase is deprecated for removal before Drupal 9.0.0. Use Drupal\Tests\node\Functional\NodeTestBase instead. See https://www.drupal.org/node/2999939', E_USER_DEPRECATED);
use Drupal\Core\Session\AccountInterface;
use Drupal\node\NodeInterface;
use Drupal\simpletest\WebTestBase;
......@@ -11,6 +13,8 @@
*
* @deprecated Scheduled for removal in Drupal 9.0.0.
* Use \Drupal\Tests\node\Functional\NodeTestBase instead.
*
* @see https://www.drupal.org/node/2999939
*/
abstract class NodeTestBase extends WebTestBase {
......
......@@ -6,9 +6,9 @@
use Drupal\Core\Session\AccountInterface;
use Drupal\KernelTests\KernelTestBase;
use Drupal\node\NodeInterface;
use Drupal\simpletest\ContentTypeCreationTrait;
use Drupal\simpletest\NodeCreationTrait;
use Drupal\simpletest\UserCreationTrait;
use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
use Drupal\Tests\node\Traits\NodeCreationTrait;
use Drupal\Tests\user\Traits\UserCreationTrait;
use Drupal\user\RoleInterface;
/**
......
......@@ -5,10 +5,10 @@
use Drupal\Core\Datetime\Entity\DateFormat;
use Drupal\KernelTests\KernelTestBase;
use Drupal\node\Entity\Node;
use Drupal\simpletest\ContentTypeCreationTrait;
use Drupal\simpletest\NodeCreationTrait;
use Drupal\simpletest\UserCreationTrait;
use Drupal\Tests\EntityViewTrait;
use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
use Drupal\Tests\node\Traits\NodeCreationTrait;
use Drupal\Tests\user\Traits\UserCreationTrait;
/**
* Tests summary length.
......
......@@ -3,7 +3,7 @@
namespace Drupal\Tests\node\Kernel\Views;
use Drupal\node\Entity\Node;
use Drupal\simpletest\UserCreationTrait;
use Drupal\Tests\user\Traits\UserCreationTrait;
use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
use Drupal\views\Tests\ViewTestData;
use Drupal\views\Views;
......
......@@ -2,6 +2,8 @@
namespace Drupal\path\Tests;
@trigger_error(__NAMESPACE__ . '\PathTestBase is deprecated for removal before Drupal 9.0.0. Use Drupal\Tests\path\Functional\PathTestBase instead. See https://www.drupal.org/node/2999939', E_USER_DEPRECATED);
use Drupal\simpletest\WebTestBase;
/**
......@@ -9,6 +11,8 @@
*
* @deprecated Scheduled for removal in Drupal 9.0.0.
* Use \Drupal\Tests\path\Functional\PathTestBase instead.
*
* @see https://www.drupal.org/node/2999939
*/
abstract class PathTestBase extends WebTestBase {
......
......@@ -2,6 +2,8 @@
namespace Drupal\rest\Tests;
@trigger_error(__NAMESPACE__ . '\RESTTestBase is deprecated in Drupal 8.3.x-dev and will be removed before Drupal 9.0.0. Use \Drupal\Tests\rest\Functional\ResourceTestBase and \Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase instead. Only retained for contributed module tests that may be using this base class.', E_USER_DEPRECATED);
use Drupal\Component\Utility\NestedArray;
use Drupal\Core\Config\Entity\ConfigEntityType;
use Drupal\node\NodeInterface;
......@@ -13,7 +15,11 @@
/**
* Test helper class that provides a REST client method to send HTTP requests.
*
* @deprecated in Drupal 8.3.x-dev and will be removed before Drupal 9.0.0. Use \Drupal\Tests\rest\Functional\ResourceTestBase and \Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase instead. Only retained for contributed module tests that may be using this base class.
* @deprecated in Drupal 8.3.x-dev and will be removed before Drupal 9.0.0. Use
* \Drupal\Tests\rest\Functional\ResourceTestBase and
* \Drupal\Tests\rest\Functional\EntityResource\EntityResourceTestBase
* instead. Only retained for contributed module tests that may be using this
* base class.
*/
abstract class RESTTestBase extends WebTestBase {
......
......@@ -10,7 +10,7 @@
use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
use Drupal\Tests\system\Functional\Cache\AssertPageCacheContextsAndTagsTrait;
use Drupal\Tests\views\Functional\ViewTestBase;
use Drupal\views\Entity\View;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
......
......@@ -2,6 +2,8 @@
namespace Drupal\search\Tests;
@trigger_error(__NAMESPACE__ . '\SearchTestBase is deprecated for removal before Drupal 9.0.0. Use \Drupal\Tests\search\Functional\SearchTestBase instead. See https://www.drupal.org/node/2999939', E_USER_DEPRECATED);
use Drupal\simpletest\WebTestBase;
use Drupal\Component\Render\FormattableMarkup;
......@@ -10,6 +12,8 @@
*
* @deprecated Scheduled for removal in Drupal 9.0.0.
* Use \Drupal\Tests\search\Functional\SearchTestBase instead.
*
* @see https://www.drupal.org/node/2999939
*/
abstract class SearchTestBase extends WebTestBase {
......
......@@ -2,6 +2,8 @@
namespace Drupal\serialization\Tests;
@trigger_error(__NAMESPACE__ . '\NormalizerTestBase is deprecated for removal before Drupal 9.0.0. Use \Drupal\Tests\serialization\Kernel\NormalizerTestBase instead.', E_USER_DEPRECATED);
use Drupal\Tests\serialization\Kernel\NormalizerTestBase as SerializationNormalizerTestBase;
/**
......
......@@ -2,6 +2,8 @@
namespace Drupal\simpletest;
@trigger_error(__NAMESPACE__ . '\AssertHelperTrait is deprecated in Drupal 8.4.x. Will be removed before Drupal 9.0.0. Use Drupal\Tests\AssertHelperTrait instead. See https://www.drupal.org/node/2884454.', E_USER_DEPRECATED);
use Drupal\Tests\AssertHelperTrait as BaseAssertHelperTrait;
/**
......
......@@ -2,6 +2,8 @@
namespace Drupal\simpletest;
@trigger_error(__NAMESPACE__ . '\BlockCreationTrait is deprecated in Drupal 8.4.x. Will be removed before Drupal 9.0.0. Use \Drupal\Tests\block\Traits\BlockCreationTrait instead. See https://www.drupal.org/node/2884454.', E_USER_DEPRECATED);
use Drupal\Tests\block\Traits\BlockCreationTrait as BaseBlockCreationTrait;
/**
......
......@@ -2,6 +2,8 @@
namespace Drupal\simpletest;
@trigger_error(__NAMESPACE__ . '\BrowserTestBase is deprecated in Drupal 8.1.x, will be removed before Drupal 9.0. Use Drupal\Tests\BrowserTestBase instead.', E_USER_DEPRECATED);
use Drupal\Tests\BrowserTestBase as BaseBrowserTestBase;
/**
......
......@@ -2,6 +2,8 @@
namespace Drupal\simpletest;
@trigger_error(__NAMESPACE__ . '\ContentTypeCreationTrait is deprecated in Drupal 8.4.x. Will be removed before Drupal 9.0.0. Use \Drupal\Tests\node\Traits\ContentTypeCreationTrait instead. See https://www.drupal.org/node/2884454.', E_USER_DEPRECATED);
use Drupal\Tests\node\Traits\ContentTypeCreationTrait as BaseContentTypeCreationTrait;
/**
......
......@@ -2,6 +2,8 @@
namespace Drupal\simpletest;
@trigger_error(__NAMESPACE__ . '\KernelTestBase is deprecated in Drupal 8.0.x, will be removed before Drupal 9.0.0. Use \Drupal\KernelTests\KernelTestBase instead.', E_USER_DEPRECATED);
use Drupal\Component\Utility\Html;
use Drupal\Component\Render\FormattableMarkup;
use Drupal\Component\Utility\Variable;
......
......@@ -2,6 +2,8 @@
namespace Drupal\simpletest;
@trigger_error(__NAMESPACE__ . '\NodeCreationTrait is deprecated in Drupal 8.4.x. Will be removed before Drupal 9.0.0. Use \Drupal\Tests\node\Traits\NodeCreationTrait instead. See https://www.drupal.org/node/2884454.', E_USER_DEPRECATED);
use Drupal\Tests\node\Traits\NodeCreationTrait as BaseNodeCreationTrait;
/**
......
......@@ -2,13 +2,15 @@
namespace Drupal\simpletest;
@trigger_error(__NAMESPACE__ . '\RandomGeneratorTrait is deprecated in Drupal 8.1.1, will be removed before Drupal 9.0.0. Use \Drupal\Tests\RandomGeneratorTrait instead.', E_USER_DEPRECATED);
use Drupal\Tests\RandomGeneratorTrait as BaseGeneratorTrait;
/**
* Provides random generator utility methods.
*
* @deprecated in Drupal 8.1.1, will be removed before Drupal 9.0.0.
* The trait was moved to another namespace.
* @deprecated in Drupal 8.1.1, will be removed before Drupal 9.0.0. Use
* \Drupal\Tests\RandomGeneratorTrait instead.
*
* @see \Drupal\Tests
*/
......
......@@ -2,13 +2,15 @@
namespace Drupal\simpletest;
@trigger_error(__NAMESPACE__ . '\SessionTestTrait is deprecated in Drupal 8.1.1 will be removed before 9.0.0. Use \Drupal\Tests\SessionTestTrait instead.', E_USER_DEPRECATED);
use Drupal\Tests\SessionTestTrait as BaseSessionTestTrait;
/**
* Provides methods to generate and get session name in tests.
*
* @deprecated in Drupal 8.1.1 will be removed before 9.0.0.
* This was moved to another namespace.
* @deprecated in Drupal 8.1.1 will be removed before 9.0.0. Use
* \Drupal\Tests\SessionTestTrait instead.
*
* @see \Drupal\Tests
*/
......
......@@ -2,6 +2,8 @@
namespace Drupal\simpletest;
@trigger_error(__NAMESPACE__ . '\UserCreationTrait is deprecated in Drupal 8.4.x. Will be removed before Drupal 9.0.0. Use Drupal\Tests\user\Traits\UserCreationTrait instead. See https://www.drupal.org/node/2884454.', E_USER_DEPRECATED);
use Drupal\Tests\user\Traits\UserCreationTrait as BaseUserCreationTrait;
/**
......
......@@ -13,6 +13,10 @@
/**
* @coversDefaultClass \Drupal\simpletest\TestDiscovery
* @group simpletest
*
* Since TestDiscovery is expected to discover Simpletest-based tests, it will
* likely trigger deprecation errors. Therefore, we add the legacy group.
* @group legacy
*/
class TestDiscoveryTest extends UnitTestCase {
......
......@@ -2,6 +2,8 @@
namespace Drupal\statistics\Tests;
@trigger_error(__NAMESPACE__ . '\StatisticsTestBase is deprecated for removal before Drupal 9.0.0. Use \Drupal\Tests\statistics\Functional\StatisticsTestBase instead. See https://www.drupal.org/node/2999939', E_USER_DEPRECATED);
use Drupal\simpletest\WebTestBase;
/**
......@@ -9,6 +11,8 @@
*
* @deprecated Scheduled for removal in Drupal 9.0.0.
* Use \Drupal\Tests\statistics\Functional\StatisticsTestBase instead.
*
* @see https://www.drupal.org/node/2999939
*/
abstract class StatisticsTestBase extends WebTestBase {
......
......@@ -2,6 +2,8 @@
namespace Drupal\system\Tests\Cache;
@trigger_error(__NAMESPACE__ . '\CacheTestBase is deprecated for removal before Drupal 9.0.0. Use \Drupal\Tests\system\Functional\Cache\CacheTestBase instead. See https://www.drupal.org/node/2999939', E_USER_DEPRECATED);
use Drupal\simpletest\WebTestBase;
/**
......@@ -9,6 +11,8 @@
*
* @deprecated Scheduled for removal in Drupal 9.0.0.
* Use \Drupal\Tests\system\Functional\Cache\CacheTestBase instead.
*
* @see https://www.drupal.org/node/2999939
*/
abstract class CacheTestBase extends WebTestBase {
......
......@@ -2,6 +2,8 @@
namespace Drupal\system\Tests\Cache;
@trigger_error(__NAMESPACE__ . '\GenericCacheBackendUnitTestBase is deprecated for removal before Drupal 9.0.0. Use \Drupal\KernelTests\Core\Cache\GenericCacheBackendUnitTestBase instead.', E_USER_DEPRECATED);
use Drupal\Core\Cache\Cache;
use Drupal\Core\Cache\CacheBackendInterface;
use Drupal\simpletest\KernelTestBase;
......
......@@ -2,6 +2,8 @@
namespace Drupal\system\Tests\Cache;
@trigger_error(__NAMESPACE__ . '\PageCacheTagsTestBase is deprecated for removal before Drupal 9.0.0. Use \Drupal\Tests\system\Functional\Cache\PageCacheTagsTestBase instead. See https://www.drupal.org/node/2999939', E_USER_DEPRECATED);
use Drupal\Core\Url;
use Drupal\simpletest\WebTestBase;
use Drupal\Component\Render\FormattableMarkup;
......@@ -11,6 +13,8 @@
*
* @deprecated Scheduled for removal in Drupal 9.0.0.
* Use \Drupal\Tests\system\Functional\Cache\PageCacheTagsTestBase instead.
*
* @see https://www.drupal.org/node/2999939
*/
abstract class PageCacheTagsTestBase extends WebTestBase {
......
......@@ -2,6 +2,8 @@
namespace Drupal\system\Tests\Module;
@trigger_error(__NAMESPACE__ . '\ModuleTestBase is deprecated for removal before Drupal 9.0.0. Use \Drupal\Tests\system\Functional\Module\ModuleTestBase instead. See https://www.drupal.org/node/2999939', E_USER_DEPRECATED);
use Drupal\Core\Config\InstallStorage;
use Drupal\Core\Database\Database;
use Drupal\Core\Config\FileStorage;
......@@ -13,6 +15,8 @@
*
* @deprecated Scheduled for removal in Drupal 9.0.0.
* Use \Drupal\Tests\system\Functional\Module\ModuleTestBase instead.
*
* @see https://www.drupal.org/node/2999939
*/
abstract class ModuleTestBase extends WebTestBase {
......
......@@ -7,7 +7,7 @@
use Drupal\Core\Datetime\Entity\DateFormat;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\KernelTests\KernelTestBase;
use Drupal\simpletest\UserCreationTrait;
use Drupal\Tests\user\Traits\UserCreationTrait;
/**
* @coversDefaultClass \Drupal\system\DateFormatAccessControlHandler
......
......@@ -6,8 +6,8 @@
use Drupal\Core\Cache\Context\CacheContextsManager;
use Drupal\Core\DependencyInjection\ContainerBuilder;
use Drupal\KernelTests\KernelTestBase;
use Drupal\simpletest\UserCreationTrait;
use Drupal\system\Entity\Menu;
use Drupal\Tests\user\Traits\UserCreationTrait;
/**
* @coversDefaultClass \Drupal\system\MenuAccessControlHandler
......
......@@ -3,7 +3,7 @@
namespace Drupal\Tests\user\Functional\Views;
use Drupal\Core\Cache\Cache;
use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
use Drupal\Tests\system\Functional\Cache\AssertPageCacheContextsAndTagsTrait;
use Drupal\user\Plugin\views\access\Role;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Views;
......
......@@ -2,6 +2,8 @@
namespace Drupal\views\Tests\Plugin;
@trigger_error(__NAMESPACE__ . '\PluginKernelTestBase is deprecated for removal before Drupal 9.0.0. Use \Drupal\Tests\views\Kernel\ViewsKernelTestBase instead.', E_USER_DEPRECATED);
use Drupal\views\Tests\ViewKernelTestBase;
/**
......
......@@ -2,6 +2,8 @@
namespace Drupal\views\Tests;
@trigger_error(__NAMESPACE__ . '\ViewKernelTestBase is deprecated in Drupal 8.0.x, will be removed in Drupal 8.2.x. Use \Drupal\Tests\views\Kernel\ViewsKernelTestBase instead.', E_USER_DEPRECATED);
use Drupal\Core\Database\Database;
use Drupal\Core\Database\Query\SelectInterface;
use Drupal\simpletest\KernelTestBase;
......
......@@ -2,10 +2,10 @@
namespace Drupal\Tests\views\Functional\Handler;
use Drupal\config\Tests\SchemaCheckTestTrait;
use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\node\Entity\NodeType;
use Drupal\Tests\SchemaCheckTestTrait;
use Drupal\Tests\views\Functional\ViewTestBase;
use Drupal\views\Views;
......
......@@ -3,8 +3,8 @@
namespace Drupal\Tests\views\FunctionalJavascript;
use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\simpletest\ContentTypeCreationTrait;
use Drupal\simpletest\NodeCreationTrait;
use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
use Drupal\Tests\node\Traits\NodeCreationTrait;
use Drupal\views\Tests\ViewTestData;
/**
......
......@@ -3,8 +3,8 @@
namespace Drupal\Tests\views\FunctionalJavascript;
use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\simpletest\ContentTypeCreationTrait;
use Drupal\simpletest\NodeCreationTrait;
use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
use Drupal\Tests\node\Traits\NodeCreationTrait;
/**
* Tests the basic AJAX functionality of Views exposed forms.
......
......@@ -5,8 +5,8 @@
use Drupal\Core\Url;
use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\language\Entity\ConfigurableLanguage;
use Drupal\simpletest\ContentTypeCreationTrait;
use Drupal\simpletest\NodeCreationTrait;
use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
use Drupal\Tests\node\Traits\NodeCreationTrait;
use Drupal\views\Tests\ViewTestData;
/**
......
......@@ -3,8 +3,8 @@
namespace Drupal\Tests\views\FunctionalJavascript;
use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
use Drupal\simpletest\ContentTypeCreationTrait;
use Drupal\simpletest\NodeCreationTrait;
use Drupal\Tests\node\Traits\ContentTypeCreationTrait;
use Drupal\Tests\node\Traits\NodeCreationTrait;
use Drupal\views\Tests\ViewTestData;
/**
......
......@@ -4,7 +4,7 @@
use Drupal\Core\Entity\EntityTypeInterface;
use Drupal\Core\Form\FormState;
use Drupal\simpletest\BlockCreationTrait;
use Drupal\Tests\block\Traits\BlockCreationTrait;
use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
use Drupal\views\Entity\View;
use Drupal\views\Views;
......
......@@ -2,7 +2,7 @@
namespace Drupal\Tests\views\Kernel\Handler;
use Drupal\simpletest\BlockCreationTrait;
use Drupal\Tests\block\Traits\BlockCreationTrait;
use Drupal\Tests\views\Kernel\ViewsKernelTestBase;
use Drupal\views\Views;
......
......@@ -3,9 +3,9 @@
namespace Drupal\Tests\views\Kernel\Handler;
use Drupal\Core\Render\RenderContext;
use Drupal\simpletest\ContentTypeCreationTrait;
use Drupal\simpletest\NodeCreationTrait;
use Drupal\simpletest\UserCreationTrait;