Skip to content

Commit

Permalink
expect %e instead of fixed directory separator
Browse files Browse the repository at this point in the history
  • Loading branch information
mvorisek authored and sebastianbergmann committed Nov 30, 2023
1 parent de55276 commit ac6421c
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Test Runner Started
Test Suite Sorted
Test Suite Filtered (3 tests)
Test Runner Execution Started (3 tests)
Test Suite Started (%s/tests/end-to-end/_files/groups/phpunit.xml, 3 tests)
Test Suite Started (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 3 tests)
Test Suite Started (default, 3 tests)
Test Suite Started (PHPUnit\TestFixture\Groups\FooTest, 3 tests)
Test Preparation Started (PHPUnit\TestFixture\Groups\FooTest::testOne)
Expand All @@ -49,7 +49,7 @@ Test Passed (PHPUnit\TestFixture\Groups\FooTest::testThree)
Test Finished (PHPUnit\TestFixture\Groups\FooTest::testThree)
Test Suite Finished (PHPUnit\TestFixture\Groups\FooTest, 3 tests)
Test Suite Finished (default, 3 tests)
Test Suite Finished (%s/tests/end-to-end/_files/groups/phpunit.xml, 3 tests)
Test Suite Finished (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 3 tests)
Test Runner Execution Finished
Test Runner Finished
PHPUnit Finished (Shell Exit Code: 0)
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Test Runner Started
Test Suite Sorted
Test Suite Filtered (1 test)
Test Runner Execution Started (1 test)
Test Suite Started (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
Test Suite Started (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
Test Suite Started (default, 1 test)
Test Suite Started (PHPUnit\TestFixture\Groups\FooTest, 1 test)
Test Preparation Started (PHPUnit\TestFixture\Groups\FooTest::testOne)
Expand All @@ -39,7 +39,7 @@ Test Passed (PHPUnit\TestFixture\Groups\FooTest::testOne)
Test Finished (PHPUnit\TestFixture\Groups\FooTest::testOne)
Test Suite Finished (PHPUnit\TestFixture\Groups\FooTest, 1 test)
Test Suite Finished (default, 1 test)
Test Suite Finished (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
Test Suite Finished (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
Test Runner Execution Finished
Test Runner Finished
PHPUnit Finished (Shell Exit Code: 0)
4 changes: 2 additions & 2 deletions tests/end-to-end/cli/group/exclude-group-configuration.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Test Runner Started
Test Suite Sorted
Test Suite Filtered (1 test)
Test Runner Execution Started (1 test)
Test Suite Started (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
Test Suite Started (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
Test Suite Started (default, 1 test)
Test Suite Started (PHPUnit\TestFixture\Groups\FooTest, 1 test)
Test Preparation Started (PHPUnit\TestFixture\Groups\FooTest::testThree)
Expand All @@ -39,7 +39,7 @@ Test Passed (PHPUnit\TestFixture\Groups\FooTest::testThree)
Test Finished (PHPUnit\TestFixture\Groups\FooTest::testThree)
Test Suite Finished (PHPUnit\TestFixture\Groups\FooTest, 1 test)
Test Suite Finished (default, 1 test)
Test Suite Finished (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
Test Suite Finished (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
Test Runner Execution Finished
Test Runner Finished
PHPUnit Finished (Shell Exit Code: 0)
4 changes: 2 additions & 2 deletions tests/end-to-end/cli/group/group-configuration.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Test Runner Started
Test Suite Sorted
Test Suite Filtered (1 test)
Test Runner Execution Started (1 test)
Test Suite Started (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
Test Suite Started (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
Test Suite Started (default, 1 test)
Test Suite Started (PHPUnit\TestFixture\Groups\FooTest, 1 test)
Test Preparation Started (PHPUnit\TestFixture\Groups\FooTest::testOne)
Expand All @@ -39,7 +39,7 @@ Test Passed (PHPUnit\TestFixture\Groups\FooTest::testOne)
Test Finished (PHPUnit\TestFixture\Groups\FooTest::testOne)
Test Suite Finished (PHPUnit\TestFixture\Groups\FooTest, 1 test)
Test Suite Finished (default, 1 test)
Test Suite Finished (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
Test Suite Finished (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
Test Runner Execution Finished
Test Runner Finished
PHPUnit Finished (Shell Exit Code: 0)
6 changes: 3 additions & 3 deletions tests/end-to-end/event/error-handler-can-be-disabled.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ unlink($traceFile);
--EXPECTF--
PHPUnit Started (PHPUnit %s using %s)
Test Runner Configured
Bootstrap Finished (%s/src/Foo.php)
Bootstrap Finished (%s%esrc/Foo.php)
Test Suite Loaded (2 tests)
Event Facade Sealed
Test Runner Started
Test Suite Sorted
Test Runner Execution Started (2 tests)
Test Suite Started (%s/phpunit.xml, 2 tests)
Test Suite Started (%s%ephpunit.xml, 2 tests)
Test Suite Started (default, 2 tests)
Test Suite Started (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest, 2 tests)
Test Preparation Started (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testMethodA)
Expand All @@ -44,7 +44,7 @@ Test Passed (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testMe
Test Finished (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testMethodB)
Test Suite Finished (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest, 2 tests)
Test Suite Finished (default, 2 tests)
Test Suite Finished (%s/phpunit.xml, 2 tests)
Test Suite Finished (%s%ephpunit.xml, 2 tests)
Test Runner Execution Finished
Test Runner Finished
PHPUnit Finished (Shell Exit Code: 0)
4 changes: 2 additions & 2 deletions tests/end-to-end/event/invalid-coverage-metadata.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Event Facade Sealed
Test Runner Started
Test Suite Sorted
Test Runner Execution Started (1 test)
Test Suite Started (%s/tests/end-to-end/event/_files/invalid-coverage-metadata/phpunit.xml, 1 test)
Test Suite Started (%s%etests%eend-to-end%eevent%e_files%einvalid-coverage-metadata%ephpunit.xml, 1 test)
Test Suite Started (default, 1 test)
Test Suite Started (PHPUnit\TestFixture\Event\InvalidCoverageMetadata\InvalidCoverageMetadataTest, 1 test)
Test Preparation Started (PHPUnit\TestFixture\Event\InvalidCoverageMetadata\InvalidCoverageMetadataTest::testOne)
Expand All @@ -44,7 +44,7 @@ Class "PHPUnit\TestFixture\Event\InvalidCoverageMetadata\This\Does\Not\Exist" is
Test Finished (PHPUnit\TestFixture\Event\InvalidCoverageMetadata\InvalidCoverageMetadataTest::testOne)
Test Suite Finished (PHPUnit\TestFixture\Event\InvalidCoverageMetadata\InvalidCoverageMetadataTest, 1 test)
Test Suite Finished (default, 1 test)
Test Suite Finished (%s/tests/end-to-end/event/_files/invalid-coverage-metadata/phpunit.xml, 1 test)
Test Suite Finished (%s%etests%eend-to-end%eevent%e_files%einvalid-coverage-metadata%ephpunit.xml, 1 test)
Test Runner Execution Finished
Test Runner Finished
PHPUnit Finished (Shell Exit Code: 1)
12 changes: 6 additions & 6 deletions tests/end-to-end/event/phpt-skipif.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ Event Facade Sealed
Test Runner Started
Test Suite Sorted
Test Runner Execution Started (1 test)
Test Suite Started (%s/phpt-skipif-location-hint-example.phpt, 1 test)
Test Preparation Started (%s/phpt-skipif-location-hint-example.phpt)
Test Prepared (%s/phpt-skipif-location-hint-example.phpt)
Test Skipped (%s/phpt-skipif-location-hint-example.phpt)
Test Suite Started (%s%ephpt-skipif-location-hint-example.phpt, 1 test)
Test Preparation Started (%s%ephpt-skipif-location-hint-example.phpt)
Test Prepared (%s%ephpt-skipif-location-hint-example.phpt)
Test Skipped (%s%ephpt-skipif-location-hint-example.phpt)
something terrible happened
Test Finished (%s/phpt-skipif-location-hint-example.phpt)
Test Suite Finished (%s/phpt-skipif-location-hint-example.phpt, 1 test)
Test Finished (%s%ephpt-skipif-location-hint-example.phpt)
Test Suite Finished (%s%ephpt-skipif-location-hint-example.phpt, 1 test)
Test Runner Execution Finished
Test Runner Finished
PHPUnit Finished (Shell Exit Code: 0)
3 changes: 3 additions & 0 deletions tests/end-to-end/event/risky-time-limit-exceeded.phpt
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
--TEST--
The right events are emitted in the right order for a test that is considered risky because it timed out
--SKIPIF--
<?php declare(strict_types=1);
if (!extension_loaded('pcntl')) echo 'skip: Extension pcntl is required';
--FILE--
<?php declare(strict_types=1);
$traceFile = tempnam(sys_get_temp_dir(), __FILE__);
Expand Down
4 changes: 2 additions & 2 deletions tests/end-to-end/extension/phar-extension.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Event Facade Sealed
Test Runner Started
Test Suite Sorted
Test Runner Execution Started (1 test)
Test Suite Started (%s/tests/end-to-end/_files/phar-extension/phpunit.xml, 1 test)
Test Suite Started (%s%etests%eend-to-end%e_files%ephar-extension%ephpunit.xml, 1 test)
Test Suite Started (default, 1 test)
Test Suite Started (PHPUnit\TestFixture\Event\MyExtension\Test, 1 test)
Test Preparation Started (PHPUnit\TestFixture\Event\MyExtension\Test::testOne)
Expand All @@ -38,7 +38,7 @@ Test Passed (PHPUnit\TestFixture\Event\MyExtension\Test::testOne)
Test Finished (PHPUnit\TestFixture\Event\MyExtension\Test::testOne)
Test Suite Finished (PHPUnit\TestFixture\Event\MyExtension\Test, 1 test)
Test Suite Finished (default, 1 test)
Test Suite Finished (%s/tests/end-to-end/_files/phar-extension/phpunit.xml, 1 test)
Test Suite Finished (%s%etests%eend-to-end%e_files%ephar-extension%ephpunit.xml, 1 test)
Test Runner Execution Finished
Test Runner Finished
PHPUnit Finished (Shell Exit Code: 0)
4 changes: 2 additions & 2 deletions tests/end-to-end/generic/controlled-garbage-collection.phpt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Test Suite Sorted
Test Runner Execution Started (2 tests)
Test Runner Disabled Garbage Collection
Test Runner Triggered Garbage Collection
Test Suite Started (%s/phpunit.xml, 2 tests)
Test Suite Started (%s%ephpunit.xml, 2 tests)
Test Suite Started (default, 2 tests)
Test Suite Started (PHPUnit\TestFixture\GarbageCollection\GarbageCollectionTest, 2 tests)
Test Preparation Started (PHPUnit\TestFixture\GarbageCollection\GarbageCollectionTest::testOne)
Expand All @@ -45,7 +45,7 @@ Test Finished (PHPUnit\TestFixture\GarbageCollection\GarbageCollectionTest::test
Test Runner Triggered Garbage Collection
Test Suite Finished (PHPUnit\TestFixture\GarbageCollection\GarbageCollectionTest, 2 tests)
Test Suite Finished (default, 2 tests)
Test Suite Finished (%s/phpunit.xml, 2 tests)
Test Suite Finished (%s%ephpunit.xml, 2 tests)
Test Runner Execution Finished
Test Runner Triggered Garbage Collection
Test Runner Enabled Garbage Collection
Expand Down

0 comments on commit ac6421c

Please sign in to comment.