From 66b36ba3b8ebb8d329c84ebf08eccdf1d12f3444 Mon Sep 17 00:00:00 2001 From: mark_story Date: Mon, 25 May 2009 01:02:59 -0400 Subject: [PATCH] Adding tests for other object types. --- cake/console/libs/tasks/test.php | 6 +++--- cake/tests/cases/console/libs/tasks/test.test.php | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/cake/console/libs/tasks/test.php b/cake/console/libs/tasks/test.php index ae50b9da795..f00ac01b5b4 100644 --- a/cake/console/libs/tasks/test.php +++ b/cake/console/libs/tasks/test.php @@ -390,12 +390,12 @@ function generateMockClass($type, $class) { function generateConstructor($type, $fullClassName) { $type = strtolower($type); if ($type == 'model') { - return "ClassRegistry::init('$fullClassName');"; + return "ClassRegistry::init('$fullClassName');\n"; } if ($type == 'controller') { - return "new Test$fullClassName();\n\t\t\$this->{$fullClassName}->constructClasses();"; + return "new Test$fullClassName();\n\t\t\$this->{$fullClassName}->constructClasses();\n"; } - return "new $fullClassName"; + return "new $fullClassName()\n"; } /** diff --git a/cake/tests/cases/console/libs/tasks/test.test.php b/cake/tests/cases/console/libs/tasks/test.test.php index 3a86100cc66..e5e51328926 100644 --- a/cake/tests/cases/console/libs/tasks/test.test.php +++ b/cake/tests/cases/console/libs/tasks/test.test.php @@ -312,7 +312,15 @@ function testBake() { **/ function testGenerateContsructor() { $result = $this->Task->generateConstructor('controller', 'PostsController'); - $expected = "new TestPostsController();\n\t\t\$this->PostsController->constructClasses();"; + $expected = "new TestPostsController();\n\t\t\$this->PostsController->constructClasses();\n"; + $this->assertEqual($result, $expected); + + $result = $this->Task->generateConstructor('model', 'Post'); + $expected = "ClassRegistry::init('Post');\n"; + $this->assertEqual($result, $expected); + + $result = $this->Task->generateConstructor('helper', 'FormHelper'); + $expected = "new FormHelper()\n"; $this->assertEqual($result, $expected); } }