Move execution ordering tests together

tests/end-to-end/cache-result.phpt → tests/end-to-end/execution-order/cache-result.phpt

@@ -11,11 +11,11 @@ $arguments = [
     '--cache-result',
     '--cache-result-file=' . $target,
     'MultiDependencyTest',
-    realpath(__DIR__ . '/loggers/_files/MultiDependencyTest.php'),
+    realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php'),
 ];
 \array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
 
-require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main(false);
 
 print file_get_contents($target);

tests/end-to-end/execution-order-options-via-config.phpt → tests/end-to-end/execution-order/execution-order-options-via-config.phpt

@@ -2,13 +2,16 @@
 phpunit -c ../_files/configuration_stop_on_defect.xml MultiDependencyTest ./tests/_files/MultiDependencyTest.php
 --FILE--
 <?php
-$_SERVER['argv'][1] = '--debug';
-$_SERVER['argv'][2] = '-c';
-$_SERVER['argv'][3] = __DIR__ . '/../_files/configuration_execution_order_options.xml';
-$_SERVER['argv'][4] = 'MultiDependencyTest';
-$_SERVER['argv'][5] = __DIR__ . '/loggers/_files/MultiDependencyTest.php';
+$arguments = [
+    '--debug',
+    '-c',
+    \realpath(__DIR__ . '/../../_files/configuration_execution_order_options.xml'),
+    'MultiDependencyTest',
+    \realpath(__DIR__ . '/_files/MultiDependencyTest.php'),
+];
+\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
 
-require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.

tests/end-to-end/order-by-default-invalid-via-cli.phpt → tests/end-to-end/execution-order/order-by-default-invalid-via-cli.phpt

@@ -9,7 +9,7 @@ $arguments = [
 ];
 \array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
 
-require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.

tests/end-to-end/stop-on-defect-via-cli.phpt → tests/end-to-end/execution-order/stop-on-defect-via-cli.phpt

@@ -2,12 +2,15 @@
 phpunit --stop-on-defect StopOnWarningTestSuite ./tests/_files/StopOnWarningTestSuite.php
 --FILE--
 <?php
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--stop-on-defect';
-$_SERVER['argv'][3] = 'StopOnWarningTestSuite';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/StopOnWarningTestSuite.php';
+$arguments = [
+    '--no-configuration',
+    '--stop-on-defect',
+    'StopOnWarningTestSuite',
+    \realpath(__DIR__ . '/../../_files/StopOnWarningTestSuite.php'),
+];
+\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
 
-require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.

tests/end-to-end/stop-on-defect-via-config.phpt → tests/end-to-end/execution-order/stop-on-defect-via-config.phpt

@@ -2,12 +2,15 @@
 phpunit -c ../_files/configuration_stop_on_defect.xml StopOnWarningTestSuite ./tests/_files/StopOnWarningTestSuite.php
 --FILE--
 <?php
-$_SERVER['argv'][1] = '-c';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/configuration_stop_on_defect.xml';
-$_SERVER['argv'][3] = 'StopOnWarningTestSuite';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/StopOnWarningTestSuite.php';
+$arguments = [
+    '-c',
+    \realpath(__DIR__ . '/../../_files/configuration_stop_on_defect.xml'),
+    'StopOnWarningTestSuite',
+    \realpath(__DIR__ . '/../../_files/StopOnWarningTestSuite.php'),
+];
+\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
 
-require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.

tests/end-to-end/stop-on-error-via-cli.phpt → tests/end-to-end/execution-order/stop-on-error-via-cli.phpt

@@ -2,12 +2,15 @@
 phpunit --stop-on-error StopOnErrorTestSuite ./tests/_files/StopOnErrorTestSuite.php
 --FILE--
 <?php
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--stop-on-error';
-$_SERVER['argv'][3] = 'StopOnErrorTestSuite';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/StopOnErrorTestSuite.php';
+$arguments = [
+    '--no-configuration',
+    '--stop-on-error',
+    'StopOnErrorTestSuite',
+    \realpath(__DIR__ . '/../../_files/StopOnErrorTestSuite.php'),
+];
+\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
 
-require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.

tests/end-to-end/stop-on-error-via-config.phpt → tests/end-to-end/execution-order/stop-on-error-via-config.phpt

@@ -2,12 +2,15 @@
 phpunit -c ../_files/configuration_stop_on_error.xml StopOnErrorTestSuite ./tests/_files/StopOnErrorTestSuite.php
 --FILE--
 <?php
