diff --git a/tests/cc.php b/tests/cc.php
deleted file mode 100644
index 2da476dd2..000000000
--- a/tests/cc.php
+++ /dev/null
@@ -1,301 +0,0 @@
-.
- */
-
-require_once dirname(__FILE__) . '/../lib/Doctrine.php';
-spl_autoload_register(array('Doctrine', 'autoload'));
-
-$reporter = new Doctrine_Coverage_Report("coverage.txt");
-?>
-
-
-
-
-
-Coverage for ' . $_GET["file"] . '';
- echo 'Back to coverage report';
- echo "
detailed view down atm
Will be up later on
";
-
-
- // $reporter->showFile($_GET["file"]);
-} else {
-?>
- Coverage report for Doctrine
- Default mode shows results sorted by percentage. This can be changed with GET variables:
- order = covered|total|maybe|notcovered|percentage
- desc=true
-
- | Percentage | Total | Covered | Maybe | Not Covered | |
-showSummary();
- echo "
";
-}
-?>
-
-
-
-
- * @license http://www.opensource.org/licenses/lgpl-license.php LGPL
- * @category Object Relational Mapping
- * @link www.phpdoctrine.com
- * @since 1.0
- * @version $Revision: 1976 $
- */
-class Doctrine_Coverage_Report
-{
-
- const COVERED = 1;
- const MAYBE = -2;
- const NOTCOVERED = -1;
-
- private $path;
- private $coverage;
- private $key;
- private $covered;
- private $totallines = 0;
- private $totalcovered = 0;
- private $totalmaybe = 0;
- private $totalnotcovered = 0;
-
- /*
- * Create a new coverage report
- *
- * @param string $file The name of the file where coverage data is stored
- *
- */
- public function __construct($file)
- {
- $result = unserialize(file_get_contents("coverage.txt"));
- $this->path = $result["path"];
- $this->coverage = $result["coverage"];
-
- $this->sortBy ="percentage"; // default sort
- }
-
- /*
- * Show graphical coverage report for a file
- *
- * @param string $fileName The name of the file to show
- */
- public function showFile($fileName)
- {
- $key = $this->path . $fileName;
- $html = '';
- if ( ! isset( $this->coverage[$key]))
- {
- echo '
This file has not been tested!
';
- }
- $coveredLines = $this->coverage[$key];
- $fileArray = file(Doctrine::getPath() . "/".$fileName);
- $html .= '
' . "\n";
- foreach ($fileArray as $num => $line){
- $linenum = $num+1;
- $html .= '' . $linenum . ' | ' . "\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";
- }
-
- $line = str_replace(" ", " ", htmlspecialchars($line));
- $html .= '' . $line . ' |
' . "\n";
- }
- $html .='
';
- echo $html;
- }
-
- /*
- * Generate coverage data for non tested files
- *
- * Scans all files and records data for those that are not in the coverage
- * record.
- *
- * @return array An array with coverage data
- */
- public function generateNotCoveredFiles()
- {
- $it = new RecursiveDirectoryIterator(Doctrine::getPath());
-
- $notCoveredArray = array();
- foreach (new RecursiveIteratorIterator($it) as $file){
- if (strpos($file->getPathname(), ".svn")){
- continue;
- }
- $path = Doctrine::getPath() . DIRECTORY_SEPARATOR;
- $coveredPath = str_replace($path, $this->path, $file->getPathname());
- if (isset($this->coverage[$coveredPath])){
- continue;
- }
-
- $class = str_replace($path, "", $file->getPathname());
- $class = str_replace(DIRECTORY_SEPARATOR, "_", $class);
- $class = substr($class, 0,-4);
- if (strpos($class, '_Interface')) {
- continue;
- }
-
- if ( ! class_exists($class)){
- continue;
- }
-
- try{
- $refClass = new ReflectionClass($class);
- } catch (Exception $e){
- echo $e->getMessage();
- continue;
- }
- $lines = 0;
- $methodLines = 0;
- foreach ($refClass->getMethods() as $refMethod){
-
- if ($refMethod->getDeclaringClass() != $refClass){
- continue;
- }
- $methodLines = $refMethod->getEndLine() - $refMethod->getStartLine();
- $lines += $methodLines;
- }
- if ($methodLines == 0){
- $notCoveredArray[$class] = array("covered" => 0, "maybe" => 0, "notcovered"=>$lines, "total" => $lines, "percentage" => 100);
- } else {
- $notCoveredArray[$class] = array("covered" => 0, "maybe" => 0, "notcovered"=>$lines, "total" => $lines, "percentage" => 0);
- }
- $this->totallines += $lines;
- $this->totalnotcovered += $lines;
- }
- return $notCoveredArray;
- }
-
- /*
- * Show a summary of all files in Doctrine and their coverage data
- *
- * @uses generateNonCoveredFiles
- * @uses generateCoverage
- */
- public function showSummary()
- {
- if (isset($_GET["order"])){
- $this->sortBy = $_GET["order"];
- }
- $coveredArray = $this->generateCoverage();
- $notcoveredArray = $this->generateNotCoveredFiles();
- $coveredArray = array_merge($coveredArray, $notcoveredArray);
-
- //lets sort it.
- uasort($coveredArray, array($this,"sortArray"));
-
- //and flip if it perhaps?
- if (isset($_GET["desc"]) && $_GET["desc"] == "true"){
- $coveredArray = array_reverse($coveredArray, true);
- }
-
- //ugly code to print out the result:
- echo "" . TOTAL . " | " . round((($this->totalcovered + $this->totalmaybe) / $this->totallines) * 100, 2) . " % | $this->totallines | $this->totalcovered | $this->totalmaybe | $this->totalnotcovered | |
";
- foreach($coveredArray as $class => $info){
- $fileName = str_replace("_", "/", $class) . ".php";
- echo "" . $class . " | " . $info["percentage"] . " % | " . $info["total"] . " | " . $info["covered"] . " | " . $info["maybe"] . " | " . $info["notcovered"]. " | coverage |
";
- }
- }
-
- /*
- * Generate coverage data for tested files
- *
- *@return array An array of coverage data
- */
- public function generateCoverage()
- {
- $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 self::COVERED:
- $covered++;
- break;
- case self::NOTCOVERED:
- $notcovered++;
- break;
- case self::MAYBE:
- $maybe++;
- break;
- }
- }
- $covered--; //again we have to remove that last line.
- $this->totallines += $total;
- $this->totalcovered += $covered;
- $this->totalnotcovered += $notcovered;
- $this->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);
- }
- return $coveredArray;
- }
-
- /*
- * Uasort function to sort the array by key
- *
- */
- public function sortArray($a, $b)
- {
- if ($a[$this->sortBy] == $b[$this->sortBy]) {
- return 0;
- }
- return ( $a[$this->sortBy] < $b[$this->sortBy]) ? -1 : 1;
- }
-}
-
diff --git a/tests/coverage/Doctrine.html b/tests/coverage/Doctrine.html
index 6563b9cc6..4375b445e 100644
--- a/tests/coverage/Doctrine.html
+++ b/tests/coverage/Doctrine.html
@@ -16,7 +16,7 @@
/*
|
3 |
- * $Id: Doctrine.php 3066 2007-11-02 16:07:11Z meus $
+ | * $Id: Doctrine.php 3092 2007-11-08 19:01:22Z Jonathan.Wage $
|
4 |
*
@@ -103,7 +103,7 @@
| * @since 1.0
|
32 |
- * @version $Revision: 3066 $
+ | * @version $Revision: 3092 $
|
33 |
*/
@@ -3046,7 +3046,7 @@
| *
|
1013 |
- * Callback function to classify a classname propperly.
+ | * Callback function to classify a classname properly.
|
1014 |
*
@@ -3157,27 +3157,24 @@
| {
|
1050 |
- if (is_dir($path) || is_file($path))
+ | if (is_dir($path) || is_file($path)) {
|
1051 |
- {
- |
-1052 |
return true;
|
-1053 |
+
1052 |
}
|
-1054 |
+
1053 |
|
-1055 |
+
1054 |
return mkdir($path, $mode, true);
|
-1056 |
+
1055 |
}
|
-1057 |
+
1056 |
}
|