Skip to content

D
doctrine-dbal
Commit 75f2364e authored by meus's avatar meus
Browse files
Options

fixing testrunner and cc report to look nicer

parent 70ff3b26
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 36 deletions
models/RelationTest.php
View file @ 75f2364e
......@@ -8,3 +8,12 @@ class RelationTest extends Doctrine_Record
}
}
class RelationTestChild extends RelationTest
{
public function setUp()
{
$this->hasOne('RelationTest as Parent', 'RelationTestChild.child_id');
$this->ownsMany('RelationTestChild as Children', 'RelationTestChild.child_id');
}
}
models/RelationTestChild.php deleted 100644 → 0
View file @ 70ff3b26
<?php
class RelationTestChild extends RelationTest
{
public function setUp()
{
$this->hasOne('RelationTest as Parent', 'RelationTestChild.child_id');
$this->ownsMany('RelationTestChild as Children', 'RelationTestChild.child_id');
}
}
tests/cc.php
View file @ 75f2364e
......@@ -32,28 +32,7 @@ $reporter = new Doctrine_Coverage_Report("coverage.txt");
.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>
......@@ -136,10 +115,10 @@ class Doctrine_Coverage_Report
}
$coveredLines = $this->coverage[$key];
$fileArray = file(Doctrine::getPath() . "/".$fileName);
$html .= '<dl class="table-display">' . "\n";
$html .= '<table>' . "\n";
foreach ($fileArray as $num => $line){
$linenum = $num+1;
$html .= '<dt>' . $linenum . '</dt>' . "\n";
$html .= '<tr><td>' . $linenum . '</td>' . "\n";
$class ="normal";
if (isset($coveredLines[$linenum]) && $coveredLines[$linenum] == 1){
$class = "covered";
......@@ -148,9 +127,11 @@ class Doctrine_Coverage_Report
} else if (isset($coveredLines[$linenum]) && $coveredLines[$linenum] == -2) {
$class ="orange";
}
$html .= '<dd class="' . $class . '">' . htmlspecialchars($line) . '</dd>' . "\n";
$line = str_replace(" ", "&nbsp;", htmlspecialchars($line));
$html .= '<td class="' . $class . '">' . $line . '</td></tr>' . "\n";
}
$html .='</dl></div>';
$html .='</table></div>';
echo $html;
}
......
tests/run.php
View file @ 75f2364e
......@@ -425,7 +425,7 @@ if (PHP_SAPI === "cli") {
$argv = $_SERVER["argv"];
$coverage = false;
array_shift($argv);
if(isset($argv[1]) && $argv[1] == "coverage"){
if(isset($argv[0]) && $argv[0] == "coverage"){
array_shift($argv);
$coverage = true;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment