From 0ec1e6501331d47199a75dec492d05a9b7606619 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 5 Dec 2010 22:53:29 -0500
Subject: [PATCH] Removing collisions that prevent TestTask from being loaded.

---
 cake/tests/cases/console/shells/shell.test.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cake/tests/cases/console/shells/shell.test.php b/cake/tests/cases/console/shells/shell.test.php
index ff341468b..91c623cda 100644
--- a/cake/tests/cases/console/shells/shell.test.php
+++ b/cake/tests/cases/console/shells/shell.test.php
@@ -25,12 +25,12 @@ App::import('Shell', 'Shell', false);
 require_once CAKE . 'console' .  DS . 'shell_dispatcher.php';
 
 /**
- * TestShell class
+ * ShellTestShell class
  *
  * @package       cake
  * @subpackage    cake.tests.cases.console.libs
  */
-class TestShell extends Shell {
+class ShellTestShell extends Shell {
 
 /**
  * name property
@@ -38,7 +38,7 @@ class TestShell extends Shell {
  * @var name
  * @access public
  */
-	public $name = 'TestShell';
+	public $name = 'ShellTestShell';
 
 /**
  * stopped property
@@ -133,7 +133,7 @@ class ShellTest extends CakeTestCase {
 		$output = $this->getMock('ConsoleOutput', array(), array(), '', false);
 		$error = $this->getMock('ConsoleOutput', array(), array(), '', false);
 		$in = $this->getMock('ConsoleInput', array(), array(), '', false);
-		$this->Shell = new TestShell($output, $error, $in);
+		$this->Shell = new ShellTestShell($output, $error, $in);
 	}
 
 /**
@@ -142,7 +142,7 @@ class ShellTest extends CakeTestCase {
  * @return void
  */
 	public function testConstruct() {
-		$this->assertEqual($this->Shell->name, 'TestShell');
+		$this->assertEqual($this->Shell->name, 'ShellTestShell');
 		$this->assertType('ConsoleInput', $this->Shell->stdin);
 		$this->assertType('ConsoleOutput', $this->Shell->stdout);
 		$this->assertType('ConsoleOutput', $this->Shell->stderr);