cvs: pear /PHPUnit2 package.xml /PHPUnit2/Util/CodeCoverage/Renderer HTML.php /PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template
coverage_directory.htm coverage_file.htm graphical_test_hierarchy.htm
| From: | Sebastian Bergmann | Date: | Wed, 01 Mar 2006 16:07:39 +0000 |
| Subject: | cvs: pear /PHPUnit2 package.xml /PHPUnit2/Util/CodeCoverage/Renderer HTML.php /PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template coverage_directory.htm coverage_file.htm graphical_test_hierarchy.htm |
||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-38794@lists.php.net to get a copy of this message | ||
sebastian Wed Mar 1 16:07:39 2006 UTC
Added files:
/pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template
graphical_test_hierarchy.htm
Modified files:
/pear/PHPUnit2 package.xml
/pear/PHPUnit2/Util/CodeCoverage/Renderer HTML.php
/pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template
coverage_directory.htm
coverage_file.htm
Log:
Add graphical test hierarchy.
http://cvs.php.net/viewcvs.cgi/pear/PHPUnit2/package.xml?r1=1.177&r2=1.178&diff_format=u Index: pear/PHPUnit2/package.xml diff -u pear/PHPUnit2/package.xml:1.177 pear/PHPUnit2/package.xml:1.178 --- pear/PHPUnit2/package.xml:1.177 Mon Feb 27 18:49:04 2006 +++ pear/PHPUnit2/package.xml Wed Mar 1 16:07:38 2006 @@ -529,12 +529,13 @@ <dir name="Template"> <file name="amber.png"/> <file name="coverage_directory.htm"/> - <file name="emerald.png"/> <file name="coverage_file.htm"/> - <file name="glass.png"/> <file name="coverage_item.htm"/> <file name="coverage_item_details.htm"/> <file name="coverage_item_details_header.htm"/> + <file name="emerald.png"/> + <file name="glass.png"/> + <file name="graphical_test_hierarchy.htm"/> <file name="ruby.png"/> <file name="snow.png"/> <file name="style.css"/> http://cvs.php.net/viewcvs.cgi/pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML.php?r1=1.18&r2=1.19&diff_format=u Index: pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML.php diff -u pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML.php:1.18 pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML.php:1.19 --- pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML.php:1.18 Tue Feb 28 20:41:08 2006 +++ pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML.php Wed Mar 1 16:07:39 2006 @@ -41,7 +41,7 @@ * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de> * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version CVS: $Id: HTML.php,v 1.18 2006/02/28 20:41:08 sebastian Exp $ + * @version CVS: $Id: HTML.php,v 1.19 2006/03/01 16:07:39 sebastian Exp $ * @link http://pear.php.net/package/PHPUnit2 * @since File available since Release 2.3.0 */ @@ -51,7 +51,11 @@ PHPUnit2_Util_Classloader::import( array( + 'PHPUnit2_Framework_TestSuite', + 'PHPUnit2_Util_CodeCoverage_Renderer_HTML_Template', 'PHPUnit2_Util_CodeCoverage_Renderer_HTML_Tree_Factory', + 'PHPUnit2_Util_Array', + 'PHPUnit2_Util_Test', ) ); @@ -91,11 +95,17 @@ $this->result ); + $this->renderGraphicalTestHierarchy($target); $tree->render($target); $this->copyFiles($target); } + /** + * @param string $target + * @access protected + * @since Method available since Release 3.0.0 + */ protected function copyFiles($target) { @@ -112,6 +122,78 @@ } } + /** + * @param string $target + * @access protected + * @since Method available since Release 3.0.0 + */ + protected function renderGraphicalTestHierarchy($target) + { + $graphicalTestHierarchyTemplate = new PHPUnit2_Util_CodeCoverage_Renderer_HTML_Template( + PHPUnit2_Util_CodeCoverage_Renderer_HTML::getTemplatePath() . + 'graphical_test_hierarchy.htm' + ); + + $this->setTemplateVars($graphicalTestHierarchyTemplate); + + if (file_exists($target . 'testmap.dot')) { + shell_exec( + sprintf( + 'neato -Tpng -o %stestmap.png %stestmap.dot', + + $target, + $target + ) + ); + + $testmap = shell_exec( + sprintf( + 'neato -Tcmapx %stestmap.dot', + + $target + ) + ); + } else { + $testmap = ''; + } + + $graphicalTestHierarchyTemplate->setVar( + 'testmap', + $testmap + ); + + $fp = fopen($target . 'graphical_test_hierarchy.htm', 'w'); + fputs($fp, $graphicalTestHierarchyTemplate->render()); + fclose($fp); + } + + /** + * @param PHPUnit2_Util_CodeCoverage_Renderer_HTML_Template $template + * @access protected + * @since Method available since Release 3.0.0 + */ + protected function setTemplateVars(PHPUnit2_Util_CodeCoverage_Renderer_HTML_Template $template) + { + $template->setVar( + array( + 'date', + 'phpunit_version', + 'xdebug_version', + ), + array( + date('D M j G:i:s T Y'), + PHPUnit2_Runner_Version::id(), + phpversion('xdebug') + ) + ); + } + + /** + * @return string + * @access public + * @static + * @since Method available since Release 3.0.0 + */ public static function getTemplatePath() { return sprintf( http://cvs.php.net/viewcvs.cgi/pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_directory.htm?r1=1.1&r2=1.2&diff_format=u Index: pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_directory.htm diff -u pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_directory.htm:1.1 pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_directory.htm:1.2 --- pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_directory.htm:1.1 Mon Feb 27 18:49:04 2006 +++ pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_directory.htm Wed Mar 1 16:07:39 2006 @@ -56,6 +56,14 @@ </table> <center> + <br /> + + <div align="center"> + <a href="graphical_test_hierarchy.htm">Graphical Test Hierarchy</a> + </div> + + <br /> + <table width="80%" cellpadding=2 cellspacing=1 border=0> <tr> <td width="50%"><br></td> @@ -71,7 +79,7 @@ </table> </center> - <br/> + <br /> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr><td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td></tr> http://cvs.php.net/viewcvs.cgi/pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_file.htm?r1=1.1&r2=1.2&diff_format=u Index: pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_file.htm diff -u pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_file.htm:1.1 pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_file.htm:1.2 --- pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_file.htm:1.1 Mon Feb 27 18:49:04 2006 +++ pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_file.htm Wed Mar 1 16:07:39 2006 @@ -49,6 +49,14 @@ </tr> </table> + <br /> + + <div align="center"> + <a href="graphical_test_hierarchy.htm">Graphical Test Hierarchy</a> + </div> + + <br /> + <table cellpadding="0" cellspacing="0" border="0"> <tr> <td><br /></td> @@ -62,8 +70,6 @@ </tr> </table> - <br /> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr><td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td></tr> <tr><td class="versionInfo">Generated by: <a href="http://www.phpunit.de/">PHPUnit {phpunit_version}</a> and <a href="http://www.xdebug.org/">Xdebug {xdebug_version}</a>.</td></tr> http://cvs.php.net/viewcvs.cgi/pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/graphical_test_hierarchy.htm?view=markup&rev=1.1 Index: pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/graphical_test_hierarchy.htm +++ pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/graphical_test_hierarchy.htm <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> <title>Graphical Test Hierarchy</title> <link rel="stylesheet" type="text/css" href="style.css"> </head> <body> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr><td class="title">Graphical Test Hierarchy</td></tr> <tr><td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td></tr> </table> <center> <img alt="Graphical Test Hierarchy" border="0" src="testmap.png" usemap="#G" /> {testmap} </center> <br/> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr><td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td></tr> <tr><td class="versionInfo">Generated by: <a href="http://www.phpunit.de/">PHPUnit {phpunit_version}</a> and <a href="http://www.xdebug.org/">Xdebug {xdebug_version}</a>.</td></tr> </table> <br/> </body> </html>
http://cvs.php.net/viewcvs.cgi/pear/PHPUnit2/package.xml?r1=1.177&r2=1.178&diff_format=u Index: pear/PHPUnit2/package.xml diff -u pear/PHPUnit2/package.xml:1.177 pear/PHPUnit2/package.xml:1.178 --- pear/PHPUnit2/package.xml:1.177 Mon Feb 27 18:49:04 2006 +++ pear/PHPUnit2/package.xml Wed Mar 1 16:07:38 2006 @@ -529,12 +529,13 @@ <dir name="Template"> <file name="amber.png"/> <file name="coverage_directory.htm"/> - <file name="emerald.png"/> <file name="coverage_file.htm"/> - <file name="glass.png"/> <file name="coverage_item.htm"/> <file name="coverage_item_details.htm"/> <file name="coverage_item_details_header.htm"/> + <file name="emerald.png"/> + <file name="glass.png"/> + <file name="graphical_test_hierarchy.htm"/> <file name="ruby.png"/> <file name="snow.png"/> <file name="style.css"/> http://cvs.php.net/viewcvs.cgi/pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML.php?r1=1.18&r2=1.19&diff_format=u Index: pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML.php diff -u pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML.php:1.18 pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML.php:1.19 --- pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML.php:1.18 Tue Feb 28 20:41:08 2006 +++ pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML.php Wed Mar 1 16:07:39 2006 @@ -41,7 +41,7 @@ * @author Sebastian Bergmann <sb@sebastian-bergmann.de> * @copyright 2002-2006 Sebastian Bergmann <sb@sebastian-bergmann.de> * @license http://www.opensource.org/licenses/bsd-license.php BSD License - * @version CVS: $Id: HTML.php,v 1.18 2006/02/28 20:41:08 sebastian Exp $ + * @version CVS: $Id: HTML.php,v 1.19 2006/03/01 16:07:39 sebastian Exp $ * @link http://pear.php.net/package/PHPUnit2 * @since File available since Release 2.3.0 */ @@ -51,7 +51,11 @@ PHPUnit2_Util_Classloader::import( array( + 'PHPUnit2_Framework_TestSuite', + 'PHPUnit2_Util_CodeCoverage_Renderer_HTML_Template', 'PHPUnit2_Util_CodeCoverage_Renderer_HTML_Tree_Factory', + 'PHPUnit2_Util_Array', + 'PHPUnit2_Util_Test', ) ); @@ -91,11 +95,17 @@ $this->result ); + $this->renderGraphicalTestHierarchy($target); $tree->render($target); $this->copyFiles($target); } + /** + * @param string $target + * @access protected + * @since Method available since Release 3.0.0 + */ protected function copyFiles($target) { @@ -112,6 +122,78 @@ } } + /** + * @param string $target + * @access protected + * @since Method available since Release 3.0.0 + */ + protected function renderGraphicalTestHierarchy($target) + { + $graphicalTestHierarchyTemplate = new PHPUnit2_Util_CodeCoverage_Renderer_HTML_Template( + PHPUnit2_Util_CodeCoverage_Renderer_HTML::getTemplatePath() . + 'graphical_test_hierarchy.htm' + ); + + $this->setTemplateVars($graphicalTestHierarchyTemplate); + + if (file_exists($target . 'testmap.dot')) { + shell_exec( + sprintf( + 'neato -Tpng -o %stestmap.png %stestmap.dot', + + $target, + $target + ) + ); + + $testmap = shell_exec( + sprintf( + 'neato -Tcmapx %stestmap.dot', + + $target + ) + ); + } else { + $testmap = ''; + } + + $graphicalTestHierarchyTemplate->setVar( + 'testmap', + $testmap + ); + + $fp = fopen($target . 'graphical_test_hierarchy.htm', 'w'); + fputs($fp, $graphicalTestHierarchyTemplate->render()); + fclose($fp); + } + + /** + * @param PHPUnit2_Util_CodeCoverage_Renderer_HTML_Template $template + * @access protected + * @since Method available since Release 3.0.0 + */ + protected function setTemplateVars(PHPUnit2_Util_CodeCoverage_Renderer_HTML_Template $template) + { + $template->setVar( + array( + 'date', + 'phpunit_version', + 'xdebug_version', + ), + array( + date('D M j G:i:s T Y'), + PHPUnit2_Runner_Version::id(), + phpversion('xdebug') + ) + ); + } + + /** + * @return string + * @access public + * @static + * @since Method available since Release 3.0.0 + */ public static function getTemplatePath() { return sprintf( http://cvs.php.net/viewcvs.cgi/pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_directory.htm?r1=1.1&r2=1.2&diff_format=u Index: pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_directory.htm diff -u pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_directory.htm:1.1 pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_directory.htm:1.2 --- pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_directory.htm:1.1 Mon Feb 27 18:49:04 2006 +++ pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_directory.htm Wed Mar 1 16:07:39 2006 @@ -56,6 +56,14 @@ </table> <center> + <br /> + + <div align="center"> + <a href="graphical_test_hierarchy.htm">Graphical Test Hierarchy</a> + </div> + + <br /> + <table width="80%" cellpadding=2 cellspacing=1 border=0> <tr> <td width="50%"><br></td> @@ -71,7 +79,7 @@ </table> </center> - <br/> + <br /> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr><td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td></tr> http://cvs.php.net/viewcvs.cgi/pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_file.htm?r1=1.1&r2=1.2&diff_format=u Index: pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_file.htm diff -u pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_file.htm:1.1 pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_file.htm:1.2 --- pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_file.htm:1.1 Mon Feb 27 18:49:04 2006 +++ pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/coverage_file.htm Wed Mar 1 16:07:39 2006 @@ -49,6 +49,14 @@ </tr> </table> + <br /> + + <div align="center"> + <a href="graphical_test_hierarchy.htm">Graphical Test Hierarchy</a> + </div> + + <br /> + <table cellpadding="0" cellspacing="0" border="0"> <tr> <td><br /></td> @@ -62,8 +70,6 @@ </tr> </table> - <br /> - <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr><td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td></tr> <tr><td class="versionInfo">Generated by: <a href="http://www.phpunit.de/">PHPUnit {phpunit_version}</a> and <a href="http://www.xdebug.org/">Xdebug {xdebug_version}</a>.</td></tr> http://cvs.php.net/viewcvs.cgi/pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/graphical_test_hierarchy.htm?view=markup&rev=1.1 Index: pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/graphical_test_hierarchy.htm +++ pear/PHPUnit2/Util/CodeCoverage/Renderer/HTML/Template/graphical_test_hierarchy.htm <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> <title>Graphical Test Hierarchy</title> <link rel="stylesheet" type="text/css" href="style.css"> </head> <body> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr><td class="title">Graphical Test Hierarchy</td></tr> <tr><td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td></tr> </table> <center> <img alt="Graphical Test Hierarchy" border="0" src="testmap.png" usemap="#G" /> {testmap} </center> <br/> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr><td class="ruler"><img src="glass.png" width="3" height="3" alt=""></td></tr> <tr><td class="versionInfo">Generated by: <a href="http://www.phpunit.de/">PHPUnit {phpunit_version}</a> and <a href="http://www.xdebug.org/">Xdebug {xdebug_version}</a>.</td></tr> </table> <br/> </body> </html>