Skip to content

Commit a1c56d0

Browse files
sebastianbergmannsebastianbergmann
committed
1 parent 52e10ad commit a1c56d0

File tree

7 files changed

+20
-33
lines changed

7 files changed

+20
-33
lines changed

‎src/CodeCoverage.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ public function append(RawCodeCoverageData $rawData, $id = null, bool $append =
278278
}
279279

280280
$size = 'unknown';
281-
$status = -1;
281+
$status = 'unknown';
282282
$fromTestcase = false;
283283

284284
if ($id instanceof TestCase) {
@@ -293,7 +293,7 @@ public function append(RawCodeCoverageData $rawData, $id = null, bool $append =
293293
$size = 'large';
294294
}
295295

296-
$status = $id->getStatus();
296+
$status = $id->status()->type();
297297
$id = get_class($id) . '::' . $id->getName();
298298
} elseif ($id instanceof PhptTestCase) {
299299
$fromTestcase = true;

‎src/Report/Html/Renderer/File.php‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
use function substr;
9595
use function token_get_all;
9696
use function trim;
97-
use PHPUnit\Runner\BaseTestRunner;
9897
use SebastianBergmann\CodeCoverage\Node\File as FileNode;
9998
use SebastianBergmann\CodeCoverage\Percentage;
10099
use SebastianBergmann\Template\Template;
@@ -994,7 +993,7 @@ private function createPopoverContentForTest(string $test, array $testData): str
994993

995994
if ($testData['fromTestcase']) {
996995
switch ($testData['status']) {
997-
case BaseTestRunner::STATUS_PASSED:
996+
case 'success':
998997
switch ($testData['size']) {
999998
case 'small':
1000999
$testCSS = ' class="covered-by-small-tests"';
@@ -1014,16 +1013,16 @@ private function createPopoverContentForTest(string $test, array $testData): str
10141013

10151014
break;
10161015

1017-
case BaseTestRunner::STATUS_SKIPPED:
1018-
case BaseTestRunner::STATUS_INCOMPLETE:
1019-
case BaseTestRunner::STATUS_RISKY:
1020-
case BaseTestRunner::STATUS_WARNING:
1016+
case 'skipped':
1017+
case 'incomplete':
1018+
case 'risky':
1019+
case 'warning':
10211020
$testCSS = ' class="warning"';
10221021

10231022
break;
10241023

1025-
case BaseTestRunner::STATUS_FAILURE:
1026-
case BaseTestRunner::STATUS_ERROR:
1024+
case 'failure':
1025+
case 'error':
10271026
$testCSS = ' class="danger"';
10281027

10291028
break;

‎src/Report/Xml/Tests.php‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,6 @@ final class Tests
1818
{
1919
private $contextNode;
2020

21-
private $codeMap = [
22-
-1 => 'UNKNOWN', // PHPUnit_Runner_BaseTestRunner::STATUS_UNKNOWN
23-
0 => 'PASSED', // PHPUnit_Runner_BaseTestRunner::STATUS_PASSED
24-
1 => 'SKIPPED', // PHPUnit_Runner_BaseTestRunner::STATUS_SKIPPED
25-
2 => 'INCOMPLETE', // PHPUnit_Runner_BaseTestRunner::STATUS_INCOMPLETE
26-
3 => 'FAILURE', // PHPUnit_Runner_BaseTestRunner::STATUS_FAILURE
27-
4 => 'ERROR', // PHPUnit_Runner_BaseTestRunner::STATUS_ERROR
28-
5 => 'RISKY', // PHPUnit_Runner_BaseTestRunner::STATUS_RISKY
29-
6 => 'WARNING', // PHPUnit_Runner_BaseTestRunner::STATUS_WARNING
30-
];
31-
3221
public function __construct(DOMElement $context)
3322
{
3423
$this->contextNode = $context;
@@ -45,7 +34,6 @@ public function addTest(string $test, array $result): void
4534

4635
$node->setAttribute('name', $test);
4736
$node->setAttribute('size', $result['size']);
48-
$node->setAttribute('result', (string) $result['status']);
49-
$node->setAttribute('status', $this->codeMap[(int) $result['status']]);
37+
$node->setAttribute('status', $result['status']);
5038
}
5139
}

‎tests/_files/Report/XML/CoverageForBankAccount/index.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
</build>
77
<project source="%s">
88
<tests>
9-
<test name="BankAccountTest::testBalanceIsInitiallyZero" size="unknown" result="-1" status="UNKNOWN"/>
10-
<test name="BankAccountTest::testBalanceCannotBecomeNegative" size="unknown" result="-1" status="UNKNOWN"/>
11-
<test name="BankAccountTest::testBalanceCannotBecomeNegative2" size="unknown" result="-1" status="UNKNOWN"/>
12-
<test name="BankAccountTest::testDepositWithdrawMoney" size="unknown" result="-1" status="UNKNOWN"/>
9+
<test name="BankAccountTest::testBalanceIsInitiallyZero" size="unknown" status="unknown"/>
10+
<test name="BankAccountTest::testBalanceCannotBecomeNegative" size="unknown" status="unknown"/>
11+
<test name="BankAccountTest::testBalanceCannotBecomeNegative2" size="unknown" status="unknown"/>
12+
<test name="BankAccountTest::testDepositWithdrawMoney" size="unknown" status="unknown"/>
1313
</tests>
1414
<directory name="%s">
1515
<totals>

‎tests/_files/Report/XML/CoverageForClassWithAnonymousFunction/index.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</build>
77
<project source="%s">
88
<tests>
9-
<test name="ClassWithAnonymousFunction" size="unknown" result="-1" status="UNKNOWN"/>
9+
<test name="ClassWithAnonymousFunction" size="unknown" status="unknown"/>
1010
</tests>
1111
<directory name="%s">
1212
<totals>

‎tests/_files/Report/XML/CoverageForFileWithIgnoredLines/index.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</build>
77
<project source="%s">
88
<tests>
9-
<test name="FileWithIgnoredLines" size="unknown" result="-1" status="UNKNOWN"/>
9+
<test name="FileWithIgnoredLines" size="unknown" status="unknown"/>
1010
</tests>
1111
<directory name="%s">
1212
<totals>

‎tests/tests/CodeCoverageTest.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ public function testCollect(): void
6464

6565
$this->assertEquals(
6666
[
67-
'BankAccountTest::testBalanceIsInitiallyZero' => ['size' => 'unknown', 'status' => -1, 'fromTestcase' => true],
68-
'BankAccountTest::testBalanceCannotBecomeNegative' => ['size' => 'unknown', 'status' => -1, 'fromTestcase' => true],
69-
'BankAccountTest::testBalanceCannotBecomeNegative2' => ['size' => 'unknown', 'status' => -1, 'fromTestcase' => true],
70-
'BankAccountTest::testDepositWithdrawMoney' => ['size' => 'unknown', 'status' => -1, 'fromTestcase' => true],
67+
'BankAccountTest::testBalanceIsInitiallyZero' => ['size' => 'unknown', 'status' => 'unknown', 'fromTestcase' => true],
68+
'BankAccountTest::testBalanceCannotBecomeNegative' => ['size' => 'unknown', 'status' => 'unknown', 'fromTestcase' => true],
69+
'BankAccountTest::testBalanceCannotBecomeNegative2' => ['size' => 'unknown', 'status' => 'unknown', 'fromTestcase' => true],
70+
'BankAccountTest::testDepositWithdrawMoney' => ['size' => 'unknown', 'status' => 'unknown', 'fromTestcase' => true],
7171
],
7272
$coverage->getTests()
7373
);

0 commit comments

Comments
 (0)