From 104086b928dffee7e8a18e4388378de4f36444d7 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Tue, 5 Jan 2010 00:09:07 -0500
Subject: [PATCH] Converting static calls to TestManager to use Manager
 instance in the TestSuiteDispatcher. Converting static methods to instance
 methods.

---
 cake/tests/lib/cake_test_suite_dispatcher.php |  6 +++---
 cake/tests/lib/test_manager.php               | 11 ++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/cake/tests/lib/cake_test_suite_dispatcher.php b/cake/tests/lib/cake_test_suite_dispatcher.php
index 5a2879d58d8..91a3c774f3e 100644
--- a/cake/tests/lib/cake_test_suite_dispatcher.php
+++ b/cake/tests/lib/cake_test_suite_dispatcher.php
@@ -180,12 +180,12 @@ function _parseParams() {
 	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 @@ function _runTestCase() {
 			CodeCoverageManager::start($_GET['case'], $Reporter);
 		}
 
-		TestManager::runTestCase($_GET['case'], $Reporter);
+		$this->Manager->runTestCase($_GET['case'], $Reporter);
 
 		if ($this->params['codeCoverage']) {
 			CodeCoverageManager::report();
diff --git a/cake/tests/lib/test_manager.php b/cake/tests/lib/test_manager.php
index 21649caa671..2d22c521965 100644
--- a/cake/tests/lib/test_manager.php
+++ b/cake/tests/lib/test_manager.php
@@ -131,9 +131,7 @@ function runAllTests(&$reporter, $testing = false) {
  * @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 @@ function runTestCase($testCaseFile, &$reporter, $testing = false) {
  * @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 @@ function runGroupTest($groupTestName, &$reporter) {
 
 		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 @@ function getBaseURL() {
  * @access public
  */
 	function &getGroupTestList() {
-		$urlExtra = '';
 		$manager =& new HtmlTestManager();
+		$urlExtra = '';
 		$groupTests =& $manager->_getTestGroupList($manager->_getTestsPath('groups'));
 
 		$buffer = "<h3>Core Test Groups:</h3>\n<ul>";