-$_SERVER['argv'][1] = '-c';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/configuration_stop_on_error.xml';
-$_SERVER['argv'][4] = 'StopOnErrorTestSuite';
-$_SERVER['argv'][5] = __DIR__ . '/../_files/StopOnErrorTestSuite.php';
+$arguments = [
+    '-c',
+    \realpath(__DIR__ . '/../../_files/configuration_stop_on_error.xml'),
+    'StopOnErrorTestSuite',
+    \realpath(__DIR__ . '/../../_files/StopOnErrorTestSuite.php'),
+];
+\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
 
-require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.

tests/end-to-end/stop-on-incomplete-via-cli.phpt → tests/end-to-end/execution-order/stop-on-incomplete-via-cli.phpt

@@ -2,12 +2,15 @@
 phpunit --stop-on-error StopOnErrorTestSuite ./tests/_files/StopOnErrorTestSuite.php
 --FILE--
 <?php
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--stop-on-incomplete';
-$_SERVER['argv'][3] = 'StopOnErrorTestSuite';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/StopOnErrorTestSuite.php';
+$arguments = [
+    '--no-configuration',
+    '--stop-on-incomplete',
+    'StopOnErrorTestSuite',
+    \realpath(__DIR__ . '/../../_files/StopOnErrorTestSuite.php'),
+];
+\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
 
-require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.

tests/end-to-end/stop-on-incomplete-via-config.phpt → tests/end-to-end/execution-order/stop-on-incomplete-via-config.phpt

@@ -2,12 +2,15 @@
 phpunit -c ../_files/configuration_stop_on_incomplete.xml StopOnErrorTestSuite ./tests/_files/StopOnErrorTestSuite.php
 --FILE--
 <?php
-$_SERVER['argv'][1] = '-c';
-$_SERVER['argv'][2] = __DIR__ . '/../_files/configuration_stop_on_incomplete.xml';
-$_SERVER['argv'][4] = 'StopOnErrorTestSuite';
-$_SERVER['argv'][5] = __DIR__ . '/../_files/StopOnErrorTestSuite.php';
+$arguments = [
+    '-c',
+    \realpath(__DIR__ . '/../../_files/configuration_stop_on_incomplete.xml'),
+    'StopOnErrorTestSuite',
+    \realpath(__DIR__ . '/../../_files/StopOnErrorTestSuite.php'),
+];
+\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
 
-require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.

tests/end-to-end/stop-on-warning-via-cli.phpt → tests/end-to-end/execution-order/stop-on-warning-via-cli.phpt

@@ -2,12 +2,15 @@
 phpunit --stop-on-warning StopOnWarningTestSuite ./tests/_files/StopOnWarningTestSuite.php
 --FILE--
 <?php
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--stop-on-warning';
-$_SERVER['argv'][3] = 'StopOnWarningTestSuite';
-$_SERVER['argv'][4] = __DIR__ . '/../_files/StopOnWarningTestSuite.php';
+$arguments = [
+    '--no-configuration',
+    '--stop-on-warning',
+    'StopOnWarningTestSuite',
+    \realpath(__DIR__ . '/../../_files/StopOnWarningTestSuite.php'),
+];
+\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
 
-require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 --EXPECTF--
 PHPUnit %s by Sebastian Bergmann and contributors.
@@ -22,4 +25,4 @@ There was 1 warning:
 No tests found in class "NoTestCases".
 
 WARNINGS!
-Tests: 1, Assertions: 0, Warnings: 1.
+Tests: 1, Assertions: 0, Warnings: 1.

tests/end-to-end/execution-order/stop-on-warning-via-config.phpt

@@ -0,0 +1,29 @@
+--TEST--
+phpunit -c ../../_files/configuration_stop_on_warning.xml --stop-on-warning StopOnWarningTestSuite ./tests/_files/StopOnWarningTestSuite.php
+--FILE--
+<?php
+$arguments = [
+    '-c',
+    \realpath(__DIR__ . '/../../_files/configuration_stop_on_warning.xml'),
+    '--stop-on-warning',
+    'StopOnWarningTestSuite',
+    \realpath(__DIR__ . '/../../_files/StopOnWarningTestSuite.php'),
+];
+\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit\TextUI\Command::main();
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+W
+
+Time: %s, Memory: %s
+
+There was 1 warning:
+
+1) Warning
+No tests found in class "NoTestCases".
+
+WARNINGS!
+Tests: 1, Assertions: 0, Warnings: 1.

