adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Converting static calls to TestManager to use Manager instance in the TestSuiteDispatcher.

Browse source 
Converting static methods to instance methods.
This commit is contained in:
Mark Story 2010-01-05 00:09:07 -05:00
parent e60d742c04
commit 104086b928
2 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cake/tests/lib/cake_test_suite_dispatcher.php
View file

@ -180,12 +180,12 @@ class CakeTestSuiteDispatcher {
function _runGroupTest() {
$Reporter =& CakeTestSuiteDispatcher::getReporter();
if ('all' == $this->params['group']) {
TestManager::runAllTests($Reporter);
$this->Manager->runAllTests($Reporter);
} else {
if ($this->params['codeCoverage']) {
CodeCoverageManager::start($this->params['group'], $Reporter);
}
TestManager::runGroupTest(ucfirst($this->params['group']), $Reporter);
$this->Manager->runGroupTest(ucfirst($this->params['group']), $Reporter);
if ($this->params['codeCoverage']) {
CodeCoverageManager::report();
}
@ -205,7 +205,7 @@ class CakeTestSuiteDispatcher {
CodeCoverageManager::start($_GET['case'], $Reporter);
}
TestManager::runTestCase($_GET['case'], $Reporter);
$this->Manager->runTestCase($_GET['case'], $Reporter);
if ($this->params['codeCoverage']) {
CodeCoverageManager::report();

11
cake/tests/lib/test_manager.php
View file

@ -131,9 +131,7 @@ class TestManager {
* @access public
*/
function runTestCase($testCaseFile, &$reporter, $testing = false) {
$manager =& new TestManager();
$testCaseFileWithPath = $manager->_getTestsPath() . DS . $testCaseFile;
$testCaseFileWithPath = $this->_getTestsPath() . DS . $testCaseFile;
if (!file_exists($testCaseFileWithPath)) {
trigger_error("Test case {$testCaseFile} cannot be found", E_USER_ERROR);
@ -158,8 +156,7 @@ class TestManager {
* @access public
*/
function runGroupTest($groupTestName, &$reporter) {
$manager =& new TestManager();
$filePath = $manager->_getTestsPath('groups') . DS . strtolower($groupTestName) . $manager->_groupExtension;
$filePath = $this->_getTestsPath('groups') . DS . strtolower($groupTestName) . $this->_groupExtension;
if (!file_exists($filePath)) {
trigger_error("Group test {$groupTestName} cannot be found at {$filePath}", E_USER_ERROR);
@ -167,7 +164,7 @@ class TestManager {
require_once $filePath;
$test =& new TestSuite($groupTestName . ' group test');
foreach ($manager->_getGroupTestClassNames($filePath) as $groupTest) {
foreach ($this->_getGroupTestClassNames($filePath) as $groupTest) {
$testCase = new $groupTest();
$test->addTestCase($testCase);
if (isset($testCase->label)) {
@ -582,8 +579,8 @@ class HtmlTestManager extends TestManager {
* @access public
*/
function &getGroupTestList() {
$urlExtra = '';
$manager =& new HtmlTestManager();
$urlExtra = '';
$groupTests =& $manager->_getTestGroupList($manager->_getTestsPath('groups'));
$buffer = "<h3>Core Test Groups:</h3>\n<ul>";