From 8a3cea5ca99e18b2132c4bef1991244a00ac28d0 Mon Sep 17 00:00:00 2001 From: Ewout Pieter den Ouden Date: Thu, 20 Dec 2018 23:29:43 +0100 Subject: [PATCH] Move execution ordering tests together --- .../_files/ClonedDependencyTest.php | 0 .../_files/DependencyTestSuite.php | 0 .../_files/MultiDependencyTest.php | 0 .../MultiDependencyTest_result_cache.txt | 0 .../_files/StackTest.php | 0 .../{ => execution-order}/cache-result.phpt | 4 +-- .../defects-first-order-via-cli.phpt | 0 .../dependencies-clone.phpt | 0 .../dependencies-isolation.phpt | 0 .../depends-as-parameter-with-isolation.phpt | 0 .../depends-as-parameter.phpt | 0 ...nds-multiple-parameter-with-isolation.phpt | 0 .../depends-multiple-parameters.phpt | 0 .../execution-order-options-via-config.phpt | 15 ++++++---- .../order-by-default-invalid-via-cli.phpt | 2 +- .../stop-on-defect-via-cli.phpt | 13 +++++---- .../stop-on-defect-via-config.phpt | 13 +++++---- .../stop-on-error-via-cli.phpt | 13 +++++---- .../stop-on-error-via-config.phpt | 13 +++++---- .../stop-on-incomplete-via-cli.phpt | 13 +++++---- .../stop-on-incomplete-via-config.phpt | 13 +++++---- .../stop-on-warning-via-cli.phpt | 15 ++++++---- .../stop-on-warning-via-config.phpt | 29 +++++++++++++++++++ ...mized-seed-with-dependency-resolution.phpt | 19 +++++++----- ...randomized-with-dependency-resolution.phpt | 28 ++++++++++++++++++ ...r-reversed-with-dependency-resolution.phpt | 17 ++++++----- ...eversed-without-dependency-resolution.phpt | 19 +++++++----- .../stop-on-warning-via-config.phpt | 26 ----------------- ...randomized-with-dependency-resolution.phpt | 25 ---------------- tests/unit/Util/TestResultCacheTest.php | 4 +-- 30 files changed, 160 insertions(+), 121 deletions(-) rename tests/end-to-end/{loggers => execution-order}/_files/ClonedDependencyTest.php (100%) rename tests/end-to-end/{loggers => execution-order}/_files/DependencyTestSuite.php (100%) rename tests/end-to-end/{loggers => execution-order}/_files/MultiDependencyTest.php (100%) rename tests/end-to-end/{loggers => execution-order}/_files/MultiDependencyTest_result_cache.txt (100%) rename tests/end-to-end/{loggers => execution-order}/_files/StackTest.php (100%) rename tests/end-to-end/{ => execution-order}/cache-result.phpt (91%) rename tests/end-to-end/{loggers => execution-order}/defects-first-order-via-cli.phpt (100%) rename tests/end-to-end/{loggers => execution-order}/dependencies-clone.phpt (100%) rename tests/end-to-end/{loggers => execution-order}/dependencies-isolation.phpt (100%) rename tests/end-to-end/{loggers => execution-order}/depends-as-parameter-with-isolation.phpt (100%) rename tests/end-to-end/{loggers => execution-order}/depends-as-parameter.phpt (100%) rename tests/end-to-end/{loggers => execution-order}/depends-multiple-parameter-with-isolation.phpt (100%) rename tests/end-to-end/{loggers => execution-order}/depends-multiple-parameters.phpt (100%) rename tests/end-to-end/{ => execution-order}/execution-order-options-via-config.phpt (70%) rename tests/end-to-end/{ => execution-order}/order-by-default-invalid-via-cli.phpt (89%) rename tests/end-to-end/{ => execution-order}/stop-on-defect-via-cli.phpt (56%) rename tests/end-to-end/{ => execution-order}/stop-on-defect-via-config.phpt (55%) rename tests/end-to-end/{ => execution-order}/stop-on-error-via-cli.phpt (61%) rename tests/end-to-end/{ => execution-order}/stop-on-error-via-config.phpt (60%) rename tests/end-to-end/{ => execution-order}/stop-on-incomplete-via-cli.phpt (53%) rename tests/end-to-end/{ => execution-order}/stop-on-incomplete-via-config.phpt (52%) rename tests/end-to-end/{ => execution-order}/stop-on-warning-via-cli.phpt (50%) create mode 100644 tests/end-to-end/execution-order/stop-on-warning-via-config.phpt rename tests/end-to-end/{ => execution-order}/test-order-randomized-seed-with-dependency-resolution.phpt (66%) create mode 100644 tests/end-to-end/execution-order/test-order-randomized-with-dependency-resolution.phpt rename tests/end-to-end/{ => execution-order}/test-order-reversed-with-dependency-resolution.phpt (68%) rename tests/end-to-end/{ => execution-order}/test-order-reversed-without-dependency-resolution.phpt (74%) delete mode 100644 tests/end-to-end/stop-on-warning-via-config.phpt delete mode 100644 tests/end-to-end/test-order-randomized-with-dependency-resolution.phpt diff --git a/tests/end-to-end/loggers/_files/ClonedDependencyTest.php b/tests/end-to-end/execution-order/_files/ClonedDependencyTest.php similarity index 100% rename from tests/end-to-end/loggers/_files/ClonedDependencyTest.php rename to tests/end-to-end/execution-order/_files/ClonedDependencyTest.php diff --git a/tests/end-to-end/loggers/_files/DependencyTestSuite.php b/tests/end-to-end/execution-order/_files/DependencyTestSuite.php similarity index 100% rename from tests/end-to-end/loggers/_files/DependencyTestSuite.php rename to tests/end-to-end/execution-order/_files/DependencyTestSuite.php diff --git a/tests/end-to-end/loggers/_files/MultiDependencyTest.php b/tests/end-to-end/execution-order/_files/MultiDependencyTest.php similarity index 100% rename from tests/end-to-end/loggers/_files/MultiDependencyTest.php rename to tests/end-to-end/execution-order/_files/MultiDependencyTest.php diff --git a/tests/end-to-end/loggers/_files/MultiDependencyTest_result_cache.txt b/tests/end-to-end/execution-order/_files/MultiDependencyTest_result_cache.txt similarity index 100% rename from tests/end-to-end/loggers/_files/MultiDependencyTest_result_cache.txt rename to tests/end-to-end/execution-order/_files/MultiDependencyTest_result_cache.txt diff --git a/tests/end-to-end/loggers/_files/StackTest.php b/tests/end-to-end/execution-order/_files/StackTest.php similarity index 100% rename from tests/end-to-end/loggers/_files/StackTest.php rename to tests/end-to-end/execution-order/_files/StackTest.php diff --git a/tests/end-to-end/cache-result.phpt b/tests/end-to-end/execution-order/cache-result.phpt similarity index 91% rename from tests/end-to-end/cache-result.phpt rename to tests/end-to-end/execution-order/cache-result.phpt index 0f3e0846d8c..11b04674c38 100644 --- a/tests/end-to-end/cache-result.phpt +++ b/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); diff --git a/tests/end-to-end/loggers/defects-first-order-via-cli.phpt b/tests/end-to-end/execution-order/defects-first-order-via-cli.phpt similarity index 100% rename from tests/end-to-end/loggers/defects-first-order-via-cli.phpt rename to tests/end-to-end/execution-order/defects-first-order-via-cli.phpt diff --git a/tests/end-to-end/loggers/dependencies-clone.phpt b/tests/end-to-end/execution-order/dependencies-clone.phpt similarity index 100% rename from tests/end-to-end/loggers/dependencies-clone.phpt rename to tests/end-to-end/execution-order/dependencies-clone.phpt diff --git a/tests/end-to-end/loggers/dependencies-isolation.phpt b/tests/end-to-end/execution-order/dependencies-isolation.phpt similarity index 100% rename from tests/end-to-end/loggers/dependencies-isolation.phpt rename to tests/end-to-end/execution-order/dependencies-isolation.phpt diff --git a/tests/end-to-end/loggers/depends-as-parameter-with-isolation.phpt b/tests/end-to-end/execution-order/depends-as-parameter-with-isolation.phpt similarity index 100% rename from tests/end-to-end/loggers/depends-as-parameter-with-isolation.phpt rename to tests/end-to-end/execution-order/depends-as-parameter-with-isolation.phpt diff --git a/tests/end-to-end/loggers/depends-as-parameter.phpt b/tests/end-to-end/execution-order/depends-as-parameter.phpt similarity index 100% rename from tests/end-to-end/loggers/depends-as-parameter.phpt rename to tests/end-to-end/execution-order/depends-as-parameter.phpt diff --git a/tests/end-to-end/loggers/depends-multiple-parameter-with-isolation.phpt b/tests/end-to-end/execution-order/depends-multiple-parameter-with-isolation.phpt similarity index 100% rename from tests/end-to-end/loggers/depends-multiple-parameter-with-isolation.phpt rename to tests/end-to-end/execution-order/depends-multiple-parameter-with-isolation.phpt diff --git a/tests/end-to-end/loggers/depends-multiple-parameters.phpt b/tests/end-to-end/execution-order/depends-multiple-parameters.phpt similarity index 100% rename from tests/end-to-end/loggers/depends-multiple-parameters.phpt rename to tests/end-to-end/execution-order/depends-multiple-parameters.phpt diff --git a/tests/end-to-end/execution-order-options-via-config.phpt b/tests/end-to-end/execution-order/execution-order-options-via-config.phpt similarity index 70% rename from tests/end-to-end/execution-order-options-via-config.phpt rename to tests/end-to-end/execution-order/execution-order-options-via-config.phpt index b9b2d9afeec..c38119b0398 100644 --- a/tests/end-to-end/execution-order-options-via-config.phpt +++ b/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-- --EXPECTF-- 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 new file mode 100644 index 00000000000..3b1b711bd16 --- /dev/null +++ b/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-- + +--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) diff --git a/tests/end-to-end/test-order-reversed-with-dependency-resolution.phpt b/tests/end-to-end/execution-order/test-order-reversed-with-dependency-resolution.phpt similarity index 68% rename from tests/end-to-end/test-order-reversed-with-dependency-resolution.phpt rename to tests/end-to-end/execution-order/test-order-reversed-with-dependency-resolution.phpt index cd5b29b075b..4b9b7c935b9 100644 --- a/tests/end-to-end/test-order-reversed-with-dependency-resolution.phpt +++ b/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-- --EXPECTF-- diff --git a/tests/end-to-end/test-order-reversed-without-dependency-resolution.phpt b/tests/end-to-end/execution-order/test-order-reversed-without-dependency-resolution.phpt similarity index 74% rename from tests/end-to-end/test-order-reversed-without-dependency-resolution.phpt rename to tests/end-to-end/execution-order/test-order-reversed-without-dependency-resolution.phpt index a67ae9d7ca8..ed2dd8f1a23 100644 --- a/tests/end-to-end/test-order-reversed-without-dependency-resolution.phpt +++ b/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-- --EXPECTF-- diff --git a/tests/end-to-end/stop-on-warning-via-config.phpt b/tests/end-to-end/stop-on-warning-via-config.phpt deleted file mode 100644 index 84b5633933b..00000000000 --- a/tests/end-to-end/stop-on-warning-via-config.phpt +++ /dev/null @@ -1,26 +0,0 @@ ---TEST-- -phpunit -c ../../_files/configuration_stop_on_warning.xml --stop-on-warning StopOnWarningTestSuite ./tests/_files/StopOnWarningTestSuite.php ---FILE-- - ---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) diff --git a/tests/unit/Util/TestResultCacheTest.php b/tests/unit/Util/TestResultCacheTest.php index 369158e7fc3..ea7894bc6d7 100644 --- a/tests/unit/Util/TestResultCacheTest.php +++ b/tests/unit/Util/TestResultCacheTest.php @@ -18,7 +18,7 @@ class TestResultCacheTest extends TestCase { public function testReadsCacheFromProvidedFilename(): void { - $cacheFile = TEST_FILES_PATH . '../end-to-end/loggers/_files/MultiDependencyTest_result_cache.txt'; + $cacheFile = TEST_FILES_PATH . '../end-to-end/execution-order/_files/MultiDependencyTest_result_cache.txt'; $cache = new TestResultCache($cacheFile); $cache->load(); @@ -28,7 +28,7 @@ public function testReadsCacheFromProvidedFilename(): void public function testDoesClearCacheBeforeLoad(): void { - $cacheFile = TEST_FILES_PATH . '../end-to-end/loggers/_files/MultiDependencyTest_result_cache.txt'; + $cacheFile = TEST_FILES_PATH . '../end-to-end/execution-order/_files/MultiDependencyTest_result_cache.txt'; $cache = new TestResultCache($cacheFile); $cache->setState('someTest', BaseTestRunner::STATUS_FAILURE);