Renaming menu template file.

Refactoring logic from CakeTestMenu into the Reporters.
This commit is contained in:
Mark Story 2010-01-06 23:02:37 -05:00
parent 4c0d90c502
commit a0f5d0fc02
5 changed files with 26 additions and 81 deletions

View file

@ -84,24 +84,6 @@ class CakeTestMenu {
}
}
/**
* Provides the left hand navigation for the testsuite
*
* @return void
* @access public
*/
function testSuiteHeader() {
switch (CAKE_TEST_OUTPUT) {
case CAKE_TEST_OUTPUT_HTML:
ob_start();
$groups = $_SERVER['PHP_SELF'] . '?show=groups';
$cases = $_SERVER['PHP_SELF'] . '?show=cases';
$plugins = App::objects('plugin');
include CAKE_TESTS_LIB . 'content.php';
break;
}
}
/**
* Provides the testsuite footer text
*

View file

@ -139,7 +139,7 @@ class CakeTestSuiteDispatcher {
$Reporter =& $this->getReporter();
$Reporter->paintDocumentHeader();
$Reporter->paintTestMenu();
CakeTestMenu::testCaseList();
$Reporter->testCaseList();
$Reporter->paintDocumentEnd();
}
@ -152,7 +152,7 @@ class CakeTestSuiteDispatcher {
$Reporter =& $this->getReporter();
$Reporter->paintDocumentHeader();
$Reporter->paintTestMenu();
CakeTestMenu::groupTestList();
$Reporter->groupTestList();
$Reporter->paintDocumentEnd();
}

View file

@ -129,7 +129,28 @@ class CakeHtmlReporter extends SimpleReporter {
* @return void
*/
function paintTestMenu() {
CakeTestMenu::testSuiteHeader();
$groups = $_SERVER['PHP_SELF'] . '?show=groups';
$cases = $_SERVER['PHP_SELF'] . '?show=cases';
$plugins = App::objects('plugin');
include CAKE_TESTS_LIB . 'templates' . DS . 'menu.php';
}
/**
* Retrieves and paints the list of tests cases in an HTML format.
*
* @return void
*/
function testCaseList() {
CakeTestMenu::testCaseList();
}
/**
* Retrieves and paints the list of group tests in an HTML format.
*
* @return void
*/
function groupTestList() {
CakeTestMenu::groupTestList();
}
/**

View file

@ -1,58 +0,0 @@
<?php
/**
* Short description for file.
*
* PHP versions 4 and 5
*
* CakePHP(tm) Tests <https://trac.cakephp.org/wiki/Developement/TestSuite>
* Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
*
* Licensed under The Open Group Test Suite License
* Redistributions of files must retain the above copyright notice.
*
* @copyright Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
* @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests
* @package cake
* @subpackage cake.cake.tests.lib
* @since CakePHP(tm) v 1.2.0.4433
* @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
*/
?>
<div class="test-menu">
<ul>
<li>
<span style="font-size: 18px">App</span>
<ul>
<li><a href='<?php echo $groups;?>&amp;app=true'>Test Groups</a></li>
<li><a href='<?php echo $cases;?>&amp;app=true'>Test Cases</a></li>
</ul>
</li>
<?php
if (!empty($plugins)):
?>
<li style="padding-top: 10px">
<span style="font-size: 18px">Plugins</span>
<?php foreach($plugins as $plugin):
$pluginPath = Inflector::underscore($plugin);
?>
<ul>
<li style="padding-top: 10px">
<span style="font-size: 18px"><?php echo $plugin;?></span>
<ul>
<li><a href='<?php echo $groups;?>&amp;plugin=<?php echo $pluginPath; ?>'>Test Groups</a></li>
<li><a href='<?php echo $cases;?>&amp;plugin=<?php echo $pluginPath; ?>'>Test Cases</a></li>
</ul>
</li>
</ul>
<?php endforeach; ?>
<?php endif;?>
<li style="padding-top: 10px">
<span style="font-size: 18px">Core</span>
<ul>
<li><a href='<?php echo $groups;?>'>Test Groups</a></li>
<li><a href='<?php echo $cases;?>'>Test Cases</a></li>
</ul>
</li>
</ul>
</div>
<div class="test-results">