Skip to content

Commit 4bc19d0

Browse files
Maks3wMaks3w
committed
XML report
1 parent 5e87574 commit 4bc19d0

File tree

9 files changed

+51
-12
lines changed

9 files changed

+51
-12
lines changed

‎src/CodeCoverage/Report/XML.php

+9-2
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,9 @@ private function processUnit($unit, PHP_CodeCoverage_Report_XML_File_Report $rep
173173
$methodObject->setTotals(
174174
$method['executableLines'],
175175
$method['executedLines'],
176-
$method['coverage']
176+
$method['coverage'],
177+
$method['executablePaths'],
178+
$method['executedPaths']
177179
);
178180
}
179181
}
@@ -185,7 +187,7 @@ private function processFunction($function, PHP_CodeCoverage_Report_XML_File_Rep
185187
$functionObject->setSignature($function['signature']);
186188
$functionObject->setLines($function['startLine']);
187189
$functionObject->setCrap($function['crap']);
188-
$functionObject->setTotals($function['executableLines'], $function['executedLines'], $function['coverage']);
190+
$functionObject->setTotals($function['executableLines'], $function['executedLines'], $function['coverage'], $function['executablePaths'], $function['executedPaths']);
189191
}
190192

191193
private function processTests(array $tests)
@@ -218,6 +220,11 @@ private function setTotals(PHP_CodeCoverage_Report_Node $node, PHP_CodeCoverage_
218220
$node->getNumTestedClasses()
219221
);
220222

223+
$totals->setNumPaths(
224+
$node->getNumExecutablePaths(),
225+
$node->getNumExecutedPaths()
226+
);
227+
221228
$totals->setNumTraits(
222229
$node->getNumTraits(),
223230
$node->getNumTestedTraits()

‎src/CodeCoverage/Report/XML/File/Method.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@ public function setLines($start, $end = null)
4444
}
4545
}
4646

47-
public function setTotals($executable, $executed, $coverage)
47+
public function setTotals($executable, $executed, $coverage, $executablePaths, $executedPaths)
4848
{
4949
$this->contextNode->setAttribute('executable', $executable);
5050
$this->contextNode->setAttribute('executed', $executed);
5151
$this->contextNode->setAttribute('coverage', $coverage);
52+
$this->contextNode->setAttribute('executablePaths', $executablePaths);
53+
$this->contextNode->setAttribute('executedPaths', $executedPaths);
5254
}
5355

5456
public function setCrap($crap)

‎src/CodeCoverage/Report/XML/Totals.php

+21
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ class PHP_CodeCoverage_Report_XML_Totals
2323
*/
2424
private $linesNode;
2525

26+
/**
27+
* @var DOMElement
28+
*/
29+
private $pathsNode;
30+
2631
/**
2732
* @var DOMElement
2833
*/
@@ -53,6 +58,11 @@ public function __construct(DOMElement $container)
5358
'lines'
5459
);
5560

61+
$this->pathsNode = $dom->createElementNS(
62+
'http://schema.phpunit.de/coverage/1.0',
63+
'paths'
64+
);
65+
5666
$this->methodsNode = $dom->createElementNS(
5767
'http://schema.phpunit.de/coverage/1.0',
5868
'methods'
@@ -74,6 +84,7 @@ public function __construct(DOMElement $container)
7484
);
7585

7686
$container->appendChild($this->linesNode);
87+
$container->appendChild($this->pathsNode);
7788
$container->appendChild($this->methodsNode);
7889
$container->appendChild($this->functionsNode);
7990
$container->appendChild($this->classesNode);
@@ -98,6 +109,16 @@ public function setNumLines($loc, $cloc, $ncloc, $executable, $executed)
98109
);
99110
}
100111

