Issue #3402444 by mondrake, Spokje, neclimdul, catch: Deprecate Test Suites,... (dccd3221) · Commits · project / drupal

core/tests/Drupal/Tests/Core/Test/PhpUnitCliTest.php

+4 −2

Original line number	Diff line number	Diff line
		@@ -21,12 +21,14 @@ public function testPhpUnitListTests() {
		// The goal here is to successfully generate the list, without any
		// duplicate namespace errors or so forth. This keeps us from committing
		// tests which don't break under run-tests.sh, but do break under the
		// phpunit test runner tool.
		// PHPUnit CLI test runner tool.
		$process = Process::fromShellCommandline('vendor/bin/phpunit --configuration core --verbose --list-tests');
		$process->setWorkingDirectory($this->root)
		->setTimeout(300)
		->setIdleTimeout(300);
		$process->run();
		// We disable deprecations since we do not care about them in this test,
		// and deprecated classes will trigger an error when loading.
		$process->run(NULL, ['SYMFONY_DEPRECATIONS_HELPER' => 'disabled']);
		$this->assertEquals(0, $process->getExitCode(),
		'COMMAND: ' . $process->getCommandLine() . "\n" .
		'OUTPUT: ' . $process->getOutput() . "\n" .

core/tests/Drupal/Tests/Core/Test/TestSuiteBaseTest.php

+16 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@
		use Drupal\Tests\TestSuites\TestSuiteBase;
		use org\bovigo\vfs\vfsStream;
		use PHPUnit\Framework\TestCase;
		use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;

		// The test suite class is not part of the autoloader, we need to include it
		// manually.
		@@ -19,6 +20,8 @@
		*/
		class TestSuiteBaseTest extends TestCase {

		use ExpectDeprecationTrait;

		/**
		* Helper method to set up the file system.
		*
		@@ -81,11 +84,16 @@ public function provideCoreTests() {
		/**
		* Tests for special case behavior of unit test suite namespaces in core.
		*
		* @group legacy
		*
		* @covers ::addTestsBySuiteNamespace
		*
		* @dataProvider provideCoreTests
		*/
		public function testAddTestsBySuiteNamespaceCore($filesystem, $suite_namespace, $expected_tests) {

		$this->expectDeprecation('Drupal\\Tests\\Core\\Test\\StubTestSuiteBase is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement and test discovery will be handled differently in PHPUnit 10. See https://www.drupal.org/node/3405829');

		// Set up the file system.
		$vfs = vfsStream::setup('root');
		vfsStream::create($filesystem, $vfs);
		@@ -118,6 +126,8 @@ public function testLocalTimeZone() {
		*
		* We use this class to alter the behavior of TestSuiteBase so it can be
		* testable.
		*
		* @phpstan-ignore-next-line
		*/
		class StubTestSuiteBase extends TestSuiteBase {

		@@ -128,6 +138,12 @@ class StubTestSuiteBase extends TestSuiteBase {
		*/
		public $testFiles = [];

		public function __construct(string $name) {
		@trigger_error(__CLASS__ . ' is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement and test discovery will be handled differently in PHPUnit 10. See https://www.drupal.org/node/3405829', E_USER_DEPRECATED);
		// @phpstan-ignore-next-line
		parent::__construct($name);
		}

		/**
		* {@inheritdoc}
		*/

core/tests/TestSuites/BuildTestSuite.php

+9 −0

Original line number	Diff line number	Diff line
		@@ -4,10 +4,19 @@

		namespace Drupal\Tests\TestSuites;

		@trigger_error('\Drupal\Tests\TestSuites\BuildTestSuite is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement and test discovery will be handled differently in PHPUnit 10. See https://www.drupal.org/node/3405829', E_USER_DEPRECATED);

		require_once __DIR__ . '/TestSuiteBase.php';

		/**
		* Discovers tests for the build test suite.
		*
		* @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no
		* replacement and test discovery will be handled differently in PHPUnit 10.
		*
		* @see https://www.drupal.org/node/3405829
		*
		* @phpstan-ignore-next-line
		*/
		class BuildTestSuite extends TestSuiteBase {

core/tests/TestSuites/FunctionalJavascriptTestSuite.php

+9 −0

Original line number	Diff line number	Diff line
		@@ -4,10 +4,19 @@

		namespace Drupal\Tests\TestSuites;

		@trigger_error('\Drupal\Tests\TestSuites\FunctionalJavascriptTestSuite is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement and test discovery will be handled differently in PHPUnit 10. See https://www.drupal.org/node/3405829', E_USER_DEPRECATED);

		require_once __DIR__ . '/TestSuiteBase.php';

		/**
		* Discovers tests for the functional-javascript test suite.
		*
		* @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no
		* replacement and test discovery will be handled differently in PHPUnit 10.
		*
		* @see https://www.drupal.org/node/3405829
		*
		* @phpstan-ignore-next-line
		*/
		class FunctionalJavascriptTestSuite extends TestSuiteBase {

core/tests/TestSuites/FunctionalTestSuite.php

+9 −0

Original line number	Diff line number	Diff line
		@@ -4,10 +4,19 @@

		namespace Drupal\Tests\TestSuites;

		@trigger_error('\Drupal\Tests\TestSuites\FunctionalTestSuite is deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no replacement and test discovery will be handled differently in PHPUnit 10. See https://www.drupal.org/node/3405829', E_USER_DEPRECATED);

		require_once __DIR__ . '/TestSuiteBase.php';

		/**
		* Discovers tests for the functional test suite.
		*
		* @deprecated in drupal:10.3.0 and is removed from drupal:11.0.0. There is no
		* replacement and test discovery will be handled differently in PHPUnit 10.
		*
		* @see https://www.drupal.org/node/3405829
		*
		* @phpstan-ignore-next-line
		*/
		class FunctionalTestSuite extends TestSuiteBase {