diff --git a/cake/tests/lib/coverage/html_coverage_report.php b/cake/tests/lib/coverage/html_coverage_report.php
index e4440b995e2..6122acd3d2b 100644
--- a/cake/tests/lib/coverage/html_coverage_report.php
+++ b/cake/tests/lib/coverage/html_coverage_report.php
@@ -120,7 +120,7 @@ public function getPathFilter() {
public function filterCoverageDataByPath($path) {
$files = array();
foreach ($this->_rawCoverage as $testRun) {
- foreach ($testRun['files'] as $filename => $fileCoverage) {
+ foreach ($testRun['data'] as $filename => $fileCoverage) {
if (strpos($filename, $path) !== 0) {
continue;
}
@@ -136,6 +136,7 @@ public function filterCoverageDataByPath($path) {
}
}
}
+ ksort($files);
return $files;
}
@@ -214,7 +215,7 @@ function generateDiff($filename, $fileLines, $coverageData) {
$diff[] = $this->_paintLine($line, $lineno, $class);
}
- $percentCovered = round($covered / $total, 2);
+ $percentCovered = round(100 * $covered / $total, 2);
$output .= $this->coverageHeader($filename, $percentCovered);
$output .= implode("", $diff);
@@ -243,6 +244,7 @@ protected function _paintLine($line, $linenumber, $class) {
* @return void
*/
public function coverageHeader($filename, $percent) {
+ $filename = basename($filename);
return <<$filename Code coverage: $percent%
diff --git a/cake/tests/lib/reporter/cake_html_reporter.php b/cake/tests/lib/reporter/cake_html_reporter.php
index 3c4d335482b..d36ea0d0661 100755
--- a/cake/tests/lib/reporter/cake_html_reporter.php
+++ b/cake/tests/lib/reporter/cake_html_reporter.php
@@ -176,7 +176,7 @@ public function paintFooter($result) {
echo $this->_paintLinks();
echo '
';
if (isset($this->params['codeCoverage']) && $this->params['codeCoverage']) {
- $coverage = $result->getCodeCoverageInformation();
+ $coverage = $result->getRawCodeCoverageInformation();
echo $this->paintCoverage($coverage);
}
$this->paintDocumentEnd();
diff --git a/cake/tests/lib/test_manager.php b/cake/tests/lib/test_manager.php
index 67e35bc61e9..bef97780805 100644
--- a/cake/tests/lib/test_manager.php
+++ b/cake/tests/lib/test_manager.php
@@ -162,7 +162,7 @@ public function runGroupTest($groupTestName, $reporter, $codeCoverage = false) {
*/
protected function run($reporter, $codeCoverage = false) {
$result = new PHPUnit_Framework_TestResult;
- $result->collectCodeCoverageInformation($codeCoverage);
+ $result->collectRawCodeCoverageInformation($codeCoverage);
$result->addListener($reporter);
$reporter->paintHeader();
$this->getTestSuite()->run($result);