Skip to content

Commit 146d7d9

Browse files
sebastianbergmannsebastianbergmann
committed
Merge branch '9.3'
2 parents d2c4dcc + 7a2cfdd commit 146d7d9

File tree

4 files changed

+48
-60
lines changed

4 files changed

+48
-60
lines changed

‎src/Util/Log/JUnit.php

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@
99
*/
1010
namespace PHPUnit\Util\Log;
1111

12+
use const PHP_EOL;
1213
use function class_exists;
1314
use function get_class;
1415
use function method_exists;
1516
use function sprintf;
1617
use function str_replace;
18+
use function trim;
1719
use DOMDocument;
1820
use DOMElement;
1921
use PHPUnit\Framework\AssertionFailedError;
@@ -168,22 +170,11 @@ public function addIncompleteTest(Test $test, Throwable $t, float $time): void
168170
*/
169171
public function addRiskyTest(Test $test, Throwable $t, float $time): void
170172
{
171-
if (!$this->reportRiskyTests || $this->currentTestCase === null) {
173+
if (!$this->reportRiskyTests) {
172174
return;
173175
}
174176

175-
$error = $this->document->createElement(
176-
'error',
177-
Xml::prepareString(
178-
"Risky Test\n" .
179-
Filter::getFilteredStacktrace($t)
180-
)
181-
);
182-
183-
$error->setAttribute('type', get_class($t));
184-
185-
$this->currentTestCase->appendChild($error);
186-
177+
$this->doAddFault($test, $t, 'error');
187178
$this->testSuiteErrors[$this->testSuiteLevel]++;
188179
}
189180

@@ -395,13 +386,15 @@ private function doAddFault(Test $test, Throwable $t, string $type): void
395386
}
396387

397388
if ($test instanceof SelfDescribing) {
398-
$buffer = $test->toString() . "\n";
389+
$buffer = $test->toString() . PHP_EOL;
399390
} else {
400391
$buffer = '';
401392
}
402393

403-
$buffer .= TestFailure::exceptionToString($t) . "\n" .
404-
Filter::getFilteredStacktrace($t);
394+
$buffer .= trim(
395+
TestFailure::exceptionToString($t) . PHP_EOL .
396+
Filter::getFilteredStacktrace($t)
397+
);
405398

