Skip to content

Commit c5a67e7

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '10.5' into 11.4
2 parents f2416db + 126dcea commit c5a67e7

File tree

4 files changed

+120
-1
lines changed

4 files changed

+120
-1
lines changed

‎tests/end-to-end/execution-order/_files/TestWithDifferentDurations.phpunit.result.cache.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":1,"defects":[],"times":{"TestWithDifferentDurations::testOne":1,"TestWithDifferentDurations::testTwo":0.5,"TestWithDifferentDurations::testThree":1.5}}
1+
{"version":1,"defects":[],"times":{"PHPUnit\\TestFixture\\TestWithDifferentDurations::testOne":2.006,"PHPUnit\\TestFixture\\TestWithDifferentDurations::testTwo":0,"PHPUnit\\TestFixture\\TestWithDifferentDurations::testThree":3.001,"PHPUnit\\TestFixture\\ExampleTest::testOne":2.006,"PHPUnit\\TestFixture\\ExampleTest::testTwo":3.001,"PHPUnit\\TestFixture\\ExampleTest::testThree":0}}

‎tests/end-to-end/execution-order/_files/order-by-duration.phpunit.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<phpunit
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="../../../../phpunit.xsd"
4+
executionOrder="duration"
5+
>
6+
<testsuites>
7+
<testsuite name="order-by-duration">
8+
<file>./TestWithDifferentDurations.php</file>
9+
</testsuite>
10+
</testsuites>
11+
</phpunit>

