From 53882370995c0084e5680c83825eeb91a5e112ca Mon Sep 17 00:00:00 2001 From: Kyle Robinson Young Date: Sun, 4 Dec 2011 13:27:51 -0800 Subject: [PATCH] Consistently setting setUp() and tearDown() on test cases --- lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php | 2 +- lib/Cake/Test/Case/Configure/IniReaderTest.php | 4 ++-- lib/Cake/Test/Case/Console/Command/AclShellTest.php | 3 ++- lib/Cake/Test/Case/Console/Command/BakeShellTest.php | 2 +- .../Test/Case/Console/Command/CommandListShellTest.php | 2 +- lib/Cake/Test/Case/Console/Command/SchemaShellTest.php | 2 +- .../Case/Console/Command/Task/ControllerTaskTest.php | 6 ++++-- .../Case/Console/Command/Task/DbConfigTaskTest.php | 2 +- .../Test/Case/Console/Command/Task/ModelTaskTest.php | 2 +- .../Test/Case/Console/Command/Task/PluginTaskTest.php | 2 +- .../Test/Case/Console/Command/Task/ProjectTaskTest.php | 4 ++-- .../Case/Console/Command/Task/TemplateTaskTest.php | 6 +++--- .../Test/Case/Console/Command/Task/TestTaskTest.php | 6 +++--- lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php | 2 +- lib/Cake/Test/Case/Console/TaskCollectionTest.php | 10 ++++++---- .../Controller/Component/Auth/ActionsAuthorizeTest.php | 2 +- .../Component/Auth/BasicAuthenticateTest.php | 2 +- .../Component/Auth/DigestAuthenticateTest.php | 2 +- .../Test/Case/Controller/ComponentCollectionTest.php | 10 ++++++---- lib/Cake/Test/Case/Controller/ControllerTest.php | 6 ++++-- lib/Cake/Test/Case/Error/ErrorHandlerTest.php | 7 +++++-- lib/Cake/Test/Case/Error/ExceptionRendererTest.php | 7 +++++-- .../Test/Case/Model/Datasource/CakeSessionTest.php | 4 ++-- .../Case/Model/Datasource/Session/CacheSessionTest.php | 2 +- .../Model/Datasource/Session/DatabaseSessionTest.php | 10 ++++++---- .../Test/Case/TestSuite/ControllerTestCaseTest.php | 2 +- .../Test/Case/TestSuite/HtmlCoverageReportTest.php | 5 +++-- lib/Cake/Test/Case/Utility/DebuggerTest.php | 4 ++-- lib/Cake/Test/Case/Utility/FileTest.php | 6 +++--- lib/Cake/Test/Case/Utility/InflectorTest.php | 2 +- lib/Cake/Test/Case/Utility/ObjectCollectionTest.php | 10 ++++++---- lib/Cake/Test/Case/Utility/ValidationTest.php | 4 ++-- lib/Cake/Test/Case/Utility/XmlTest.php | 4 ++-- lib/Cake/Test/Case/View/HelperCollectionTest.php | 10 ++++++---- lib/Cake/Test/Case/View/ScaffoldViewTest.php | 2 +- 35 files changed, 89 insertions(+), 67 deletions(-) diff --git a/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php b/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php index 2565b95f454..beaf957007c 100644 --- a/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php +++ b/lib/Cake/Test/Case/Cache/Engine/FileEngineTest.php @@ -45,7 +45,7 @@ public function setUp() { } /** - * teardown method + * tearDown method * * @return void */ diff --git a/lib/Cake/Test/Case/Configure/IniReaderTest.php b/lib/Cake/Test/Case/Configure/IniReaderTest.php index 9828808710e..847902b69fb 100644 --- a/lib/Cake/Test/Case/Configure/IniReaderTest.php +++ b/lib/Cake/Test/Case/Configure/IniReaderTest.php @@ -32,8 +32,8 @@ class IniReaderTest extends CakeTestCase { * * @return void */ - public function setup() { - parent::setup(); + public function setUp() { + parent::setUp(); $this->path = CAKE . 'Test' . DS . 'test_app' . DS . 'Config'. DS; } diff --git a/lib/Cake/Test/Case/Console/Command/AclShellTest.php b/lib/Cake/Test/Case/Console/Command/AclShellTest.php index 2e69358e81e..6eff3fe737f 100644 --- a/lib/Cake/Test/Case/Console/Command/AclShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/AclShellTest.php @@ -37,11 +37,12 @@ class AclShellTest extends CakeTestCase { public $fixtures = array('core.aco', 'core.aro', 'core.aros_aco'); /** - * setup method + * setUp method * * @return void */ public function setUp() { + parent::setUp(); Configure::write('Acl.database', 'test'); Configure::write('Acl.classname', 'DbAcl'); diff --git a/lib/Cake/Test/Case/Console/Command/BakeShellTest.php b/lib/Cake/Test/Case/Console/Command/BakeShellTest.php index 52c16233754..0bac5fa9c1a 100644 --- a/lib/Cake/Test/Case/Console/Command/BakeShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/BakeShellTest.php @@ -59,7 +59,7 @@ public function setUp() { } /** - * teardown method + * tearDown method * * @return void */ diff --git a/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php index 2bce24e06f5..b604a8c18f9 100644 --- a/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/CommandListShellTest.php @@ -60,7 +60,7 @@ public function setUp() { } /** - * teardown + * tearDown * * @return void */ diff --git a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php index 0ad3be2fab2..c8c2572d790 100644 --- a/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php +++ b/lib/Cake/Test/Case/Console/Command/SchemaShellTest.php @@ -97,7 +97,7 @@ class SchemaShellTest extends CakeTestCase { ); /** - * setup method + * setUp method * * @return void */ diff --git a/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php index c10c0b5d38a..a294fe8fbbc 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ControllerTaskTest.php @@ -64,6 +64,7 @@ class ControllerTaskTest extends CakeTestCase { * @return void */ public function setUp() { + parent::setUp(); $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); $this->Task = $this->getMock('ControllerTask', @@ -86,14 +87,15 @@ public function setUp() { } /** - * teardown method + * tearDown method * * @return void */ - public function teardown() { + public function tearDown() { unset($this->Task); ClassRegistry::flush(); App::build(); + parent::tearDown(); } /** diff --git a/lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php index de3cb877907..8df1be426f3 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/DbConfigTaskTest.php @@ -31,7 +31,7 @@ class DbConfigTaskTest extends CakeTestCase { /** - * setup method + * setUp method * * @return void */ diff --git a/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php index 4824577ed95..6f861b3cb9c 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ModelTaskTest.php @@ -95,7 +95,7 @@ protected function _setupOtherMocks() { } /** - * teardown method + * tearDown method * * @return void */ diff --git a/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php index 96155ae4a72..68fc003f2bf 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php @@ -36,7 +36,7 @@ class PluginTaskTest extends CakeTestCase { /** - * setup method + * setUp method * * @return void */ diff --git a/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php index 0ed8d701298..04ffbf4206d 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/ProjectTaskTest.php @@ -35,7 +35,7 @@ class ProjectTaskTest extends CakeTestCase { /** - * setup method + * setUp method * * @return void */ @@ -52,7 +52,7 @@ public function setUp() { } /** - * teardown method + * tearDown method * * @return void */ diff --git a/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php index 3c545e24517..7591b49186b 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/TemplateTaskTest.php @@ -33,11 +33,11 @@ class TemplateTaskTest extends CakeTestCase { /** - * setup method + * setUp method * * @return void */ - public function setup() { + public function setUp() { parent::setUp(); $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); @@ -49,7 +49,7 @@ public function setup() { } /** - * teardown method + * tearDown method * * @return void */ diff --git a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php index a42981244e6..cb7fe00c9b7 100644 --- a/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php +++ b/lib/Cake/Test/Case/Console/Command/Task/TestTaskTest.php @@ -220,12 +220,12 @@ class TestTaskTest extends CakeTestCase { public $fixtures = array('core.article', 'core.comment', 'core.articles_tag', 'core.tag'); /** - * setup method + * setUp method * * @return void */ - public function setup() { - parent::setup(); + public function setUp() { + parent::setUp(); $out = $this->getMock('ConsoleOutput', array(), array(), '', false); $in = $this->getMock('ConsoleInput', array(), array(), '', false); diff --git a/lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php b/lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php index 662f6b35a9a..7c56adba71c 100644 --- a/lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php +++ b/lib/Cake/Test/Case/Console/ConsoleErrorHandlerTest.php @@ -38,7 +38,7 @@ public function setUp() { } /** - * teardown + * tearDown * * @return void */ diff --git a/lib/Cake/Test/Case/Console/TaskCollectionTest.php b/lib/Cake/Test/Case/Console/TaskCollectionTest.php index 3648fb2b4c3..cbb081018bd 100644 --- a/lib/Cake/Test/Case/Console/TaskCollectionTest.php +++ b/lib/Cake/Test/Case/Console/TaskCollectionTest.php @@ -22,23 +22,25 @@ class TaskCollectionTest extends CakeTestCase { /** - * setup + * setUp * * @return void */ - public function setup() { + public function setUp() { + parent::setUp(); $shell = $this->getMock('Shell', array(), array(), '', false); $dispatcher = $this->getMock('ShellDispatcher', array(), array(), '', false); $this->Tasks = new TaskCollection($shell, $dispatcher); } /** - * teardown + * tearDown * * @return void */ - public function teardown() { + public function tearDown() { unset($this->Tasks); + parent::tearDown(); } /** diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php index 709b9bdfea2..6d1c5fbfb91 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/ActionsAuthorizeTest.php @@ -26,7 +26,7 @@ class ActionsAuthorizeTest extends CakeTestCase { /** - * setup + * setUp * * @return void */ diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php index d742495a606..b26ee908534 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/BasicAuthenticateTest.php @@ -57,7 +57,7 @@ public function setUp() { } /** - * teardown + * tearDown * * @return void */ diff --git a/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php b/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php index 4c6776d3346..b3974249d83 100644 --- a/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php +++ b/lib/Cake/Test/Case/Controller/Component/Auth/DigestAuthenticateTest.php @@ -59,7 +59,7 @@ public function setUp() { } /** - * teardown + * tearDown * * @return void */ diff --git a/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php b/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php index 960532ee360..208b147d631 100644 --- a/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php +++ b/lib/Cake/Test/Case/Controller/ComponentCollectionTest.php @@ -29,21 +29,23 @@ class CookieAliasComponent extends CookieComponent { class ComponentCollectionTest extends CakeTestCase { /** - * setup + * setUp * * @return void */ - public function setup() { + public function setUp() { + parent::setUp(); $this->Components = new ComponentCollection(); } /** - * teardown + * tearDown * * @return void */ - public function teardown() { + public function tearDown() { unset($this->Components); + parent::tearDown(); } /** diff --git a/lib/Cake/Test/Case/Controller/ControllerTest.php b/lib/Cake/Test/Case/Controller/ControllerTest.php index 7b31cc92942..7459fb06a68 100644 --- a/lib/Cake/Test/Case/Controller/ControllerTest.php +++ b/lib/Cake/Test/Case/Controller/ControllerTest.php @@ -381,19 +381,21 @@ class ControllerTest extends CakeTestCase { * @return void */ public function setUp() { + parent::setUp(); App::objects('plugin', null, false); App::build(); Router::reload(); } /** - * teardown + * tearDown * * @return void */ - public function teardown() { + public function tearDown() { CakePlugin::unload(); App::build(); + parent::tearDown(); } /** diff --git a/lib/Cake/Test/Case/Error/ErrorHandlerTest.php b/lib/Cake/Test/Case/Error/ErrorHandlerTest.php index 8b917038196..d80ff3f28ac 100644 --- a/lib/Cake/Test/Case/Error/ErrorHandlerTest.php +++ b/lib/Cake/Test/Case/Error/ErrorHandlerTest.php @@ -29,12 +29,14 @@ class ErrorHandlerTest extends CakeTestCase { public $_restoreError = false; + /** * setup create a request object to get out of router later. * * @return void */ public function setUp() { + parent::setUp(); App::build(array( 'View' => array( CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS @@ -51,17 +53,18 @@ public function setUp() { } /** - * teardown + * tearDown * * @return void */ - public function teardown() { + public function tearDown() { Configure::write('debug', $this->_debug); Configure::write('Error', $this->_error); App::build(); if ($this->_restoreError) { restore_error_handler(); } + parent::tearDown(); } /** diff --git a/lib/Cake/Test/Case/Error/ExceptionRendererTest.php b/lib/Cake/Test/Case/Error/ExceptionRendererTest.php index 78b4421a87d..d07b88bdd01 100644 --- a/lib/Cake/Test/Case/Error/ExceptionRendererTest.php +++ b/lib/Cake/Test/Case/Error/ExceptionRendererTest.php @@ -142,12 +142,14 @@ class MissingWidgetThingException extends NotFoundException { } class ExceptionRendererTest extends CakeTestCase { public $_restoreError = false; + /** * setup create a request object to get out of router later. * * @return void */ public function setUp() { + parent::setUp(); App::build(array( 'views' => array( CAKE . 'Test' . DS . 'test_app' . DS . 'View'. DS @@ -164,17 +166,18 @@ public function setUp() { } /** - * teardown + * tearDown * * @return void */ - public function teardown() { + public function tearDown() { Configure::write('debug', $this->_debug); Configure::write('Error', $this->_error); App::build(); if ($this->_restoreError) { restore_error_handler(); } + parent::tearDown(); } /** diff --git a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php index 3d30dcd5801..850ff215f7b 100644 --- a/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/CakeSessionTest.php @@ -71,8 +71,8 @@ public static function teardownAfterClass() { * * @return void */ - public function setup() { - parent::setup(); + public function setUp() { + parent::setUp(); Configure::write('Session', array( 'defaults' => 'php', 'cookie' => 'cakephp', diff --git a/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php index d4c661ab152..95583afed08 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Session/CacheSessionTest.php @@ -63,7 +63,7 @@ public function setUp() { } /** - * teardown + * tearDown * * @return void */ diff --git a/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php b/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php index 7d29a397c16..a3f8bc4d48f 100644 --- a/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php +++ b/lib/Cake/Test/Case/Model/Datasource/Session/DatabaseSessionTest.php @@ -66,22 +66,24 @@ public static function teardownAfterClass() { } /** - * setup + * setUp * * @return void */ - public function setup() { + public function setUp() { + parent::setUp(); $this->storage = new DatabaseSession(); } /** - * teardown + * tearDown * * @return void */ - public function teardown() { + public function tearDown() { unset($this->storage); ClassRegistry::flush(); + parent::tearDown(); } /** diff --git a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php index 801fe0fa887..4b406f56acb 100644 --- a/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php +++ b/lib/Cake/Test/Case/TestSuite/ControllerTestCaseTest.php @@ -131,7 +131,7 @@ public function setUp() { } /** - * teardown + * tearDown * * @return void */ diff --git a/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php b/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php index b2f6495f45d..4eb4670ca71 100644 --- a/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php +++ b/lib/Cake/Test/Case/TestSuite/HtmlCoverageReportTest.php @@ -22,7 +22,7 @@ class HtmlCoverageReportTest extends CakeTestCase { /** - * setup + * setUp * * @return void */ @@ -220,12 +220,13 @@ public function testCoveredLinesTitleAttributes() { } /** - * teardown + * tearDown * * @return void */ public function tearDown() { CakePlugin::unload(); unset($this->Coverage); + parent::tearDown(); } } diff --git a/lib/Cake/Test/Case/Utility/DebuggerTest.php b/lib/Cake/Test/Case/Utility/DebuggerTest.php index b0a75d499a9..920e5a6cb4c 100644 --- a/lib/Cake/Test/Case/Utility/DebuggerTest.php +++ b/lib/Cake/Test/Case/Utility/DebuggerTest.php @@ -44,7 +44,7 @@ class DebuggerTest extends CakeTestCase { * @return void */ public function setUp() { - parent::setup(); + parent::setUp(); Configure::write('debug', 2); Configure::write('log', false); } @@ -55,7 +55,7 @@ public function setUp() { * @return void */ public function tearDown() { - parent::teardown(); + parent::tearDown(); Configure::write('log', true); if ($this->_restoreError) { restore_error_handler(); diff --git a/lib/Cake/Test/Case/Utility/FileTest.php b/lib/Cake/Test/Case/Utility/FileTest.php index aaf7f1c67e3..b44788b9952 100644 --- a/lib/Cake/Test/Case/Utility/FileTest.php +++ b/lib/Cake/Test/Case/Utility/FileTest.php @@ -45,12 +45,12 @@ public function setUp() { } /** - * tear down for test. + * tearDown method * * @return void */ - public function teardown() { - parent::teardown(); + public function tearDown() { + parent::tearDown(); $this->File->close(); unset($this->File); } diff --git a/lib/Cake/Test/Case/Utility/InflectorTest.php b/lib/Cake/Test/Case/Utility/InflectorTest.php index 194d1a04ecf..758596fa0c5 100644 --- a/lib/Cake/Test/Case/Utility/InflectorTest.php +++ b/lib/Cake/Test/Case/Utility/InflectorTest.php @@ -34,7 +34,7 @@ class InflectorTest extends CakeTestCase { /** - * teardown + * tearDown * * @return void */ diff --git a/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php b/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php index 9a7ecdd9a62..4ff466f6837 100644 --- a/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php +++ b/lib/Cake/Test/Case/Utility/ObjectCollectionTest.php @@ -73,21 +73,23 @@ public function load($object, $settings = array()) { class ObjectCollectionTest extends CakeTestCase { /** - * setup + * setUp * * @return void */ - public function setup() { + public function setUp() { + parent::setUp(); $this->Objects = new GenericObjectCollection(); } /** - * teardown + * tearDown * * @return void */ - public function teardown() { + public function tearDown() { unset($this->Objects); + parent::tearDown(); } /** diff --git a/lib/Cake/Test/Case/Utility/ValidationTest.php b/lib/Cake/Test/Case/Utility/ValidationTest.php index ae718647b76..1c44a5a2500 100644 --- a/lib/Cake/Test/Case/Utility/ValidationTest.php +++ b/lib/Cake/Test/Case/Utility/ValidationTest.php @@ -90,12 +90,12 @@ static function phone($check) { class ValidationTest extends CakeTestCase { /** - * setup method + * setUp method * * @return void */ public function setUp() { - parent::setup(); + parent::setUp(); $this->_appEncoding = Configure::read('App.encoding'); } diff --git a/lib/Cake/Test/Case/Utility/XmlTest.php b/lib/Cake/Test/Case/Utility/XmlTest.php index e5a86427647..81091fb8947 100644 --- a/lib/Cake/Test/Case/Utility/XmlTest.php +++ b/lib/Cake/Test/Case/Utility/XmlTest.php @@ -91,12 +91,12 @@ class XmlTest extends CakeTestCase { ); /** - * setup method + * setUp method * * @return void */ public function setUp() { - parent::setup(); + parent::setUp(); $this->_appEncoding = Configure::read('App.encoding'); Configure::write('App.encoding', 'UTF-8'); } diff --git a/lib/Cake/Test/Case/View/HelperCollectionTest.php b/lib/Cake/Test/Case/View/HelperCollectionTest.php index e38dcdf2a74..d7f29b29b9c 100644 --- a/lib/Cake/Test/Case/View/HelperCollectionTest.php +++ b/lib/Cake/Test/Case/View/HelperCollectionTest.php @@ -29,23 +29,25 @@ class HtmlAliasHelper extends HtmlHelper { class HelperCollectionTest extends CakeTestCase { /** - * setup + * setUp * * @return void */ - public function setup() { + public function setUp() { + parent::setUp(); $this->View = $this->getMock('View', array(), array(null)); $this->Helpers = new HelperCollection($this->View); } /** - * teardown + * tearDown * * @return void */ - public function teardown() { + public function tearDown() { CakePlugin::unload(); unset($this->Helpers, $this->View); + parent::tearDown(); } /** diff --git a/lib/Cake/Test/Case/View/ScaffoldViewTest.php b/lib/Cake/Test/Case/View/ScaffoldViewTest.php index 61e967527f6..d24e2f746cb 100644 --- a/lib/Cake/Test/Case/View/ScaffoldViewTest.php +++ b/lib/Cake/Test/Case/View/ScaffoldViewTest.php @@ -96,7 +96,7 @@ public function setUp() { } /** - * teardown method + * tearDown method * * @return void */