tmont/testify
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fixed bug where all classes were not showing up in coverage report for files with multiple classes

Browse Source 
* css updates
* minor html clean up
This commit is contained in:
tmont 2009-07-02 06:31:06 +00:00
parent 1fcbc8a8b9
commit fbf9f84520
3 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Testify/framework/reporting/CoverageReporter.php
View File

@ -28,13 +28,12 @@
'cloc' => 0 'cloc' => 0
) )
); );
foreach ($data as $line => $unitsCovered) { foreach ($data as $line => $unitsCovered) {
$loc = 1; $loc = 1;
$dloc = ($unitsCovered === self::DEAD) ? 1 : 0; $dloc = ($unitsCovered === self::DEAD) ? 1 : 0;
$cloc = ($unitsCovered > 0) ? 1 : 0; $cloc = ($unitsCovered > 0) ? 1 : 0;
//find the class this line resides in, if any //find the class this line resides in, if any
$class = null; $class = null;
foreach ($refClasses as $refClass) { foreach ($refClasses as $refClass) {
@ -109,7 +108,7 @@
fwrite(STDOUT, "Totals:\n"); fwrite(STDOUT, "Totals:\n");
fwrite(STDOUT, " Covered: $totcloc\n"); fwrite(STDOUT, " Covered: $totcloc\n");
fwrite(STDOUT, " Dead: $totdloc\n"); fwrite(STDOUT, " Dead: $totdloc\n");
fwrite(STDOUT, " Executable: " . ($totloc - $totdloc) . " (" . round($totcloc / ($totloc - $dloc) * 100, 2) . "%)\n"); fwrite(STDOUT, " Executable: " . ($totloc - $totdloc) . " (" . round($totcloc / ($totloc - $totdloc) * 100, 2) . "%)\n");
} }
public static function createHtmlReport($coverageDir, array $coverageData, $renderer = null) { public static function createHtmlReport($coverageDir, array $coverageData, $renderer = null) {
@ -150,14 +149,13 @@
private static function writeHtmlFile($sourceFile, $baseDir, $coverageDir, array $classData, array $coverageData, $renderer) { private static function writeHtmlFile($sourceFile, $baseDir, $coverageDir, array $classData, array $coverageData, $renderer) {
//summary view //summary view
$fileCoverage = ''; $fileCoverage = '';
$classCoverage = ''; $classCoverage = '';
$tloc = 0; $tloc = 0;
$tdloc = 0; $tdloc = 0;
$tcloc = 0; $tcloc = 0;
foreach ($classData['classes'] as $class => $methods) { foreach ($classData['classes'] as $class => $methods) {
$classCoverage = '';
$classLoc = 0; $classLoc = 0;
$classDloc = 0; $classDloc = 0;
$classCloc = 0; $classCloc = 0;
@ -177,7 +175,7 @@
$percentageData = self::getPercentage($methodData['cloc'], $methodData['loc'] - $methodData['dloc']); $percentageData = self::getPercentage($methodData['cloc'], $methodData['loc'] - $methodData['dloc']);
$methodCoverage .= "<tr class=\"method-coverage\"><th>&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"#line-$methodStartLine\">$methodDeclaration</a></th>"; $methodCoverage .= "<tr class=\"coverage-method\"><th>&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"#line-$methodStartLine\" title=\"$class::$method() (line $methodStartLine)\">$methodDeclaration</a></th>";
$methodCoverage .= "<td class=\"coverage-ratio\" style=\"background-color: $percentageData[1]\">$methodData[cloc] / " . ($methodData['loc'] - $methodData['dloc']) . "</td>"; $methodCoverage .= "<td class=\"coverage-ratio\" style=\"background-color: $percentageData[1]\">$methodData[cloc] / " . ($methodData['loc'] - $methodData['dloc']) . "</td>";
$methodCoverage .= "<td class=\"coverage-percentage\" style=\"background-color: $percentageData[1]\">$percentageData[0]%</td></tr>\n"; $methodCoverage .= "<td class=\"coverage-percentage\" style=\"background-color: $percentageData[1]\">$percentageData[0]%</td></tr>\n";
if ($renderer !== null) { if ($renderer !== null) {
@ -191,7 +189,7 @@
$classStartLine = $refClass->getStartLine(); $classStartLine = $refClass->getStartLine();
$percentageData = self::getPercentage($classCloc, $classLoc - $classDloc); $percentageData = self::getPercentage($classCloc, $classLoc - $classDloc);
$classCoverage .= "<tr class=\"class-coverage\"><th>&nbsp;&nbsp;<a href=\"#line-$classStartLine\">$class</a></th>"; $classCoverage .= "<tr class=\"coverage-class\"><th>&nbsp;&nbsp;<a href=\"#line-$classStartLine\" title=\"$class (line $classStartLine)\">$class</a></th>";
$classCoverage .= "<td class=\"coverage-ratio\" style=\"background-color: $percentageData[1]\">$classCloc / " . ($classLoc - $classDloc) . "</td>"; $classCoverage .= "<td class=\"coverage-ratio\" style=\"background-color: $percentageData[1]\">$classCloc / " . ($classLoc - $classDloc) . "</td>";
$classCoverage .= "<td class=\"coverage-percentage\" style=\"background-color: $percentageData[1]\">$percentageData[0]%</td></tr>\n"; $classCoverage .= "<td class=\"coverage-percentage\" style=\"background-color: $percentageData[1]\">$percentageData[0]%</td></tr>\n";
if ($renderer !== null) { if ($renderer !== null) {
@ -200,12 +198,12 @@
$classCoverage .= $methodCoverage; $classCoverage .= $methodCoverage;
} }
$tloc += $classData['procedural']['loc']; $tloc += $classData['procedural']['loc'];
$tdloc += $classData['procedural']['dloc']; $tdloc += $classData['procedural']['dloc'];
$tcloc += $classData['procedural']['cloc']; $tcloc += $classData['procedural']['cloc'];
$percentageData = self::getPercentage($tcloc, $tloc - $tdloc); $percentageData = self::getPercentage($tcloc, $tloc - $tdloc);
$fileCoverage = "<tr class=\"file-coverage\"><th>$sourceFile</th>"; $fileCoverage = "<tr class=\"coverage-file\"><th>$sourceFile</th>";
$fileCoverage .= "<td class=\"coverage-percentage\" style=\"background-color: $percentageData[1]\">$tcloc / " . ($tloc - $tdloc) . "</td>"; $fileCoverage .= "<td class=\"coverage-percentage\" style=\"background-color: $percentageData[1]\">$tcloc / " . ($tloc - $tdloc) . "</td>";
$fileCoverage .= "<td class=\"coverage-ratio\" style=\"background-color: $percentageData[1]\">$percentageData[0]%</td></tr>\n"; $fileCoverage .= "<td class=\"coverage-ratio\" style=\"background-color: $percentageData[1]\">$percentageData[0]%</td></tr>\n";
if ($renderer !== null) { if ($renderer !== null) {
@ -220,7 +218,7 @@
$lineNumbers = ''; $lineNumbers = '';
for ($i = 1, $len = count($lines); $i <= $len; $i++) { for ($i = 1, $len = count($lines); $i <= $len; $i++) {
$lineNumbers .= '<div><a name="line-' . $i . '" href="#line-' . $i . '">' . $i . '</a></div>'; $lineNumbers .= '<div><a name="line-' . $i . '" href="#line-' . $i . '">' . $i . '</a></div>' . "\n";
$code .= '<div'; $code .= '<div';
if (isset($coverageData[$i])) { if (isset($coverageData[$i])) {
$code .= ' class="'; $code .= ' class="';

14
src/Testify/framework/reporting/template/style.css
View File

@ -88,6 +88,20 @@ thead th {
color: #000000; color: #000000;
} }
.coverage-file {
background-color: #FFFFFF;
border-bottom: 3px solid #000000;
}
.coverage-class {
background-color: #EEEEEE;
border-bottom: 2px solid #000000;
}
.coverage-method {
background-color: #DDDDDD;
}
.coverage-method a {
color: #996699;
}
.coverage-graph td { .coverage-graph td {
text-align: center; text-align: center;
} }

2
src/Testify/util/Util.php
View File

@ -84,7 +84,7 @@
$paramList .= '&'; $paramList .= '&';
} }
$paramList .= self::repairParameterName($param->getName(), $i); $paramList .= '$' . self::repairParameterName($param->getName(), $i);
if ($param->isOptional()) { if ($param->isOptional()) {
$paramList .= ' = '; $paramList .= ' = ';