fix broken tests for TestTask class

cakephp · May 11, 2012 · 287c7b4 · 287c7b4
1 parent c651bf2
commit 287c7b4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/lib/Cake/Console/Templates/default/classes/test.ctp b/lib/Cake/Console/Templates/default/classes/test.ctp
@@ -28,9 +28,9 @@ App::uses('<?php echo $dependency[0]; ?>', '<?php echo $dependency[1]; ?>');
  *
  */
 <?php if ($type === 'Controller'): ?>
-class <?php echo $fullClassName; ?>TestCase extends ControllerTestCase {
+class <?php echo $fullClassName; ?>Test extends ControllerTestCase {
 <?php else: ?>
-class <?php echo $fullClassName; ?>TestCase extends CakeTestCase {
+class <?php echo $fullClassName; ?>Test extends CakeTestCase {
 <?php endif; ?>
 
 <?php if (!empty($fixtures)): ?>

diff --git a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php
@@ -455,9 +455,7 @@ public function testBakeModelTest() {
 	}
 
 /**
- * test baking controller test files, ensure that the stub class is generated.
- * Conditional assertion is known to fail on PHP4 as classnames are all lower case
- * causing issues with inflection of path name from classname.
+ * test baking controller test files
  *
  * @return void
  */
@@ -468,14 +466,10 @@ public function testBakeControllerTest() {
 		$result = $this->Task->bake('Controller', 'TestTaskComments');
 
 		$this->assertContains("App::uses('TestTaskCommentsController', 'Controller')", $result);
-		$this->assertContains('class TestTaskCommentsControllerTest extends CakeTestCase', $result);
-
-		$this->assertContains('class TestTestTaskCommentsController extends TestTaskCommentsController', $result);
-		$this->assertContains('public $autoRender = false', $result);
-		$this->assertContains('function redirect($url, $status = null, $exit = true)', $result);
+		$this->assertContains('class TestTaskCommentsControllerTest extends ControllerTestCase', $result);
 
 		$this->assertContains('function setUp()', $result);
-		$this->assertContains("\$this->TestTaskComments = new TestTestTaskCommentsController()", $result);
+		$this->assertContains("\$this->TestTaskComments = new TestTaskCommentsController()", $result);
 		$this->assertContains("\$this->TestTaskComments->constructClasses()", $result);
 
 		$this->assertContains('function tearDown()', $result);
@@ -556,7 +550,7 @@ public function testBakeHelperTest() {
  */
 	public function testGenerateConstructor() {
 		$result = $this->Task->generateConstructor('controller', 'PostsController', null);
-		$expected = array('', "new TestPostsController();\n", "\$this->Posts->constructClasses();\n");
+		$expected = array('', "new PostsController();\n", "\$this->Posts->constructClasses();\n");
 		$this->assertEquals($expected, $result);
 
 		$result = $this->Task->generateConstructor('model', 'Post', null);