diff --git a/lib/Cake/Console/Command/Task/TestTask.php b/lib/Cake/Console/Command/Task/TestTask.php index 8e91d82cc..feb107e07 100644 --- a/lib/Cake/Console/Command/Task/TestTask.php +++ b/lib/Cake/Console/Command/Task/TestTask.php @@ -139,7 +139,7 @@ class TestTask extends BakeTask { $methods = $this->getTestableMethods($fullClassName); } $mock = $this->hasMockClass($type, $fullClassName); - list($preConstruct, $construction, $postConstruct) = $this->generateConstructor($type, $fullClassName); + list($preConstruct, $construction, $postConstruct) = $this->generateConstructor($type, $fullClassName, $plugin); $uses = $this->generateUses($type, $realType, $fullClassName); $this->out("\n" . __d('cake_console', 'Baking test case for %s %s ...', $className, $type), 1, Shell::QUIET); @@ -446,13 +446,14 @@ class TestTask extends BakeTask { * * @param string $type The Type of object you are generating tests for eg. controller * @param string $fullClassName The Classname of the class the test is being generated for. + * @param string $plugin The plugin name. * @return array Constructor snippets for the thing you are building. */ - public function generateConstructor($type, $fullClassName) { + public function generateConstructor($type, $fullClassName, $plugin) { $type = strtolower($type); $pre = $post = ''; if ($type == 'model') { - $construct = "ClassRegistry::init('$fullClassName');\n"; + $construct = "ClassRegistry::init('{$plugin}$fullClassName');\n"; } if ($type == 'behavior') { $construct = "new $fullClassName();\n"; diff --git a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php index 6d80e1ae5..bc5877a49 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php @@ -555,15 +555,15 @@ class TestTaskTest extends CakeTestCase { * @return void */ public function testGenerateConstructor() { - $result = $this->Task->generateConstructor('controller', 'PostsController'); + $result = $this->Task->generateConstructor('controller', 'PostsController', null); $expected = array('', "new TestPostsController();\n", "\$this->Posts->constructClasses();\n"); $this->assertEquals($expected, $result); - $result = $this->Task->generateConstructor('model', 'Post'); + $result = $this->Task->generateConstructor('model', 'Post', null); $expected = array('', "ClassRegistry::init('Post');\n", ''); $this->assertEquals($expected, $result); - $result = $this->Task->generateConstructor('helper', 'FormHelper'); + $result = $this->Task->generateConstructor('helper', 'FormHelper', null); $expected = array("\$View = new View();\n", "new FormHelper(\$View);\n", ''); $this->assertEquals($expected, $result); }