112+
public function setNumPaths($count, $tested)
113+
{
114+
$this->pathsNode->setAttribute('count', $count);
115+
$this->pathsNode->setAttribute('tested', $tested);
116+
$this->pathsNode->setAttribute(
117+
'percent',
118+
PHP_CodeCoverage_Util::percent($tested, $count, true)
119+
);
120+
}
121+
101122
public function setNumClasses($count, $tested)
102123
{
103124
$this->classesNode->setAttribute('count', $count);

‎tests/_files/Report/XML/CoverageForBankAccount/BankAccount.php.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<file name="BankAccount.php">
44
<totals>
55
<lines total="33" comments="0" code="33" executable="10" executed="5" percent="50.00%"/>
6+
<paths count="5" tested="1" percent="20.00%"/>
67
<methods count="4" tested="3" percent="75.00%"/>
78
<functions count="0" tested="0" percent=""/>
89
<classes count="1" tested="0" percent="0.00%"/>
@@ -11,10 +12,10 @@
1112
<class name="BankAccount" start="2" executable="10" executed="5" crap="8.12">
1213
<package full="" name="" sub="" category=""/>
1314
<namespace name=""/>
14-
<method name="getBalance" signature="getBalance()" start="6" end="9" crap="1" executable="1" executed="1" coverage="100"/>
15-
<method name="setBalance" signature="setBalance($balance)" start="11" end="18" crap="6" executable="5" executed="0" coverage="0"/>
16-
<method name="depositMoney" signature="depositMoney($balance)" start="20" end="25" crap="1" executable="2" executed="2" coverage="100"/>
17-
<method name="withdrawMoney" signature="withdrawMoney($balance)" start="27" end="32" crap="1" executable="2" executed="2" coverage="100"/>
15+
<method name="getBalance" signature="getBalance()" start="6" end="9" crap="1" executable="1" executed="1" coverage="100" executablePaths="1" executedPaths="1"/>
16+
<method name="setBalance" signature="setBalance($balance)" start="11" end="18" crap="6" executable="5" executed="0" coverage="0" executablePaths="2" executedPaths="0"/>
17+
<method name="depositMoney" signature="depositMoney($balance)" start="20" end="25" crap="1" executable="2" executed="2" coverage="100" executablePaths="1" executedPaths="0"/>
18+
<method name="withdrawMoney" signature="withdrawMoney($balance)" start="27" end="32" crap="1" executable="2" executed="2" coverage="100" executablePaths="1" executedPaths="0"/>
1819
</class>
1920
<coverage>
2021
<line nr="8">

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

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<directory name="%s">
1111
<totals>
1212
<lines total="33" comments="0" code="33" executable="10" executed="5" percent="50.00%"/>
13+
<paths count="5" tested="1" percent="20.00%"/>
1314
<methods count="4" tested="3" percent="75.00%"/>
1415
<functions count="0" tested="0" percent=""/>
1516
<classes count="1" tested="0" percent="0.00%"/>
@@ -18,6 +19,7 @@
1819
<file name="BankAccount.php" href="BankAccount.php.xml">
1920
<totals>
2021
<lines total="33" comments="0" code="33" executable="10" executed="5" percent="50.00%"/>
22+
<paths count="5" tested="1" percent="20.00%"/>
2123
<methods count="4" tested="3" percent="75.00%"/>
2224
<functions count="0" tested="0" percent=""/>
2325
<classes count="1" tested="0" percent="0.00%"/>

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

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<directory name="%s">
88
<totals>
99
<lines total="19" comments="2" code="17" executable="8" executed="7" percent="87.50%"/>
10+
<paths count="1" tested="0" percent="0.00%"/>
1011
<methods count="2" tested="1" percent="50.00%"/>
1112
<functions count="0" tested="0" percent=""/>
1213
<classes count="1" tested="0" percent="0.00%"/>
@@ -15,6 +16,7 @@
1516
<file name="source_with_class_and_anonymous_function.php" href="source_with_class_and_anonymous_function.php.xml">
1617
<totals>
1718
<lines total="19" comments="2" code="17" executable="8" executed="7" percent="87.50%"/>
19+
<paths count="1" tested="0" percent="0.00%"/>
1820
<methods count="2" tested="1" percent="50.00%"/>
1921
<functions count="0" tested="0" percent=""/>
2022
<classes count="1" tested="0" percent="0.00%"/>

‎tests/_files/Report/XML/CoverageForClassWithAnonymousFunction/source_with_class_and_anonymous_function.php.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<file name="source_with_class_and_anonymous_function.php">
44
<totals>
55
<lines total="19" comments="2" code="17" executable="8" executed="7" percent="87.50%"/>
6+
<paths count="1" tested="0" percent="0.00%"/>
67
<methods count="2" tested="1" percent="50.00%"/>
78
<functions count="0" tested="0" percent=""/>
89
<classes count="1" tested="0" percent="0.00%"/>
@@ -11,8 +12,8 @@
1112
<class name="CoveredClassWithAnonymousFunctionInStaticMethod" start="3" executable="8" executed="7" crap="2.01">
1213
<package full="" name="" sub="" category=""/>
1314
<namespace name=""/>
14-
<method name="runAnonymous" signature="runAnonymous()" start="5" end="18" crap="1.04" executable="3" executed="2" coverage="66.666666666667"/>
15-
<method name="anonymous function" signature="anonymous function (&amp;$val, $key)" start="11" end="13" crap="1" executable="2" executed="2" coverage="100"/>
15+
<method name="runAnonymous" signature="runAnonymous()" start="5" end="18" crap="1.04" executable="3" executed="2" coverage="66.666666666667" executablePaths="1" executedPaths="0"/>
16+
<method name="anonymous function" signature="anonymous function (&amp;$val, $key)" start="11" end="13" crap="1" executable="2" executed="2" coverage="100" executablePaths="0" executedPaths="0"/>
1617
</class>
1718
<coverage>
1819
<line nr="7">

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

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<directory name="%s">
88
<totals>
99
<lines total="37" comments="12" code="25" executable="2" executed="1" percent="50.00%"/>
10+
<paths count="3" tested="0" percent="0.00%"/>
1011
<methods count="0" tested="0" percent=""/>
1112
<functions count="1" tested="0" percent="0.00%"/>
1213
<classes count="2" tested="2" percent="100.00%"/>
@@ -15,6 +16,7 @@
1516
<file name="source_with_ignore.php" href="source_with_ignore.php.xml">
1617
<totals>
1718
<lines total="37" comments="12" code="25" executable="2" executed="1" percent="50.00%"/>
19+
<paths count="3" tested="0" percent="0.00%"/>
1820
<methods count="0" tested="0" percent=""/>
1921
<functions count="1" tested="0" percent="0.00%"/>
2022
<classes count="2" tested="2" percent="100.00%"/>

‎tests/_files/Report/XML/CoverageForFileWithIgnoredLines/source_with_ignore.php.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<file name="source_with_ignore.php">
44
<totals>
55
<lines total="37" comments="12" code="25" executable="2" executed="1" percent="50.00%"/>
6+
<paths count="3" tested="0" percent="0.00%"/>
67
<methods count="0" tested="0" percent=""/>
78
<functions count="1" tested="0" percent="0.00%"/>
89
<classes count="2" tested="2" percent="100.00%"/>
@@ -11,14 +12,14 @@
1112
<class name="Foo" start="11" executable="0" executed="0" crap="1">
1213
<package full="" name="" sub="" category=""/>
1314
<namespace name=""/>
14-
<method name="bar" signature="bar()" start="13" end="15" crap="1" executable="0" executed="0" coverage="100"/>
15+
<method name="bar" signature="bar()" start="13" end="15" crap="1" executable="0" executed="0" coverage="100" executablePaths="1" executedPaths="0"/>
1516
</class>
1617
<class name="Bar" start="18" executable="0" executed="0" crap="1">
1718
<package full="" name="" sub="" category=""/>
1819
<namespace name=""/>
19-
<method name="foo" signature="foo()" start="23" end="25" crap="1" executable="0" executed="0" coverage="100"/>
20+
<method name="foo" signature="foo()" start="23" end="25" crap="1" executable="0" executed="0" coverage="100" executablePaths="1" executedPaths="0"/>
2021
</class>
21-
<function name="baz" signature="baz()" start="28" crap="0" executable="0" executed="0" coverage="0"/>
22+
<function name="baz" signature="baz()" start="28" crap="0" executable="0" executed="0" coverage="0" executablePaths="1" executedPaths="0"/>
2223
<coverage>
2324
<line nr="2">
2425
<covered by="FileWithIgnoredLines"/>

0 commit comments

Comments
 (0)