‎tests/end-to-end/execution-order/order-by-duration-via-cli.phpt

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
--TEST--
2+
phpunit --order-by=duration ./tests/end-to-end/execution-order/_files/TestWithDifferentDurations.php
3+
--FILE--
4+
<?php declare(strict_types=1);
5+
$cacheDirectory = sys_get_temp_dir() . DIRECTORY_SEPARATOR . sha1(__FILE__);
6+
7+
if (is_dir($cacheDirectory)) {
8+
rmdir($cacheDirectory);
9+
}
10+
11+
mkdir($cacheDirectory);
12+
13+
copy(__DIR__ . '/_files/TestWithDifferentDurations.phpunit.result.cache.txt', $cacheDirectory . DIRECTORY_SEPARATOR . 'test-results');
14+
15+
$_SERVER['argv'][] = '--do-not-cache-result';
16+
$_SERVER['argv'][] = '--no-configuration';
17+
$_SERVER['argv'][] = '--debug';
18+
$_SERVER['argv'][] = '--order-by=duration';
19+
$_SERVER['argv'][] = '--cache-result';
20+
$_SERVER['argv'][] = '--cache-directory=' . $cacheDirectory;
21+
$_SERVER['argv'][] = __DIR__ . '/_files/TestWithDifferentDurations.php';
22+
23+
require_once __DIR__ . '/../../bootstrap.php';
24+
25+
(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
26+
27+
unlink($cacheDirectory . DIRECTORY_SEPARATOR . 'test-results');
28+
rmdir($cacheDirectory);
29+
--EXPECTF--
30+
PHPUnit Started (PHPUnit %s using PHP %s)
31+
Test Runner Configured
32+
Event Facade Sealed
33+
Test Suite Loaded (3 tests)
34+
Test Runner Started
35+
Test Suite Sorted
36+
Test Runner Execution Started (3 tests)
37+
Test Suite Started (PHPUnit\TestFixture\TestWithDifferentDurations, 3 tests)
38+
Test Preparation Started (PHPUnit\TestFixture\TestWithDifferentDurations::testTwo)
39+
Test Prepared (PHPUnit\TestFixture\TestWithDifferentDurations::testTwo)
40+
Test Passed (PHPUnit\TestFixture\TestWithDifferentDurations::testTwo)
41+
Test Finished (PHPUnit\TestFixture\TestWithDifferentDurations::testTwo)
42+
Test Preparation Started (PHPUnit\TestFixture\TestWithDifferentDurations::testOne)
43+
Test Prepared (PHPUnit\TestFixture\TestWithDifferentDurations::testOne)
44+
Test Passed (PHPUnit\TestFixture\TestWithDifferentDurations::testOne)
45+
Test Finished (PHPUnit\TestFixture\TestWithDifferentDurations::testOne)
46+
Test Preparation Started (PHPUnit\TestFixture\TestWithDifferentDurations::testThree)
47+
Test Prepared (PHPUnit\TestFixture\TestWithDifferentDurations::testThree)
48+
Test Passed (PHPUnit\TestFixture\TestWithDifferentDurations::testThree)
49+
Test Finished (PHPUnit\TestFixture\TestWithDifferentDurations::testThree)
50+
Test Suite Finished (PHPUnit\TestFixture\TestWithDifferentDurations, 3 tests)
51+
Test Runner Execution Finished
52+
Test Runner Finished
53+
PHPUnit Finished (Shell Exit Code: 0)

‎tests/end-to-end/execution-order/order-by-duration-via-phpunit-xml.phpt

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
--TEST--
2+
phpunit --configuration=order-by-duration.phpunit.xml
3+
--FILE--
4+
<?php declare(strict_types=1);
5+
$cacheDirectory = sys_get_temp_dir() . DIRECTORY_SEPARATOR . sha1(__FILE__);
6+
7+
if (is_dir($cacheDirectory)) {
8+
rmdir($cacheDirectory);
9+
}
10+
11+
mkdir($cacheDirectory);
12+
13+
copy(__DIR__ . '/_files/TestWithDifferentDurations.phpunit.result.cache.txt', $cacheDirectory . DIRECTORY_SEPARATOR . 'test-results');
14+
15+
$_SERVER['argv'][] = '--do-not-cache-result';
16+
$_SERVER['argv'][] = '--configuration=' . __DIR__ . '/_files/order-by-duration.phpunit.xml';
17+
$_SERVER['argv'][] = '--debug';
18+
$_SERVER['argv'][] = '--cache-result';
19+
$_SERVER['argv'][] = '--cache-directory=' . $cacheDirectory;
20+
21+
require_once __DIR__ . '/../../bootstrap.php';
22+
23+
(new PHPUnit\TextUI\Application)->run($_SERVER['argv']);
24+
25+
unlink($cacheDirectory . DIRECTORY_SEPARATOR . 'test-results');
26+
rmdir($cacheDirectory);
27+
--EXPECTF--
28+
PHPUnit Started (PHPUnit %s using PHP %s)
29+
Test Runner Configured
30+
Event Facade Sealed
31+
Test Suite Loaded (3 tests)
32+
Test Runner Started
33+
Test Suite Sorted
34+
Test Runner Execution Started (3 tests)
35+
Test Suite Started (%sorder-by-duration.phpunit.xml, 3 tests)
36+
Test Suite Started (order-by-duration, 3 tests)
37+
Test Suite Started (PHPUnit\TestFixture\TestWithDifferentDurations, 3 tests)
38+
Test Preparation Started (PHPUnit\TestFixture\TestWithDifferentDurations::testTwo)
39+
Test Prepared (PHPUnit\TestFixture\TestWithDifferentDurations::testTwo)
40+
Test Passed (PHPUnit\TestFixture\TestWithDifferentDurations::testTwo)
41+
Test Finished (PHPUnit\TestFixture\TestWithDifferentDurations::testTwo)
42+
Test Preparation Started (PHPUnit\TestFixture\TestWithDifferentDurations::testOne)
43+
Test Prepared (PHPUnit\TestFixture\TestWithDifferentDurations::testOne)
44+
Test Passed (PHPUnit\TestFixture\TestWithDifferentDurations::testOne)
45+
Test Finished (PHPUnit\TestFixture\TestWithDifferentDurations::testOne)
46+
Test Preparation Started (PHPUnit\TestFixture\TestWithDifferentDurations::testThree)
47+
Test Prepared (PHPUnit\TestFixture\TestWithDifferentDurations::testThree)
48+
Test Passed (PHPUnit\TestFixture\TestWithDifferentDurations::testThree)
49+
Test Finished (PHPUnit\TestFixture\TestWithDifferentDurations::testThree)
50+
Test Suite Finished (PHPUnit\TestFixture\TestWithDifferentDurations, 3 tests)
51+
Test Suite Finished (order-by-duration, 3 tests)
52+
Test Suite Finished (%sorder-by-duration.phpunit.xml, 3 tests)
53+
Test Runner Execution Finished
54+
Test Runner Finished
55+
PHPUnit Finished (Shell Exit Code: 0)

0 commit comments

Comments
 (0)