From f5383a2243da4898f2310e96a292c498fc3083b2 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 5 Feb 2011 01:40:14 -0500
Subject: [PATCH] Fixing some failing tests.

---
 cake/tests/cases/console/shells/api.test.php  | 43 ++++++++++---------
 .../cases/console/shells/tasks/test.test.php  |  8 ++--
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/cake/tests/cases/console/shells/api.test.php b/cake/tests/cases/console/shells/api.test.php
index e43c55d33..79deea551 100644
--- a/cake/tests/cases/console/shells/api.test.php
+++ b/cake/tests/cases/console/shells/api.test.php
@@ -58,27 +58,28 @@ class ApiShellTest extends CakeTestCase {
 		$expected = array(
 			'1. afterFilter()',
 			'2. beforeFilter()',
-			'3. beforeRender()',
-			'4. constructClasses()',
-			'5. disableCache()',
-			'6. flash($message, $url, $pause = 1, $layout = \'flash\')',
-			'7. getResponse()',
-			'8. header($status)',
-			'9. httpCodes($code = NULL)',
-			'10. isAuthorized()',
-			'11. loadModel($modelClass = NULL, $id = NULL)',
-			'12. paginate($object = NULL, $scope = array (), $whitelist = array ())',
-			'13. postConditions($data = array (), $op = NULL, $bool = \'AND\', $exclusive = false)',
-			'14. redirect($url, $status = NULL, $exit = true)',
-			'15. referer($default = NULL, $local = false)',
-			'16. render($action = NULL, $layout = NULL, $file = NULL)',
-			'17. set($one, $two = NULL)',
-			'18. setAction($action)',
-			'19. setRequest($request)',
-			'20. shutdownProcess()',
-			'21. startupProcess()',
-			'22. validate()',
-			'23. validateErrors()'
+			'3. beforeRedirect($url, $status = NULL, $exit = true)',
+			'4. beforeRender()',
+			'5. constructClasses()',
+			'6. disableCache()',
+			'7. flash($message, $url, $pause = 1, $layout = \'flash\')',
+			'8. getResponse()',
+			'9. header($status)',
+			'10. httpCodes($code = NULL)',
+			'11. isAuthorized()',
+			'12. loadModel($modelClass = NULL, $id = NULL)',
+			'13. paginate($object = NULL, $scope = array (), $whitelist = array ())',
+			'14. postConditions($data = array (), $op = NULL, $bool = \'AND\', $exclusive = false)',
+			'15. redirect($url, $status = NULL, $exit = true)',
+			'16. referer($default = NULL, $local = false)',
+			'17. render($action = NULL, $layout = NULL, $file = NULL)',
+			'18. set($one, $two = NULL)',
+			'19. setAction($action)',
+			'20. setRequest($request)',
+			'21. shutdownProcess()',
+			'22. startupProcess()',
+			'23. validate()',
+			'24. validateErrors()'
 		);
 		$this->Shell->expects($this->at(2))->method('out')->with($expected);
 
diff --git a/cake/tests/cases/console/shells/tasks/test.test.php b/cake/tests/cases/console/shells/tasks/test.test.php
index b57ec9d2f..5b25fb0b0 100644
--- a/cake/tests/cases/console/shells/tasks/test.test.php
+++ b/cake/tests/cases/console/shells/tasks/test.test.php
@@ -441,10 +441,10 @@ class TestTaskTest extends CakeTestCase {
 		$this->assertContains("App::import('Model', 'TestTaskArticle')", $result);
 		$this->assertContains('class TestTaskArticleTestCase extends CakeTestCase', $result);
 
-		$this->assertContains('function startTest()', $result);
+		$this->assertContains('function setUp()', $result);
 		$this->assertContains("\$this->TestTaskArticle = ClassRegistry::init('TestTaskArticle')", $result);
 
-		$this->assertContains('function endTest()', $result);
+		$this->assertContains('function tearDown()', $result);
 		$this->assertContains('unset($this->TestTaskArticle)', $result);
 
 		$this->assertContains('function testDoSomething()', $result);
@@ -476,11 +476,11 @@ class TestTaskTest extends CakeTestCase {
 		$this->assertContains('public $autoRender = false', $result);
 		$this->assertContains('function redirect($url, $status = null, $exit = true)', $result);
 
-		$this->assertContains('function startTest()', $result);
+		$this->assertContains('function setUp()', $result);
 		$this->assertContains("\$this->TestTaskComments = new TestTestTaskCommentsController()", $result);
 		$this->assertContains("\$this->TestTaskComments->constructClasses()", $result);
 
-		$this->assertContains('function endTest()', $result);
+		$this->assertContains('function tearDown()', $result);
 		$this->assertContains('unset($this->TestTaskComments)', $result);
 
 		$this->assertContains("'app.test_task_article'", $result);