fixed cc.php to show coverage report and cleaned up code somewhat
This commit is contained in:
meus
parent
e9eaa2a9f1
commit
f50bb705fe
266
tests/cc.php
266
tests/cc.php
@ -1,108 +1,190 @@
|
|||||||
<?php
|
<?php
|
||||||
// include doctrine, and register it's autoloader
|
|
||||||
require_once dirname(__FILE__) . '/../lib/Doctrine.php';
|
require_once dirname(__FILE__) . '/../lib/Doctrine.php';
|
||||||
spl_autoload_register(array('Doctrine', 'autoload'));
|
spl_autoload_register(array('Doctrine', 'autoload'));
|
||||||
|
|
||||||
$result = unserialize(file_get_contents("coverage.txt"));
|
$reporter = new Doctrine_Coverage_Report("coverage.txt");
|
||||||
$path = $result["path"];
|
?>
|
||||||
$coverage = $result["coverage"];
|
<html>
|
||||||
|
<head>
|
||||||
|
<style type="text/css">
|
||||||
|
.covered{ background: green;}
|
||||||
|
.normal{ background: white;}
|
||||||
|
.red{ background: red;}
|
||||||
|
.orange{ background: #f90;}
|
||||||
|
|
||||||
$key ="percentage";
|
dl.table-display
|
||||||
if(isset($_GET["order"])){
|
{
|
||||||
$key = $_GET["order"];
|
margin: 2em 0;
|
||||||
}
|
padding: 0;
|
||||||
$totallines = 0;
|
font-family: georgia, times, serif;
|
||||||
$totalcovered = 0;
|
}
|
||||||
$totalmaybe = 0;
|
|
||||||
$totalnotcovered = 0;
|
|
||||||
|
|
||||||
$coveredArray = array();
|
.table-display dt
|
||||||
foreach ($coverage as $file => $lines) {
|
{
|
||||||
$pos = strpos($file, $path);
|
float: left;
|
||||||
if($pos === false && $pos !== 0){
|
margin: 0 0 0 0;
|
||||||
continue;
|
padding: 0 .5em 0 .5em;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* commented backslash hack for mac-ie5 \*/
|
||||||
|
dt { clear: both; }
|
||||||
|
/* end hack */
|
||||||
|
|
||||||
|
.table-display dd{
|
||||||
|
float: left;
|
||||||
|
margin: 0 0 0 0;
|
||||||
}
|
}
|
||||||
|
</style>
|
||||||
$class = str_replace(DIRECTORY_SEPARATOR, '_', substr($file, strlen($path), -4));
|
</head>
|
||||||
$class = str_replace($path, Doctrine::getPath(), $class);
|
<body>
|
||||||
|
<?php
|
||||||
if (strpos($class, '_Interface')) {
|
|
||||||
continue;
|
if(isset($_GET["file"])){
|
||||||
}
|
echo '<h1>Coverage for ' . $_GET["file"] . '</h1>';
|
||||||
|
echo '<a href="cc.php">Back to coverage report</a>';
|
||||||
if(!class_exists($class)){
|
$reporter->showFile($_GET["file"]);
|
||||||
continue;
|
}else{
|
||||||
|
?>
|
||||||
|
<h1>Coverage report for Doctrine</h1>
|
||||||
|
<p>Default mode shows results sorted by perentage. This can be changed with order = covered|total|maybe|notcovered|percentage and desc=true GET variables</p>
|
||||||
|
<table>
|
||||||
|
<tr><th></th><th>Percentage</th><th>Total</th><th>Covered</th><th>Maybe</th><th>Not Covered</th><th></th></tr>
|
||||||
|
<?php
|
||||||
|
$reporter->showSummary();
|
||||||
|
echo "</table>";
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/*
|
||||||
|
*
|
||||||
|
* This class is a mess right now. Will clean it up later perhaps. If we do not
|
||||||
|
* change to simpletest..
|
||||||
|
*/
|
||||||
|
class Doctrine_Coverage_Report
|
||||||
|
{
|
||||||
|
|
||||||
|
private $path;
|
||||||
|
private $coverage;
|
||||||
|
private $key;
|
||||||
|
private $covered;
|
||||||
|
|
||||||
|
public function __construct($file)
|
||||||
|
{
|
||||||
|
$result = unserialize(file_get_contents("coverage.txt"));
|
||||||
|
$this->path = $result["path"];
|
||||||
|
$this->coverage = $result["coverage"];
|
||||||
|
|
||||||
|
$this->sortBy ="percentage"; // default sort
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function showFile($fileName)
|
||||||
|
{
|
||||||
|
$key = $this->path . $fileName;
|
||||||
|
$html = '<div id="coverage">';
|
||||||
|
if( !isset( $this->coverage[$key]))
|
||||||
|
{
|
||||||
|
echo 'No coverage for this file</div>';
|
||||||
|
}
|
||||||
|
$coveredLines = $this->coverage[$key];
|
||||||
|
$fileArray = file(Doctrine::getPath() . "/".$fileName);
|
||||||
|
$html .= '<dl class="table-display">' . "\n";
|
||||||
|
foreach( $fileArray as $num => $line){
|
||||||
|
$linenum = $num+1;
|
||||||
|
$html .= '<dt>' . $linenum . '</dt>' . "\n";
|
||||||
|
$class ="normal";
|
||||||
|
if( isset($coveredLines[$linenum]) && $coveredLines[$linenum] == 1){
|
||||||
|
$class = "covered";
|
||||||
|
}else if( isset($coveredLines[$linenum]) && $coveredLines[$linenum] == -1){
|
||||||
|
$class ="red";
|
||||||
|
}else if( isset($coveredLines[$linenum]) && $coveredLines[$linenum] == -2){
|
||||||
|
$class ="orange";
|
||||||
|
}
|
||||||
|
$html .= '<dd class="' . $class . '">' . htmlspecialchars($line) . '</dd>' . "\n";
|
||||||
|
}
|
||||||
|
$html .='</dl></div>';
|
||||||
|
echo $html;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function showSummary()
|
||||||
|
{
|
||||||
|
if(isset($_GET["order"])){
|
||||||
|
$this->sortBy = $_GET["order"];
|
||||||
|
}
|
||||||
|
$totallines = 0;
|
||||||
|
$totalcovered = 0;
|
||||||
|
$totalmaybe = 0;
|
||||||
|
$totalnotcovered = 0;
|
||||||
|
|
||||||
|
$coveredArray = array();
|
||||||
|
foreach ($this->coverage as $file => $lines) {
|
||||||
|
$pos = strpos($file, $this->path);
|
||||||
|
if($pos === false && $pos !== 0){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$class = str_replace(DIRECTORY_SEPARATOR, '_', substr($file, strlen($this->path), -4));
|
||||||
|
$class = str_replace($this->path, Doctrine::getPath(), $class);
|
||||||
|
if (strpos($class, '_Interface')) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!class_exists($class)){
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$total = count($lines) -1; //we have to remove one since it always reports the last line as a hit
|
||||||
|
$covered = 0;
|
||||||
|
$maybe = 0;
|
||||||
|
$notcovered = 0;
|
||||||
|
foreach($lines as $result){
|
||||||
|
switch($result){
|
||||||
|
case "1":
|
||||||
|
$covered++;
|
||||||
|
break;
|
||||||
|
case "-1":
|
||||||
|
$notcovered++;
|
||||||
|
break;
|
||||||
|
case "-2":
|
||||||
|
$maybe++;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$covered--; //again we have to remove that last line.
|
||||||
|
$totallines += $total;
|
||||||
|
$totalcovered += $covered;
|
||||||
|
$totalnotcovered += $notcovered;
|
||||||
|
$totalmaybe += $maybe;
|
||||||
|
|
||||||
|
if ($total === 0) {
|
||||||
|
$total = 1;
|
||||||
|
}
|
||||||
|
$percentage = round((($covered + $maybe) / $total) * 100, 2);
|
||||||
|
$coveredArray[$class] = array("covered" => $covered, "maybe" => $maybe, "notcovered"=>$notcovered, "total" => $total, "percentage" => $percentage);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
$total = count($lines) -1; //we have to remove one since it always reports the last line as a hit
|
//lets sort it
|
||||||
$covered = 0;
|
uasort($coveredArray, array($this,"sortArray"));
|
||||||
$maybe = 0;
|
if(isset($_GET["desc"]) && $_GET["desc"] == "true"){
|
||||||
$notcovered = 0;
|
$coveredArray = array_reverse($coveredArray, true);
|
||||||
foreach($lines as $result){
|
}
|
||||||
switch($result){
|
echo "<tr><td>" . TOTAL . "</td><td>" . round((($totalcovered + $totalmaybe) / $totallines) * 100, 2) . " % </td><td>$totallines</td><td>$totalcovered</td><td>$totalmaybe</td><td>$totaldead</td><td></td></tr>";
|
||||||
case "1":
|
foreach($coveredArray as $class => $info){
|
||||||
$covered++;
|
$fileName = str_replace("_", "/", $class) . ".php";
|
||||||
break;
|
echo "<tr><td>" . $class . "</td><td>" . $info["percentage"] . " % </td><td>" . $info["total"] . "</td><td>" . $info["covered"] . "</td><td>" . $info["maybe"] . "</td><td>" . $info["notcovered"]. "</td><td><a href=\"cc.php?file=" . $fileName . "\">coverage</a></td></tr>";
|
||||||
case "-1":
|
|
||||||
$notcovered++;
|
|
||||||
break;
|
|
||||||
case "-2":
|
|
||||||
$maybe++;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$covered--; //again we have to remove that last line.
|
|
||||||
$totallines += $total;
|
|
||||||
$totalcovered += $covered;
|
|
||||||
$totalnotcovered += $notcovered;
|
|
||||||
$totalmaybe += $maybe;
|
|
||||||
|
|
||||||
if ($total === 0) {
|
public function sortArray($a, $b)
|
||||||
$total = 1;
|
{
|
||||||
}
|
if ($a[$this->sortBy] == $b[$this->sortBy]) {
|
||||||
$percentage = round((($covered + $maybe) / $total) * 100, 2);
|
return 0;
|
||||||
$coveredArray[$class] = array("covered" => $covered, "maybe" => $maybe, "notcovered"=>$notcovered, "total" => $total, "percentage" => $percentage);
|
}
|
||||||
}
|
return ($a[$this->sortBy] < $b[$this->sortBy]) ? -1 : 1;
|
||||||
|
|
||||||
|
|
||||||
//lets sort it
|
|
||||||
uasort($coveredArray, "sortArray");
|
|
||||||
if(isset($_GET["desc"]) && $_GET["desc"] == "true"){
|
|
||||||
$coveredArray = array_reverse($coveredArray, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
?>
|
|
||||||
<h1>Coverage report for Doctrine</h1>
|
|
||||||
<p>Default mode shows results sorted by perentage. This can be changed with order = covered|total|maybe|notcovered|percentage and desc=true GET variables</p>
|
|
||||||
<?php
|
|
||||||
echo "<table>";
|
|
||||||
echo "<tr><th></th><th>Percentage</th><th>Total</th><th>Covered</th><th>Maybe</th><th>Not Covered</th><th></th></tr>";
|
|
||||||
print "<tr><td>" . TOTAL . "</td><td>" . round((($totalcovered + $totalmaybe) / $totallines) * 100, 2) . " % </td><td>$totallines</td><td>$totalcovered</td><td>$totalmaybe</td><td>$totaldead</td><td></td></tr>";
|
|
||||||
foreach($coveredArray as $class => $info){
|
|
||||||
print "<tr><td>" . $class . "</td><td>" . $info["percentage"] . " % </td><td>" . $info["total"] . "</td><td>" . $info["covered"] . "</td><td>" . $info["maybe"] . "</td><td>" . $info["notcovered"]. "</td><td>" . printLink($class) . "</td></tr>";
|
|
||||||
}
|
|
||||||
print "</table>";
|
|
||||||
|
|
||||||
function sortArray($a, $b){
|
|
||||||
global $key;
|
|
||||||
if ($a[$key] == $b[$key]) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return ($a[$key] < $b[$key]) ? -1 : 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
function printLink($className){
|
|
||||||
global $path;
|
|
||||||
$className = str_replace("_", "/", $className) . ".php";
|
|
||||||
return '<a href="coverage.php?file=' . $path . $className . '">coverage</a>';
|
|
||||||
}
|
|
||||||
|
|
||||||
function countCovered($value, $key){
|
|
||||||
global $covered;
|
|
||||||
if($value >= 1){
|
|
||||||
$covered++;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,91 +0,0 @@
|
|||||||
<?php
|
|
||||||
// include doctrine, and register it's autoloader
|
|
||||||
require_once dirname(__FILE__) . '/../lib/Doctrine.php';
|
|
||||||
spl_autoload_register(array('Doctrine', 'autoload'));
|
|
||||||
|
|
||||||
?>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<style type="text/css">
|
|
||||||
.covered{ background: green;}
|
|
||||||
.normal{ background: white;}
|
|
||||||
.red{ background: red;}
|
|
||||||
.orange{ background: #f90;}
|
|
||||||
|
|
||||||
dl.table-display
|
|
||||||
{
|
|
||||||
margin: 2em 0;
|
|
||||||
padding: 0;
|
|
||||||
font-family: georgia, times, serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
.table-display dt
|
|
||||||
{
|
|
||||||
float: left;
|
|
||||||
margin: 0 0 0 0;
|
|
||||||
padding: 0 .5em 0 .5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* commented backslash hack for mac-ie5 \*/
|
|
||||||
dt { clear: both; }
|
|
||||||
/* end hack */
|
|
||||||
|
|
||||||
.table-display dd{
|
|
||||||
float: left;
|
|
||||||
margin: 0 0 0 0;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<?
|
|
||||||
$result = unserialize(file_get_contents("coverage.txt"));
|
|
||||||
|
|
||||||
function getCoverageReport($file){
|
|
||||||
global $result;
|
|
||||||
$coverage = $result["coverage"];
|
|
||||||
$path = $result["path"];
|
|
||||||
$html = '<div id="coverage">';
|
|
||||||
if(!isset($coverage[$file])){
|
|
||||||
$html .= 'No coverage for this file</div>';
|
|
||||||
return $html;
|
|
||||||
}
|
|
||||||
$coveredLines = $coverage[$file];
|
|
||||||
$fileArray = file(str_replace($path, Doctrine::getPath() . "/", $file));
|
|
||||||
$html .= '<dl class="table-display">' . "\n";
|
|
||||||
foreach($fileArray as $num => $line){
|
|
||||||
$linenum = $num+1;
|
|
||||||
$html .= '<dt>' . $linenum . '</dt>' . "\n";
|
|
||||||
$class ="normal";
|
|
||||||
if(isset($coveredLines[$linenum]) && $coveredLines[$linenum] == 1){
|
|
||||||
$class = "covered";
|
|
||||||
}else if(isset($coveredLines[$linenum]) && $coveredLines[$linenum] == -1){
|
|
||||||
$class ="red";
|
|
||||||
}else if(isset($coveredLines[$linenum]) && $coveredLines[$linenum] == -2){
|
|
||||||
$class ="orange";
|
|
||||||
}
|
|
||||||
$html .= '<dd class="' . $class . '">' . htmlspecialchars($line) . '</dd>' . "\n";
|
|
||||||
}
|
|
||||||
$html .='</dl></div>';
|
|
||||||
return $html;
|
|
||||||
}
|
|
||||||
|
|
||||||
if(isset($_GET["file"])){
|
|
||||||
$file = $_GET["file"];
|
|
||||||
echo '<a href="coverage.php">Back to filelist</a>';
|
|
||||||
echo '<a href="cc.php">Back to coverage report</a>';
|
|
||||||
echo '<h1>Coverage for ' . $file . '</h1>';
|
|
||||||
echo getCoverageReport($file);
|
|
||||||
|
|
||||||
}else{
|
|
||||||
echo "<ul>";
|
|
||||||
$it = new RecursiveDirectoryIterator(Doctrine::getPath());
|
|
||||||
foreach(new RecursiveIteratorIterator($it) as $file){
|
|
||||||
if(strpos($file->getPathname(), ".svn")){
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
echo '<li><a href="?file=' . $file->getPathname() . '">' . $file->getPathname() . '</a></li>';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
Loading…
Reference in New Issue
Block a user