tests/end-to-end/test-order-randomized-seed-with-dependency-resolution.phpt → tests/end-to-end/execution-order/test-order-randomized-seed-with-dependency-resolution.phpt

@@ -2,15 +2,18 @@
 phpunit --order-by=depends,random --random-order-seed=54321 ../_files/MultiDependencyTest.php
 --FILE--
 <?php
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--debug';
-$_SERVER['argv'][3] = '--verbose';
-$_SERVER['argv'][4] = '--order-by=depends,random';
-$_SERVER['argv'][5] = '--random-order-seed=54321';
-$_SERVER['argv'][6] = 'MultiDependencyTest';
-$_SERVER['argv'][7] = __DIR__ . '/loggers/_files/MultiDependencyTest.php';
+$arguments = [
+    '--no-configuration',
+    '--debug',
+    '--verbose',
+    '--order-by=depends,random',
+    '--random-order-seed=54321',
+    'MultiDependencyTest',
+    \realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php'),
+];
+\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
 
-require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--

tests/end-to-end/execution-order/test-order-randomized-with-dependency-resolution.phpt

@@ -0,0 +1,28 @@
+--TEST--
+phpunit --order-by=depends,random ../_files/MultiDependencyTest.php
+--FILE--
+<?php
+$arguments = [
+    '--no-configuration',
+    '--verbose',
+    '--resolve-dependencies',     // keep coverage for legacy CLI option
+    '--order-by=depends,random',
+    'MultiDependencyTest',
+    \realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php'),
+];
+\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+
+require __DIR__ . '/../../bootstrap.php';
+PHPUnit\TextUI\Command::main();
+?>
+--EXPECTF--
+PHPUnit %s by Sebastian Bergmann and contributors.
+
+Runtime:       %s
+Random seed:   %d
+
+.....                                                               5 / 5 (100%)
+
+Time: %s, Memory: %s
+
+OK (5 tests, 6 assertions)

tests/end-to-end/test-order-reversed-with-dependency-resolution.phpt → tests/end-to-end/execution-order/test-order-reversed-with-dependency-resolution.phpt

@@ -2,14 +2,17 @@
 phpunit --verbose --order-by=reverse ../_files/DependencySuccessTest.php
 --FILE--
 <?php
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--debug';
-$_SERVER['argv'][3] = '--verbose';
-$_SERVER['argv'][4] = '--order-by=depends,reverse';
-$_SERVER['argv'][5] = 'MultiDependencyTest';
-$_SERVER['argv'][6] = __DIR__ . '/loggers/_files/MultiDependencyTest.php';
+$arguments = [
+    '--no-configuration',
+    '--debug',
+    '--verbose',
+    '--order-by=depends,reverse',
+    'MultiDependencyTest',
+    \realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php'),
+];
+\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
 
-require __DIR__ . '/../bootstrap.php';
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--

tests/end-to-end/test-order-reversed-without-dependency-resolution.phpt → tests/end-to-end/execution-order/test-order-reversed-without-dependency-resolution.phpt

@@ -2,14 +2,17 @@
 phpunit --order-by=no-depends,reverse ../_files/MultiDependencyTest.php
 --FILE--
 <?php
-$_SERVER['argv'][1] = '--no-configuration';
-$_SERVER['argv'][2] = '--debug';
-$_SERVER['argv'][3] = '--verbose';
-$_SERVER['argv'][4] = '--order-by=no-depends,reverse';
-$_SERVER['argv'][5] = 'MultiDependencyTest';
-$_SERVER['argv'][6] = __DIR__ . '/loggers/_files/MultiDependencyTest.php';
-
-require __DIR__ . '/../bootstrap.php';
+$arguments = [
+    '--no-configuration',
+    '--debug',
+    '--verbose',
+    '--order-by=no-depends,reverse',
+    'MultiDependencyTest',
+    \realpath(__DIR__ . '/../execution-order/_files/MultiDependencyTest.php'),
+];
+\array_splice($_SERVER['argv'], 1, count($arguments), $arguments);
+
+require __DIR__ . '/../../bootstrap.php';
 PHPUnit\TextUI\Command::main();
 ?>
 --EXPECTF--