406399
$fault = $this->document->createElement(
407400
$type,

‎tests/end-to-end/dataprovider-log-xml-isolation.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ PHPUnit %s by Sebastian Bergmann and contributors.
2323
<failure type="PHPUnit\Framework\ExpectationFailedException">PHPUnit\TestFixture\DataProviderTest::testAdd with data set #2 (1, 1, 3)
2424
Failed asserting that 2 matches expected 3.
2525

26-
%s:%i
27-
</failure>
26+
%s:%i</failure>
2827
</testcase>
2928
<testcase name="testAdd with data set #3" class="PHPUnit\TestFixture\DataProviderTest" classname="PHPUnit.TestFixture.DataProviderTest" file="%sDataProviderTest.php" line="%d" assertions="1" time="%f"/>
3029
</testsuite>

‎tests/end-to-end/dataprovider-log-xml.phpt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ PHPUnit %s by Sebastian Bergmann and contributors.
2222
<failure type="PHPUnit\Framework\ExpectationFailedException">PHPUnit\TestFixture\DataProviderTest::testAdd with data set #2 (1, 1, 3)
2323
Failed asserting that 2 matches expected 3.
2424

25-
%s:%i
26-
</failure>
25+
%s:%i</failure>
2726
</testcase>
2827
<testcase name="testAdd with data set #3" class="PHPUnit\TestFixture\DataProviderTest" classname="PHPUnit.TestFixture.DataProviderTest" file="%sDataProviderTest.php" line="%d" assertions="1" time="%f"/>
2928
</testsuite>

‎tests/end-to-end/loggers/log-junit.phpt

Lines changed: 37 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -17,70 +17,67 @@ PHPUnit %s by Sebastian Bergmann and contributors.
1717

1818
.FEISRW.FEISRW 14 / 14 (100%)<?xml version="1.0" encoding="UTF-8"?>
1919
<testsuites>
20-
<testsuite name="PHPUnit\SelfTest\Basic\StatusTest" file="%s%eStatusTest.php" tests="14" assertions="4" errors="4" warnings="2" failures="2" skipped="4" time="%f">
21-
<testcase name="testSuccess" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%s%eStatusTest.php" line="%d" assertions="1" time="%f"/>
22-
<testcase name="testFailure" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%s%eStatusTest.php" line="%d" assertions="1" time="%f">
20+
<testsuite name="PHPUnit\SelfTest\Basic\StatusTest" file="%sStatusTest.php" tests="14" assertions="4" errors="4" warnings="2" failures="2" skipped="4" time="%f">
21+
<testcase name="testSuccess" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%sStatusTest.php" line="%d" assertions="1" time="%f"/>
22+
<testcase name="testFailure" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%sStatusTest.php" line="%d" assertions="1" time="%f">
2323
<failure type="PHPUnit\Framework\ExpectationFailedException">PHPUnit\SelfTest\Basic\StatusTest::testFailure
2424
Failed asserting that false is true.
2525

26-
%s%eStatusTest.php:%d
27-
</failure>
26+
%sStatusTest.php:%d</failure>
2827
</testcase>
29-
<testcase name="testError" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%s%eStatusTest.php" line="%d" assertions="0" time="%f">
28+
<testcase name="testError" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%sStatusTest.php" line="%d" assertions="0" time="%f">
3029
<error type="RuntimeException">PHPUnit\SelfTest\Basic\StatusTest::testError
3130
RuntimeException:%w
3231

33-
%s%eStatusTest.php:%d
34-
</error>
32+
%sStatusTest.php:%d</error>
3533
</testcase>
36-
<testcase name="testIncomplete" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%s%eStatusTest.php" line="%d" assertions="0" time="%f">
34+
<testcase name="testIncomplete" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%sStatusTest.php" line="%d" assertions="0" time="%f">
3735
<skipped/>
3836
</testcase>
39-
<testcase name="testSkipped" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%s%eStatusTest.php" line="%d" assertions="0" time="%f">
37+
<testcase name="testSkipped" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%sStatusTest.php" line="%d" assertions="0" time="%f">
4038
<skipped/>
4139
</testcase>
42-
<testcase name="testRisky" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%s%eStatusTest.php" line="%d" assertions="0" time="%f">
43-
<error type="PHPUnit\Framework\RiskyTestError">Risky Test
44-
</error>
40+
<testcase name="testRisky" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%sStatusTest.php" line="%d" assertions="0" time="%f">
41+
<error type="PHPUnit\Framework\RiskyTestError">PHPUnit\SelfTest\Basic\StatusTest::testRisky
42+
This test did not perform any assertions
43+
44+
%sStatusTest.php:%d</error>
4545
</testcase>
46-
<testcase name="testWarning" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%s%eStatusTest.php" line="%d" assertions="0" time="%f">
46+
<testcase name="testWarning" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%sStatusTest.php" line="%d" assertions="0" time="%f">
4747
<warning type="PHPUnit\Framework\Warning">PHPUnit\SelfTest\Basic\StatusTest::testWarning
48-
49-
%s%eStatusTest.php:%d
50-
</warning>
48+
%sStatusTest.php:%d</warning>
5149
</testcase>
52-
<testcase name="testSuccessWithMessage" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%s%eStatusTest.php" line="%d" assertions="1" time="%f"/>
53-
<testcase name="testFailureWithMessage" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%s%eStatusTest.php" line="%d" assertions="1" time="%f">
50+
<testcase name="testSuccessWithMessage" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%sStatusTest.php" line="%d" assertions="1" time="%f"/>
51+
<testcase name="testFailureWithMessage" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%sStatusTest.php" line="%d" assertions="1" time="%f">
5452
<failure type="PHPUnit\Framework\ExpectationFailedException">PHPUnit\SelfTest\Basic\StatusTest::testFailureWithMessage
5553
failure with custom message
5654
Failed asserting that false is true.
5755

58-
%s%eStatusTest.php:%d
59-
</failure>
56+
%sStatusTest.php:%d</failure>
6057
</testcase>
61-
<testcase name="testErrorWithMessage" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%s%eStatusTest.php" line="%d" assertions="0" time="%f">
58+
<testcase name="testErrorWithMessage" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%sStatusTest.php" line="%d" assertions="0" time="%f">
6259
<error type="RuntimeException">PHPUnit\SelfTest\Basic\StatusTest::testErrorWithMessage
6360
RuntimeException: error with custom message
6461

65-
%s%eStatusTest.php:%d
66-
</error>
62+
%sStatusTest.php:%d</error>
6763
</testcase>
68-
<testcase name="testIncompleteWithMessage" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%s%eStatusTest.php" line="%d" assertions="0" time="%f">
64+
<testcase name="testIncompleteWithMessage" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%sStatusTest.php" line="%d" assertions="0" time="%f">
6965
<skipped/>
7066
</testcase>
71-
<testcase name="testSkippedWithMessage" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%s%eStatusTest.php" line="%d" assertions="0" time="%f">
67+
<testcase name="testSkippedWithMessage" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%sStatusTest.php" line="%d" assertions="0" time="%f">
7268
<skipped/>
7369
</testcase>
74-
<testcase name="testRiskyWithMessage" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%s%eStatusTest.php" line="%d" assertions="0" time="%f">
75-
<error type="PHPUnit\Framework\RiskyTestError">Risky Test
76-
</error>
70+
<testcase name="testRiskyWithMessage" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%sStatusTest.php" line="%d" assertions="0" time="%f">
71+
<error type="PHPUnit\Framework\RiskyTestError">PHPUnit\SelfTest\Basic\StatusTest::testRiskyWithMessage
72+
This test did not perform any assertions
73+
74+
%sStatusTest.php:%d</error>
7775
</testcase>
78-
<testcase name="testWarningWithMessage" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%s%eStatusTest.php" line="%d" assertions="0" time="%f">
76+
<testcase name="testWarningWithMessage" class="PHPUnit\SelfTest\Basic\StatusTest" classname="PHPUnit.SelfTest.Basic.StatusTest" file="%sStatusTest.php" line="%d" assertions="0" time="%f">
7977
<warning type="PHPUnit\Framework\Warning">PHPUnit\SelfTest\Basic\StatusTest::testWarningWithMessage
8078
warning with custom message
8179

82-
%s%eStatusTest.php:%d
83-
</warning>
80+
%sStatusTest.php:%d</warning>
8481
</testcase>
8582
</testsuite>
8683
</testsuites>
@@ -93,25 +90,25 @@ There were 2 errors:
9390
1) PHPUnit\SelfTest\Basic\StatusTest::testError
9491
RuntimeException:%w
9592

