Skip to content

Commit ac6421c

Browse files
mvoriseksebastianbergmann
authored andcommitted
expect %e instead of fixed directory separator
1 parent de55276 commit ac6421c

10 files changed

+26
-23
lines changed

tests/end-to-end/cli/filter/filter-class-match-configuration.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Test Runner Started
2929
Test Suite Sorted
3030
Test Suite Filtered (3 tests)
3131
Test Runner Execution Started (3 tests)
32-
Test Suite Started (%s/tests/end-to-end/_files/groups/phpunit.xml, 3 tests)
32+
Test Suite Started (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 3 tests)
3333
Test Suite Started (default, 3 tests)
3434
Test Suite Started (PHPUnit\TestFixture\Groups\FooTest, 3 tests)
3535
Test Preparation Started (PHPUnit\TestFixture\Groups\FooTest::testOne)
@@ -49,7 +49,7 @@ Test Passed (PHPUnit\TestFixture\Groups\FooTest::testThree)
4949
Test Finished (PHPUnit\TestFixture\Groups\FooTest::testThree)
5050
Test Suite Finished (PHPUnit\TestFixture\Groups\FooTest, 3 tests)
5151
Test Suite Finished (default, 3 tests)
52-
Test Suite Finished (%s/tests/end-to-end/_files/groups/phpunit.xml, 3 tests)
52+
Test Suite Finished (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 3 tests)
5353
Test Runner Execution Finished
5454
Test Runner Finished
5555
PHPUnit Finished (Shell Exit Code: 0)

