Improve test isolation

sebastianbergmann · sebastianbergmann · commit 1fec9a59aeb2 · 2024-10-08T10:53:05.000+02:00
diff --git a/composer.json b/composer.json
@@ -72,9 +72,13 @@
     },
     "autoload-dev": {
         "classmap": [
-            "tests/"
+            "tests/_files"
         ],
         "files": [
+            "tests/unit/Event/AbstractEventTestCase.php",
+            "tests/unit/Framework/MockObject/TestDoubleTestCase.php",
+            "tests/unit/Metadata/Parser/AnnotationParserTestCase.php",
+            "tests/unit/Metadata/Parser/AttributeParserTestCase.php",
             "tests/_files/CoverageNamespacedFunctionTest.php",
             "tests/_files/CoveredFunction.php",
             "tests/_files/Generator.php",
diff --git a/tests/_files/MultiDependencyTest.php b/tests/_files/MultiDependencyTest.php
diff --git a/tests/end-to-end/code-coverage/ignore-class-using-attribute-process-isolation.phpt b/tests/end-to-end/code-coverage/ignore-class-using-attribute-process-isolation.phpt
@@ -10,6 +10,8 @@ require __DIR__ . '/../../_files/skip-if-requires-code-coverage-driver.php';
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
 $_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/ignore-class-using-attribute/src/CoveredClass.php';
 $_SERVER['argv'][] = '--coverage-filter';
 $_SERVER['argv'][] = __DIR__ . '/ignore-class-using-attribute/src';
 $_SERVER['argv'][] = '--coverage-text';
diff --git a/tests/end-to-end/code-coverage/ignore-class-using-attribute.phpt b/tests/end-to-end/code-coverage/ignore-class-using-attribute.phpt
@@ -9,6 +9,8 @@ require __DIR__ . '/../../_files/skip-if-requires-code-coverage-driver.php';
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/ignore-class-using-attribute/src/CoveredClass.php';
 $_SERVER['argv'][] = '--coverage-filter';
 $_SERVER['argv'][] = __DIR__ . '/ignore-class-using-attribute/src';
 $_SERVER['argv'][] = '--coverage-text';
diff --git a/tests/end-to-end/code-coverage/ignore-function-using-attribute-process-isolation.phpt b/tests/end-to-end/code-coverage/ignore-function-using-attribute-process-isolation.phpt
@@ -10,6 +10,8 @@ require __DIR__ . '/../../_files/skip-if-requires-code-coverage-driver.php';
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
 $_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/ignore-function-using-attribute/src/CoveredFunction.php';
 $_SERVER['argv'][] = '--coverage-filter';
 $_SERVER['argv'][] = __DIR__ . '/ignore-function-using-attribute/src';
 $_SERVER['argv'][] = '--coverage-text';
diff --git a/tests/end-to-end/code-coverage/ignore-function-using-attribute.phpt b/tests/end-to-end/code-coverage/ignore-function-using-attribute.phpt
@@ -9,6 +9,8 @@ require __DIR__ . '/../../_files/skip-if-requires-code-coverage-driver.php';
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/ignore-function-using-attribute/src/CoveredFunction.php';
 $_SERVER['argv'][] = '--coverage-filter';
 $_SERVER['argv'][] = __DIR__ . '/ignore-function-using-attribute/src';
 $_SERVER['argv'][] = '--coverage-text';
diff --git a/tests/end-to-end/code-coverage/ignore-method-using-attribute-process-isolation.phpt b/tests/end-to-end/code-coverage/ignore-method-using-attribute-process-isolation.phpt
@@ -10,6 +10,8 @@ require __DIR__ . '/../../_files/skip-if-requires-code-coverage-driver.php';
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
 $_SERVER['argv'][] = '--process-isolation';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/ignore-method-using-attribute/src/CoveredClass.php';
 $_SERVER['argv'][] = '--coverage-filter';
 $_SERVER['argv'][] = __DIR__ . '/ignore-method-using-attribute/src';
 $_SERVER['argv'][] = '--coverage-text';
diff --git a/tests/end-to-end/code-coverage/ignore-method-using-attribute.phpt b/tests/end-to-end/code-coverage/ignore-method-using-attribute.phpt
@@ -9,6 +9,8 @@ require __DIR__ . '/../../_files/skip-if-requires-code-coverage-driver.php';
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/ignore-method-using-attribute/src/CoveredClass.php';
 $_SERVER['argv'][] = '--coverage-filter';
 $_SERVER['argv'][] = __DIR__ . '/ignore-method-using-attribute/src';
 $_SERVER['argv'][] = '--coverage-text';
diff --git a/tests/end-to-end/event/_files/custom-failure-interface/CustomFailureException.php b/tests/end-to-end/event/_files/custom-failure-interface/CustomFailureException.php
diff --git a/tests/end-to-end/event/_files/custom-failure-interface/CustomFailureInterface.php b/tests/end-to-end/event/_files/custom-failure-interface/CustomFailureInterface.php
diff --git a/tests/end-to-end/event/_files/custom-failure-interface/CustomFailureInterfaceTest.php b/tests/end-to-end/event/_files/custom-failure-interface/CustomFailureInterfaceTest.php
diff --git a/tests/end-to-end/event/_files/custom-failure-interface/bootstrap.php b/tests/end-to-end/event/_files/custom-failure-interface/bootstrap.php
@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+require __DIR__ . '/CustomFailureInterface.php';
+
+require __DIR__ . '/CustomFailureException.php';
diff --git a/tests/end-to-end/event/custom-comparator.phpt b/tests/end-to-end/event/custom-comparator.phpt
@@ -6,6 +6,8 @@ $traceFile = tempnam(sys_get_temp_dir(), __FILE__);
 
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/_files/CustomComparator.php';
 $_SERVER['argv'][] = '--no-output';
 $_SERVER['argv'][] = '--log-events-text';
 $_SERVER['argv'][] = $traceFile;
@@ -21,6 +23,7 @@ unlink($traceFile);
 --EXPECTF--
 PHPUnit Started (PHPUnit %s using %s)
 Test Runner Configured
+Bootstrap Finished (%sCustomComparator.php)
 Test Suite Loaded (1 test)
 Event Facade Sealed
 Test Runner Started
diff --git a/tests/end-to-end/event/data-provider-external.phpt b/tests/end-to-end/event/data-provider-external.phpt
@@ -6,6 +6,8 @@ $traceFile = tempnam(sys_get_temp_dir(), __FILE__);
 
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/_files/DataProvider.php';
 $_SERVER['argv'][] = '--no-output';
 $_SERVER['argv'][] = '--log-events-text';
 $_SERVER['argv'][] = $traceFile;
@@ -21,6 +23,7 @@ unlink($traceFile);
 --EXPECTF--
 PHPUnit Started (PHPUnit %s using %s)
 Test Runner Configured
+Bootstrap Finished (%sDataProvider.php)
 Data Provider Method Called (PHPUnit\TestFixture\Event\DataProvider::values for test method PHPUnit\TestFixture\Event\DataProviderExternalTest::testSuccess)
 Data Provider Method Finished for PHPUnit\TestFixture\Event\DataProviderExternalTest::testSuccess:
 - PHPUnit\TestFixture\Event\DataProvider::values
diff --git a/tests/end-to-end/event/mock-object.phpt b/tests/end-to-end/event/mock-object.phpt
@@ -6,6 +6,8 @@ $traceFile = tempnam(sys_get_temp_dir(), __FILE__);
 
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/_files/Example.php';
 $_SERVER['argv'][] = '--no-output';
 $_SERVER['argv'][] = '--log-events-text';
 $_SERVER['argv'][] = $traceFile;
@@ -21,6 +23,7 @@ unlink($traceFile);
 --EXPECTF--
 PHPUnit Started (PHPUnit %s using %s)
 Test Runner Configured
+Bootstrap Finished (%sExample.php)
 Test Suite Loaded (1 test)
 Event Facade Sealed
 Test Runner Started
diff --git a/tests/end-to-end/event/registered-failure-interface.phpt b/tests/end-to-end/event/registered-failure-interface.phpt
@@ -6,10 +6,12 @@ $traceFile = tempnam(sys_get_temp_dir(), __FILE__);
 
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/_files/custom-failure-interface/bootstrap.php';
 $_SERVER['argv'][] = '--no-output';
 $_SERVER['argv'][] = '--log-events-text';
 $_SERVER['argv'][] = $traceFile;
-$_SERVER['argv'][] = __DIR__ . '/_files/CustomFailureInterfaceTest.php';
+$_SERVER['argv'][] = __DIR__ . '/_files/custom-failure-interface/CustomFailureInterfaceTest.php';
 
 require __DIR__ . '/../../bootstrap.php';
 
@@ -21,6 +23,7 @@ unlink($traceFile);
 --EXPECTF--
 PHPUnit Started (PHPUnit %s using %s)
 Test Runner Configured
+Bootstrap Finished (%sbootstrap.php)
 Test Suite Loaded (2 tests)
 Event Facade Sealed
 Test Runner Started
diff --git a/tests/end-to-end/event/test-stub.phpt b/tests/end-to-end/event/test-stub.phpt
@@ -6,6 +6,8 @@ $traceFile = tempnam(sys_get_temp_dir(), __FILE__);
 
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/_files/Example.php';
 $_SERVER['argv'][] = '--no-output';
 $_SERVER['argv'][] = '--log-events-text';
 $_SERVER['argv'][] = $traceFile;
@@ -21,6 +23,7 @@ unlink($traceFile);
 --EXPECTF--
 PHPUnit Started (PHPUnit %s using %s)
 Test Runner Configured
+Bootstrap Finished (%sExample.php)
 Test Suite Loaded (1 test)
 Event Facade Sealed
 Test Runner Started
diff --git a/tests/end-to-end/execution-order/cache-result.phpt b/tests/end-to-end/execution-order/cache-result.phpt
@@ -9,7 +9,7 @@ $_SERVER['argv'][] = '--ignore-dependencies';   // keep coverage for legacy CLI
 $_SERVER['argv'][] = '--order-by=reverse';
 $_SERVER['argv'][] = '--cache-result';
 $_SERVER['argv'][] = '--cache-directory=' . $cacheDirectory;
-$_SERVER['argv'][] = realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php');
+$_SERVER['argv'][] = __DIR__ . '/../../_files/MultiDependencyTest.php';
 
 require_once __DIR__ . '/../../bootstrap.php';
 
diff --git a/tests/end-to-end/execution-order/depends-multiple-parameter-with-isolation.phpt b/tests/end-to-end/execution-order/depends-multiple-parameter-with-isolation.phpt
@@ -5,7 +5,7 @@ phpunit --process-isolation _files/MultiDependencyTest.php
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
 $_SERVER['argv'][] = '--process-isolation';
-$_SERVER['argv'][] = \realpath(__DIR__ . '/_files/MultiDependencyTest.php');
+$_SERVER['argv'][] = __DIR__ . '/../../_files/MultiDependencyTest.php';
 
 require_once __DIR__ . '/../../bootstrap.php';
 
diff --git a/tests/end-to-end/execution-order/depends-multiple-parameters.phpt b/tests/end-to-end/execution-order/depends-multiple-parameters.phpt
@@ -4,7 +4,7 @@ phpunit _files/MultiDependencyTest.php
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
-$_SERVER['argv'][] = \realpath(__DIR__ . '/_files/MultiDependencyTest.php');
+$_SERVER['argv'][] = __DIR__ . '/../../_files/MultiDependencyTest.php';
 
 require_once __DIR__ . '/../../bootstrap.php';
 
diff --git a/tests/end-to-end/execution-order/test-order-randomized-with-dependency-resolution.phpt b/tests/end-to-end/execution-order/test-order-randomized-with-dependency-resolution.phpt
@@ -6,7 +6,7 @@ $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
 $_SERVER['argv'][] = '--resolve-dependencies';     // keep coverage for legacy CLI option
 $_SERVER['argv'][] = '--order-by=depends,random';
-$_SERVER['argv'][] = \realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php');
+$_SERVER['argv'][] = __DIR__ . '/../../_files/MultiDependencyTest.php';
 
 require_once __DIR__ . '/../../bootstrap.php';
 
diff --git a/tests/end-to-end/regression/4232.phpt b/tests/end-to-end/regression/4232.phpt
@@ -4,6 +4,8 @@ https://github.com/sebastianbergmann/phpunit/issues/4232
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/4232/ParentIssue4232Test.php';
 $_SERVER['argv'][] = __DIR__ . '/4232/Issue4232Test.php';
 
 require_once __DIR__ . '/../../bootstrap.php';
diff --git a/tests/end-to-end/regression/5218.phpt b/tests/end-to-end/regression/5218.phpt
@@ -9,6 +9,8 @@ require __DIR__ . '/../../_files/skip-if-requires-code-coverage-driver.php';
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/5218/src/Issue5218.php';
 $_SERVER['argv'][] = '--process-isolation';
 $_SERVER['argv'][] = '--coverage-filter';
 $_SERVER['argv'][] = __DIR__ . '/5218/src/';
diff --git a/tests/end-to-end/regression/5287.phpt b/tests/end-to-end/regression/5287.phpt
@@ -6,6 +6,8 @@ $traceFile = tempnam(sys_get_temp_dir(), __FILE__);
 
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/5287/C/MyClassTest.php';
 $_SERVER['argv'][] = '--no-output';
 $_SERVER['argv'][] = '--log-events-text';
 $_SERVER['argv'][] = $traceFile;
@@ -21,6 +23,7 @@ unlink($traceFile);
 --EXPECTF--
 PHPUnit Started (PHPUnit %s using %s)
 Test Runner Configured
+Bootstrap Finished (%sMyClassTest.php)
 Data Provider Method Called (PHPUnit\TestFixture\Issue5278\A\AnotherClassTest::provide for test method PHPUnit\TestFixture\Issue5278\A\AnotherClassTest::test)
 Data Provider Method Finished for PHPUnit\TestFixture\Issue5278\A\AnotherClassTest::test:
 - PHPUnit\TestFixture\Issue5278\A\AnotherClassTest::provide
diff --git a/tests/end-to-end/regression/5498.phpt b/tests/end-to-end/regression/5498.phpt
@@ -6,6 +6,8 @@ $traceFile = tempnam(sys_get_temp_dir(), __FILE__);
 
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/5498/TestCase.php';
 $_SERVER['argv'][] = '--no-output';
 $_SERVER['argv'][] = '--log-events-text';
 $_SERVER['argv'][] = $traceFile;
@@ -21,6 +23,7 @@ unlink($traceFile);
 --EXPECTF--
 PHPUnit Started (%s)
 Test Runner Configured
+Bootstrap Finished (%sTestCase.php)
 Test Suite Loaded (1 test)
 Event Facade Sealed
 Test Runner Started
diff --git a/tests/end-to-end/testdox/_files/bootstrap.php b/tests/end-to-end/testdox/_files/bootstrap.php
@@ -0,0 +1,12 @@
+<?php declare(strict_types=1);
+/*
+ * This file is part of PHPUnit.
+ *
+ * (c) Sebastian Bergmann <sebastian@phpunit.de>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+require __DIR__ . '/Foo.php';
+
+require __DIR__ . '/Bar.php';
diff --git a/tests/end-to-end/testdox/metadata-with-placeholders-data-provider-with-numeric-data-set-name-colorized.phpt b/tests/end-to-end/testdox/metadata-with-placeholders-data-provider-with-numeric-data-set-name-colorized.phpt
@@ -4,6 +4,8 @@ TestDox: Default output; Data Provider with numeric data set name; TestDox metad
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/_files/bootstrap.php';
 $_SERVER['argv'][] = '--no-progress';
 $_SERVER['argv'][] = '--testdox';
 $_SERVER['argv'][] = '--colors=always';
diff --git a/tests/end-to-end/testdox/metadata-with-placeholders-data-provider-with-numeric-data-set-name.phpt b/tests/end-to-end/testdox/metadata-with-placeholders-data-provider-with-numeric-data-set-name.phpt
@@ -4,6 +4,8 @@ TestDox: Default output; Data Provider with numeric data set name; TestDox metad
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/_files/bootstrap.php';
 $_SERVER['argv'][] = '--no-progress';
 $_SERVER['argv'][] = '--testdox';
 $_SERVER['argv'][] = '--colors=never';
diff --git a/tests/end-to-end/testdox/metadata-with-placeholders-data-provider-with-string-data-set-name-colorized.phpt b/tests/end-to-end/testdox/metadata-with-placeholders-data-provider-with-string-data-set-name-colorized.phpt
@@ -4,6 +4,8 @@ TestDox: Default output; Data Provider with string data set name; TestDox metada
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/_files/bootstrap.php';
 $_SERVER['argv'][] = '--no-progress';
 $_SERVER['argv'][] = '--testdox';
 $_SERVER['argv'][] = '--colors=always';
diff --git a/tests/end-to-end/testdox/metadata-with-placeholders-data-provider-with-string-data-set-name.phpt b/tests/end-to-end/testdox/metadata-with-placeholders-data-provider-with-string-data-set-name.phpt
@@ -4,6 +4,8 @@ TestDox: Default output; Data Provider with string data set name; TestDox metada
 <?php declare(strict_types=1);
 $_SERVER['argv'][] = '--do-not-cache-result';
 $_SERVER['argv'][] = '--no-configuration';
+$_SERVER['argv'][] = '--bootstrap';
+$_SERVER['argv'][] = __DIR__ . '/_files/bootstrap.php';
 $_SERVER['argv'][] = '--no-progress';
 $_SERVER['argv'][] = '--testdox';
 $_SERVER['argv'][] = '--colors=never';