96-
%s%eStatusTest.php:%d
93+
%sStatusTest.php:%d
9794

9895
2) PHPUnit\SelfTest\Basic\StatusTest::testErrorWithMessage
9996
RuntimeException: error with custom message
10097

101-
%s%eStatusTest.php:%d
98+
%sStatusTest.php:%d
10299

103100
--
104101

105102
There were 2 warnings:
106103

107104
1) PHPUnit\SelfTest\Basic\StatusTest::testWarning
108105

109-
%s%eStatusTest.php:%d
106+
%sStatusTest.php:%d
110107

111108
2) PHPUnit\SelfTest\Basic\StatusTest::testWarningWithMessage
112109
warning with custom message
113110

114-
%s%eStatusTest.php:%d
111+
%sStatusTest.php:%d
115112

116113
--
117114

@@ -120,13 +117,13 @@ There were 2 failures:
120117
1) PHPUnit\SelfTest\Basic\StatusTest::testFailure
121118
Failed asserting that false is true.
122119

123-
%s%eStatusTest.php:%d
120+
%sStatusTest.php:%d
124121

125122
2) PHPUnit\SelfTest\Basic\StatusTest::testFailureWithMessage
126123
failure with custom message
127124
Failed asserting that false is true.
128125

129-
%s%eStatusTest.php:%d
126+
%sStatusTest.php:%d
130127

131128
--
132129

@@ -135,12 +132,12 @@ There were 2 risky tests:
135132
1) PHPUnit\SelfTest\Basic\StatusTest::testRisky
136133
This test did not perform any assertions
137134

138-
%s%eStatusTest.php:%d
135+
%sStatusTest.php:%d
139136

140137
2) PHPUnit\SelfTest\Basic\StatusTest::testRiskyWithMessage
141138
This test did not perform any assertions
142139

143-
%s%eStatusTest.php:%d
140+
%sStatusTest.php:%d
144141

145142
ERRORS!
146143
Tests: 14, Assertions: 4, Errors: 2, Failures: 2, Warnings: 2, Skipped: 2, Incomplete: 2, Risky: 2.

0 commit comments

Comments
 (0)