tests/end-to-end/cli/filter/filter-method-match-configuration.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Test Runner Started
2929
Test Suite Sorted
3030
Test Suite Filtered (1 test)
3131
Test Runner Execution Started (1 test)
32-
Test Suite Started (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
32+
Test Suite Started (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
3333
Test Suite Started (default, 1 test)
3434
Test Suite Started (PHPUnit\TestFixture\Groups\FooTest, 1 test)
3535
Test Preparation Started (PHPUnit\TestFixture\Groups\FooTest::testOne)
@@ -39,7 +39,7 @@ Test Passed (PHPUnit\TestFixture\Groups\FooTest::testOne)
3939
Test Finished (PHPUnit\TestFixture\Groups\FooTest::testOne)
4040
Test Suite Finished (PHPUnit\TestFixture\Groups\FooTest, 1 test)
4141
Test Suite Finished (default, 1 test)
42-
Test Suite Finished (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
42+
Test Suite Finished (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
4343
Test Runner Execution Finished
4444
Test Runner Finished
4545
PHPUnit Finished (Shell Exit Code: 0)

tests/end-to-end/cli/group/exclude-group-configuration.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Test Runner Started
2929
Test Suite Sorted
3030
Test Suite Filtered (1 test)
3131
Test Runner Execution Started (1 test)
32-
Test Suite Started (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
32+
Test Suite Started (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
3333
Test Suite Started (default, 1 test)
3434
Test Suite Started (PHPUnit\TestFixture\Groups\FooTest, 1 test)
3535
Test Preparation Started (PHPUnit\TestFixture\Groups\FooTest::testThree)
@@ -39,7 +39,7 @@ Test Passed (PHPUnit\TestFixture\Groups\FooTest::testThree)
3939
Test Finished (PHPUnit\TestFixture\Groups\FooTest::testThree)
4040
Test Suite Finished (PHPUnit\TestFixture\Groups\FooTest, 1 test)
4141
Test Suite Finished (default, 1 test)
42-
Test Suite Finished (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
42+
Test Suite Finished (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
4343
Test Runner Execution Finished
4444
Test Runner Finished
4545
PHPUnit Finished (Shell Exit Code: 0)

tests/end-to-end/cli/group/group-configuration.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Test Runner Started
2929
Test Suite Sorted
3030
Test Suite Filtered (1 test)
3131
Test Runner Execution Started (1 test)
32-
Test Suite Started (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
32+
Test Suite Started (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
3333
Test Suite Started (default, 1 test)
3434
Test Suite Started (PHPUnit\TestFixture\Groups\FooTest, 1 test)
3535
Test Preparation Started (PHPUnit\TestFixture\Groups\FooTest::testOne)
@@ -39,7 +39,7 @@ Test Passed (PHPUnit\TestFixture\Groups\FooTest::testOne)
3939
Test Finished (PHPUnit\TestFixture\Groups\FooTest::testOne)
4040
Test Suite Finished (PHPUnit\TestFixture\Groups\FooTest, 1 test)
4141
Test Suite Finished (default, 1 test)
42-
Test Suite Finished (%s/tests/end-to-end/_files/groups/phpunit.xml, 1 test)
42+
Test Suite Finished (%s%etests%eend-to-end%e_files%egroups%ephpunit.xml, 1 test)
4343
Test Runner Execution Finished
4444
Test Runner Finished
4545
PHPUnit Finished (Shell Exit Code: 0)

tests/end-to-end/event/error-handler-can-be-disabled.phpt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ unlink($traceFile);
2222
--EXPECTF--
2323
PHPUnit Started (PHPUnit %s using %s)
2424
Test Runner Configured
25-
Bootstrap Finished (%s/src/Foo.php)
25+
Bootstrap Finished (%s%esrc/Foo.php)
2626
Test Suite Loaded (2 tests)
2727
Event Facade Sealed
2828
Test Runner Started
2929
Test Suite Sorted
3030
Test Runner Execution Started (2 tests)
31-
Test Suite Started (%s/phpunit.xml, 2 tests)
31+
Test Suite Started (%s%ephpunit.xml, 2 tests)
3232
Test Suite Started (default, 2 tests)
3333
Test Suite Started (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest, 2 tests)
3434
Test Preparation Started (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testMethodA)
@@ -44,7 +44,7 @@ Test Passed (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testMe
4444
Test Finished (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest::testMethodB)
4545
Test Suite Finished (PHPUnit\TestFixture\Event\ErrorHandlerCanBeDisabled\FooTest, 2 tests)
4646
Test Suite Finished (default, 2 tests)
47-
Test Suite Finished (%s/phpunit.xml, 2 tests)
47+
Test Suite Finished (%s%ephpunit.xml, 2 tests)
4848
Test Runner Execution Finished
4949
Test Runner Finished
5050
PHPUnit Finished (Shell Exit Code: 0)

tests/end-to-end/event/invalid-coverage-metadata.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Event Facade Sealed
3232
Test Runner Started
3333
Test Suite Sorted
3434
Test Runner Execution Started (1 test)
35-
Test Suite Started (%s/tests/end-to-end/event/_files/invalid-coverage-metadata/phpunit.xml, 1 test)
35+
Test Suite Started (%s%etests%eend-to-end%eevent%e_files%einvalid-coverage-metadata%ephpunit.xml, 1 test)
3636
Test Suite Started (default, 1 test)
3737
Test Suite Started (PHPUnit\TestFixture\Event\InvalidCoverageMetadata\InvalidCoverageMetadataTest, 1 test)
3838
Test Preparation Started (PHPUnit\TestFixture\Event\InvalidCoverageMetadata\InvalidCoverageMetadataTest::testOne)
@@ -44,7 +44,7 @@ Class "PHPUnit\TestFixture\Event\InvalidCoverageMetadata\This\Does\Not\Exist" is
4444
Test Finished (PHPUnit\TestFixture\Event\InvalidCoverageMetadata\InvalidCoverageMetadataTest::testOne)
4545
Test Suite Finished (PHPUnit\TestFixture\Event\InvalidCoverageMetadata\InvalidCoverageMetadataTest, 1 test)
4646
Test Suite Finished (default, 1 test)
47-
Test Suite Finished (%s/tests/end-to-end/event/_files/invalid-coverage-metadata/phpunit.xml, 1 test)
47+
Test Suite Finished (%s%etests%eend-to-end%eevent%e_files%einvalid-coverage-metadata%ephpunit.xml, 1 test)
4848
Test Runner Execution Finished
4949
Test Runner Finished
5050
PHPUnit Finished (Shell Exit Code: 1)

tests/end-to-end/event/phpt-skipif.phpt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ Event Facade Sealed
2626
Test Runner Started
2727
Test Suite Sorted
2828
Test Runner Execution Started (1 test)
29-
Test Suite Started (%s/phpt-skipif-location-hint-example.phpt, 1 test)
30-
Test Preparation Started (%s/phpt-skipif-location-hint-example.phpt)
31-
Test Prepared (%s/phpt-skipif-location-hint-example.phpt)
32-
Test Skipped (%s/phpt-skipif-location-hint-example.phpt)
29+
Test Suite Started (%s%ephpt-skipif-location-hint-example.phpt, 1 test)
30+
Test Preparation Started (%s%ephpt-skipif-location-hint-example.phpt)
31+
Test Prepared (%s%ephpt-skipif-location-hint-example.phpt)
32+
Test Skipped (%s%ephpt-skipif-location-hint-example.phpt)
3333
something terrible happened
34-
Test Finished (%s/phpt-skipif-location-hint-example.phpt)
35-
Test Suite Finished (%s/phpt-skipif-location-hint-example.phpt, 1 test)
34+
Test Finished (%s%ephpt-skipif-location-hint-example.phpt)
35+
Test Suite Finished (%s%ephpt-skipif-location-hint-example.phpt, 1 test)
3636
Test Runner Execution Finished
3737
Test Runner Finished
3838
PHPUnit Finished (Shell Exit Code: 0)

tests/end-to-end/event/risky-time-limit-exceeded.phpt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
--TEST--
22
The right events are emitted in the right order for a test that is considered risky because it timed out
3+
--SKIPIF--
4+
<?php declare(strict_types=1);
5+
if (!extension_loaded('pcntl')) echo 'skip: Extension pcntl is required';
36
--FILE--
47
<?php declare(strict_types=1);
58
$traceFile = tempnam(sys_get_temp_dir(), __FILE__);

tests/end-to-end/extension/phar-extension.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Event Facade Sealed
2828
Test Runner Started
2929
Test Suite Sorted
3030
Test Runner Execution Started (1 test)
31-
Test Suite Started (%s/tests/end-to-end/_files/phar-extension/phpunit.xml, 1 test)
31+
Test Suite Started (%s%etests%eend-to-end%e_files%ephar-extension%ephpunit.xml, 1 test)
3232
Test Suite Started (default, 1 test)
3333
Test Suite Started (PHPUnit\TestFixture\Event\MyExtension\Test, 1 test)
3434
Test Preparation Started (PHPUnit\TestFixture\Event\MyExtension\Test::testOne)
@@ -38,7 +38,7 @@ Test Passed (PHPUnit\TestFixture\Event\MyExtension\Test::testOne)
3838
Test Finished (PHPUnit\TestFixture\Event\MyExtension\Test::testOne)
3939
Test Suite Finished (PHPUnit\TestFixture\Event\MyExtension\Test, 1 test)
4040
Test Suite Finished (default, 1 test)
41-
Test Suite Finished (%s/tests/end-to-end/_files/phar-extension/phpunit.xml, 1 test)
41+
Test Suite Finished (%s%etests%eend-to-end%e_files%ephar-extension%ephpunit.xml, 1 test)
4242
Test Runner Execution Finished
4343
Test Runner Finished
4444
PHPUnit Finished (Shell Exit Code: 0)

tests/end-to-end/generic/controlled-garbage-collection.phpt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Test Suite Sorted
2828
Test Runner Execution Started (2 tests)
2929
Test Runner Disabled Garbage Collection
3030
Test Runner Triggered Garbage Collection
31-
Test Suite Started (%s/phpunit.xml, 2 tests)
31+
Test Suite Started (%s%ephpunit.xml, 2 tests)
3232
Test Suite Started (default, 2 tests)
3333
Test Suite Started (PHPUnit\TestFixture\GarbageCollection\GarbageCollectionTest, 2 tests)
3434
Test Preparation Started (PHPUnit\TestFixture\GarbageCollection\GarbageCollectionTest::testOne)
@@ -45,7 +45,7 @@ Test Finished (PHPUnit\TestFixture\GarbageCollection\GarbageCollectionTest::test
4545
Test Runner Triggered Garbage Collection
4646
Test Suite Finished (PHPUnit\TestFixture\GarbageCollection\GarbageCollectionTest, 2 tests)
4747
Test Suite Finished (default, 2 tests)
48-
Test Suite Finished (%s/phpunit.xml, 2 tests)
48+
Test Suite Finished (%s%ephpunit.xml, 2 tests)
4949
Test Runner Execution Finished
5050
Test Runner Triggered Garbage Collection
5151
Test Runner Enabled Garbage Collection

0 commit comments

Comments
 (0)