diff --git a/lib/Cake/TestSuite/CakeTestLoader.php b/lib/Cake/TestSuite/CakeTestLoader.php index 94ed036f9..e00b716f4 100644 --- a/lib/Cake/TestSuite/CakeTestLoader.php +++ b/lib/Cake/TestSuite/CakeTestLoader.php @@ -38,7 +38,7 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader { */ protected function _resolveTestFile($filePath, $params) { $basePath = $this->_basePath($params) . DS . $filePath; - $ending = '.test.php'; + $ending = 'Test.php'; return (strpos($basePath, $ending) === (strlen($basePath) - strlen($ending))) ? $basePath : $basePath . $ending; } @@ -56,7 +56,7 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader { $result = APP_TEST_CASES; } else if (!empty($params['plugin'])) { $pluginPath = App::pluginPath($params['plugin']); - $result = $pluginPath . 'tests' . DS . 'cases'; + $result = $pluginPath . 'tests' . DS . 'Case'; } return $result; } @@ -72,7 +72,9 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader { $testCases = array(); foreach ($fileList as $testCaseFile) { - $testCases[$testCaseFile] = str_replace($directory . DS, '', $testCaseFile); + $case = str_replace($directory . DS, '', $testCaseFile); + $case = str_replace('Test.php', '', $case); + $testCases[$testCaseFile] = $case; } return $testCases; } @@ -92,7 +94,7 @@ class CakeTestLoader extends PHPUnit_Runner_StandardTestSuiteLoader { $files = new RegexIterator( new RecursiveIteratorIterator(new RecursiveDirectoryIterator($directory)), - '/.*\.test.php$/' + '/.*Test.php$/' ); foreach ($files as $file) { diff --git a/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php b/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php index 4765b8971..0e9f58737 100644 --- a/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php +++ b/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php @@ -17,8 +17,8 @@ * @license MIT License (http://www.opensource.org/licenses/mit-license.php) */ -define('CORE_TEST_CASES', LIBS . 'tests' . DS . 'cases'); -define('APP_TEST_CASES', TESTS . 'cases'); +define('CORE_TEST_CASES', LIBS . 'tests' . DS . 'Case'); +define('APP_TEST_CASES', TESTS . 'Case'); App::uses('CakeTestSuiteCommand', 'TestSuite'); diff --git a/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php index bc16143ff..51c0392d9 100644 --- a/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php +++ b/lib/Cake/TestSuite/Fixture/CakeFixtureManager.php @@ -105,43 +105,38 @@ class CakeFixtureManager { if (strpos($fixture, 'core.') === 0) { $fixture = substr($fixture, strlen('core.')); - $fixturePaths[] = LIBS . 'tests' . DS . 'fixtures'; + $fixturePaths[] = LIBS . 'tests' . DS . 'Fixture'; } elseif (strpos($fixture, 'app.') === 0) { $fixture = substr($fixture, strlen('app.')); $fixturePaths = array( - TESTS . 'fixtures', - VENDORS . 'tests' . DS . 'fixtures' + TESTS . 'Fixture' ); } elseif (strpos($fixture, 'plugin.') === 0) { $parts = explode('.', $fixture, 3); $pluginName = $parts[1]; $fixture = $parts[2]; $fixturePaths = array( - App::pluginPath($pluginName) . 'tests' . DS . 'fixtures', - TESTS . 'fixtures', - VENDORS . 'tests' . DS . 'fixtures' + App::pluginPath($pluginName) . 'tests' . DS . 'Fixture', + TESTS . 'Fixture' ); } else { $fixturePaths = array( - TESTS . 'fixtures', - VENDORS . 'tests' . DS . 'fixtures', - LIBS . DS . 'cake' . DS . 'tests' . DS . 'fixtures' + TESTS . 'Fixture', + LIBS . 'tests' . DS . 'Fixture' ); } foreach ($fixturePaths as $path) { - if (is_readable($path . DS . $fixture . '_fixture.php')) { - $fixtureFile = $path . DS . $fixture . '_fixture.php'; + $className = Inflector::camelize($fixture); + if (is_readable($path . DS . $className . 'Fixture.php')) { + $fixtureFile = $path . DS . $className . 'Fixture.php'; + require_once($fixtureFile); + $fixtureClass = $className . 'Fixture'; + $this->_loaded[$fixtureIndex] = new $fixtureClass($this->_db); + $this->_fixtureMap[$fixtureClass] = $this->_loaded[$fixtureIndex]; break; } } - - if (isset($fixtureFile)) { - require_once($fixtureFile); - $fixtureClass = Inflector::camelize($fixture) . 'Fixture'; - $this->_loaded[$fixtureIndex] = new $fixtureClass($this->_db); - $this->_fixtureMap[$fixtureClass] = $this->_loaded[$fixtureIndex]; - } } } diff --git a/lib/Cake/tests/cases/AllBehaviorsTest.php b/lib/Cake/tests/Case/AllBehaviorsTest.php similarity index 100% rename from lib/Cake/tests/cases/AllBehaviorsTest.php rename to lib/Cake/tests/Case/AllBehaviorsTest.php diff --git a/lib/Cake/tests/cases/AllCacheEnginesTest.php b/lib/Cake/tests/Case/AllCacheEnginesTest.php similarity index 100% rename from lib/Cake/tests/cases/AllCacheEnginesTest.php rename to lib/Cake/tests/Case/AllCacheEnginesTest.php diff --git a/lib/Cake/tests/cases/AllComponentsTest.php b/lib/Cake/tests/Case/AllComponentsTest.php similarity index 100% rename from lib/Cake/tests/cases/AllComponentsTest.php rename to lib/Cake/tests/Case/AllComponentsTest.php diff --git a/lib/Cake/tests/cases/AllConfigureTest.php b/lib/Cake/tests/Case/AllConfigureTest.php similarity index 100% rename from lib/Cake/tests/cases/AllConfigureTest.php rename to lib/Cake/tests/Case/AllConfigureTest.php diff --git a/lib/Cake/tests/cases/AllControllersTest.php b/lib/Cake/tests/Case/AllControllersTest.php similarity index 100% rename from lib/Cake/tests/cases/AllControllersTest.php rename to lib/Cake/tests/Case/AllControllersTest.php diff --git a/lib/Cake/tests/cases/AllDatabaseTest.php b/lib/Cake/tests/Case/AllDatabaseTest.php similarity index 100% rename from lib/Cake/tests/cases/AllDatabaseTest.php rename to lib/Cake/tests/Case/AllDatabaseTest.php diff --git a/lib/Cake/tests/cases/AllErrorTest.php b/lib/Cake/tests/Case/AllErrorTest.php similarity index 100% rename from lib/Cake/tests/cases/AllErrorTest.php rename to lib/Cake/tests/Case/AllErrorTest.php diff --git a/lib/Cake/tests/cases/AllHelpersTest.php b/lib/Cake/tests/Case/AllHelpersTest.php similarity index 100% rename from lib/Cake/tests/cases/AllHelpersTest.php rename to lib/Cake/tests/Case/AllHelpersTest.php diff --git a/lib/Cake/tests/cases/AllJsHelpersTest.php b/lib/Cake/tests/Case/AllJsHelpersTest.php similarity index 100% rename from lib/Cake/tests/cases/AllJsHelpersTest.php rename to lib/Cake/tests/Case/AllJsHelpersTest.php diff --git a/lib/Cake/tests/cases/AllLibsTest.php b/lib/Cake/tests/Case/AllLibsTest.php similarity index 100% rename from lib/Cake/tests/cases/AllLibsTest.php rename to lib/Cake/tests/Case/AllLibsTest.php diff --git a/lib/Cake/tests/cases/AllLocalizationTest.php b/lib/Cake/tests/Case/AllLocalizationTest.php similarity index 100% rename from lib/Cake/tests/cases/AllLocalizationTest.php rename to lib/Cake/tests/Case/AllLocalizationTest.php diff --git a/lib/Cake/tests/cases/AllModelTest.php b/lib/Cake/tests/Case/AllModelTest.php similarity index 100% rename from lib/Cake/tests/cases/AllModelTest.php rename to lib/Cake/tests/Case/AllModelTest.php diff --git a/lib/Cake/tests/cases/AllRoutingTest.php b/lib/Cake/tests/Case/AllRoutingTest.php similarity index 100% rename from lib/Cake/tests/cases/AllRoutingTest.php rename to lib/Cake/tests/Case/AllRoutingTest.php diff --git a/lib/Cake/tests/cases/AllSocketTest.php b/lib/Cake/tests/Case/AllSocketTest.php similarity index 100% rename from lib/Cake/tests/cases/AllSocketTest.php rename to lib/Cake/tests/Case/AllSocketTest.php diff --git a/lib/Cake/tests/cases/AllTestSuiteTest.php b/lib/Cake/tests/Case/AllTestSuiteTest.php similarity index 100% rename from lib/Cake/tests/cases/AllTestSuiteTest.php rename to lib/Cake/tests/Case/AllTestSuiteTest.php diff --git a/lib/Cake/tests/cases/AllTestsTest.php b/lib/Cake/tests/Case/AllTestsTest.php similarity index 100% rename from lib/Cake/tests/cases/AllTestsTest.php rename to lib/Cake/tests/Case/AllTestsTest.php diff --git a/lib/Cake/tests/cases/AllViewsTest.php b/lib/Cake/tests/Case/AllViewsTest.php similarity index 100% rename from lib/Cake/tests/cases/AllViewsTest.php rename to lib/Cake/tests/Case/AllViewsTest.php diff --git a/lib/Cake/tests/cases/AllXmlTest.php b/lib/Cake/tests/Case/AllXmlTest.php similarity index 100% rename from lib/Cake/tests/cases/AllXmlTest.php rename to lib/Cake/tests/Case/AllXmlTest.php diff --git a/lib/Cake/tests/cases/BasicsTest.php b/lib/Cake/tests/Case/BasicsTest.php similarity index 100% rename from lib/Cake/tests/cases/BasicsTest.php rename to lib/Cake/tests/Case/BasicsTest.php diff --git a/lib/Cake/tests/cases/Cache/CacheTest.php b/lib/Cake/tests/Case/Cache/CacheTest.php similarity index 100% rename from lib/Cake/tests/cases/Cache/CacheTest.php rename to lib/Cake/tests/Case/Cache/CacheTest.php diff --git a/lib/Cake/tests/cases/Cache/Engine/ApcEngineTest.php b/lib/Cake/tests/Case/Cache/Engine/ApcEngineTest.php similarity index 100% rename from lib/Cake/tests/cases/Cache/Engine/ApcEngineTest.php rename to lib/Cake/tests/Case/Cache/Engine/ApcEngineTest.php diff --git a/lib/Cake/tests/cases/Cache/Engine/FileEngineTest.php b/lib/Cake/tests/Case/Cache/Engine/FileEngineTest.php similarity index 100% rename from lib/Cake/tests/cases/Cache/Engine/FileEngineTest.php rename to lib/Cake/tests/Case/Cache/Engine/FileEngineTest.php diff --git a/lib/Cake/tests/cases/Cache/Engine/MemcacheTest.php b/lib/Cake/tests/Case/Cache/Engine/MemcacheTest.php similarity index 100% rename from lib/Cake/tests/cases/Cache/Engine/MemcacheTest.php rename to lib/Cake/tests/Case/Cache/Engine/MemcacheTest.php diff --git a/lib/Cake/tests/cases/Cache/Engine/XcacheTest.php b/lib/Cake/tests/Case/Cache/Engine/XcacheTest.php similarity index 100% rename from lib/Cake/tests/cases/Cache/Engine/XcacheTest.php rename to lib/Cake/tests/Case/Cache/Engine/XcacheTest.php diff --git a/lib/Cake/tests/cases/Configure/IniReaderTest.php b/lib/Cake/tests/Case/Configure/IniReaderTest.php similarity index 100% rename from lib/Cake/tests/cases/Configure/IniReaderTest.php rename to lib/Cake/tests/Case/Configure/IniReaderTest.php diff --git a/lib/Cake/tests/cases/Configure/PhpReaderTest.php b/lib/Cake/tests/Case/Configure/PhpReaderTest.php similarity index 100% rename from lib/Cake/tests/cases/Configure/PhpReaderTest.php rename to lib/Cake/tests/Case/Configure/PhpReaderTest.php diff --git a/lib/Cake/tests/cases/Console/AllConsoleLibsTest.php b/lib/Cake/tests/Case/Console/AllConsoleLibsTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/AllConsoleLibsTest.php rename to lib/Cake/tests/Case/Console/AllConsoleLibsTest.php diff --git a/lib/Cake/tests/cases/Console/AllConsoleTest.php b/lib/Cake/tests/Case/Console/AllConsoleTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/AllConsoleTest.php rename to lib/Cake/tests/Case/Console/AllConsoleTest.php diff --git a/lib/Cake/tests/cases/Console/AllShellsTest.php b/lib/Cake/tests/Case/Console/AllShellsTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/AllShellsTest.php rename to lib/Cake/tests/Case/Console/AllShellsTest.php diff --git a/lib/Cake/tests/cases/Console/AllTasksTest.php b/lib/Cake/tests/Case/Console/AllTasksTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/AllTasksTest.php rename to lib/Cake/tests/Case/Console/AllTasksTest.php diff --git a/lib/Cake/tests/cases/Console/Command/AclShellTest.php b/lib/Cake/tests/Case/Console/Command/AclShellTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/Command/AclShellTest.php rename to lib/Cake/tests/Case/Console/Command/AclShellTest.php diff --git a/lib/Cake/tests/cases/Console/Command/ApiShellTest.php b/lib/Cake/tests/Case/Console/Command/ApiShellTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/Command/ApiShellTest.php rename to lib/Cake/tests/Case/Console/Command/ApiShellTest.php diff --git a/lib/Cake/tests/cases/Console/Command/BakeShellTest.php b/lib/Cake/tests/Case/Console/Command/BakeShellTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/Command/BakeShellTest.php rename to lib/Cake/tests/Case/Console/Command/BakeShellTest.php diff --git a/lib/Cake/tests/cases/Console/Command/CommandListShellTest.php b/lib/Cake/tests/Case/Console/Command/CommandListShellTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/Command/CommandListShellTest.php rename to lib/Cake/tests/Case/Console/Command/CommandListShellTest.php diff --git a/lib/Cake/tests/cases/Console/Command/SchemaShellTest.php b/lib/Cake/tests/Case/Console/Command/SchemaShellTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/Command/SchemaShellTest.php rename to lib/Cake/tests/Case/Console/Command/SchemaShellTest.php diff --git a/lib/Cake/tests/cases/Console/Command/ShellTest.php b/lib/Cake/tests/Case/Console/Command/ShellTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/Command/ShellTest.php rename to lib/Cake/tests/Case/Console/Command/ShellTest.php diff --git a/lib/Cake/tests/cases/Console/Command/Task/ControllerTaskTest.php b/lib/Cake/tests/Case/Console/Command/Task/ControllerTaskTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/Command/Task/ControllerTaskTest.php rename to lib/Cake/tests/Case/Console/Command/Task/ControllerTaskTest.php diff --git a/lib/Cake/tests/cases/Console/Command/Task/DbConfigTaskTest.php b/lib/Cake/tests/Case/Console/Command/Task/DbConfigTaskTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/Command/Task/DbConfigTaskTest.php rename to lib/Cake/tests/Case/Console/Command/Task/DbConfigTaskTest.php diff --git a/lib/Cake/tests/cases/Console/Command/Task/ExtractTaskTest.php b/lib/Cake/tests/Case/Console/Command/Task/ExtractTaskTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/Command/Task/ExtractTaskTest.php rename to lib/Cake/tests/Case/Console/Command/Task/ExtractTaskTest.php diff --git a/lib/Cake/tests/cases/Console/Command/Task/FixtureTaskTest.php b/lib/Cake/tests/Case/Console/Command/Task/FixtureTaskTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/Command/Task/FixtureTaskTest.php rename to lib/Cake/tests/Case/Console/Command/Task/FixtureTaskTest.php diff --git a/lib/Cake/tests/cases/Console/Command/Task/ModelTaskTest.php b/lib/Cake/tests/Case/Console/Command/Task/ModelTaskTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/Command/Task/ModelTaskTest.php rename to lib/Cake/tests/Case/Console/Command/Task/ModelTaskTest.php diff --git a/lib/Cake/tests/cases/Console/Command/Task/PluginTaskTest.php b/lib/Cake/tests/Case/Console/Command/Task/PluginTaskTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/Command/Task/PluginTaskTest.php rename to lib/Cake/tests/Case/Console/Command/Task/PluginTaskTest.php diff --git a/lib/Cake/tests/cases/Console/Command/Task/ProjectTaskTest.php b/lib/Cake/tests/Case/Console/Command/Task/ProjectTaskTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/Command/Task/ProjectTaskTest.php rename to lib/Cake/tests/Case/Console/Command/Task/ProjectTaskTest.php diff --git a/lib/Cake/tests/cases/Console/Command/Task/TemplateTaskTest.php b/lib/Cake/tests/Case/Console/Command/Task/TemplateTaskTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/Command/Task/TemplateTaskTest.php rename to lib/Cake/tests/Case/Console/Command/Task/TemplateTaskTest.php diff --git a/lib/Cake/tests/cases/Console/Command/Task/TestTaskTest.php b/lib/Cake/tests/Case/Console/Command/Task/TestTaskTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/Command/Task/TestTaskTest.php rename to lib/Cake/tests/Case/Console/Command/Task/TestTaskTest.php diff --git a/lib/Cake/tests/cases/Console/Command/Task/ViewTaskTest.php b/lib/Cake/tests/Case/Console/Command/Task/ViewTaskTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/Command/Task/ViewTaskTest.php rename to lib/Cake/tests/Case/Console/Command/Task/ViewTaskTest.php diff --git a/lib/Cake/tests/cases/Console/Command/TestsuiteShellTest.php b/lib/Cake/tests/Case/Console/Command/TestsuiteShellTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/Command/TestsuiteShellTest.php rename to lib/Cake/tests/Case/Console/Command/TestsuiteShellTest.php diff --git a/lib/Cake/tests/cases/Console/ConsoleErrorHandlerTest.php b/lib/Cake/tests/Case/Console/ConsoleErrorHandlerTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/ConsoleErrorHandlerTest.php rename to lib/Cake/tests/Case/Console/ConsoleErrorHandlerTest.php diff --git a/lib/Cake/tests/cases/Console/ConsoleOptionParserTest.php b/lib/Cake/tests/Case/Console/ConsoleOptionParserTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/ConsoleOptionParserTest.php rename to lib/Cake/tests/Case/Console/ConsoleOptionParserTest.php diff --git a/lib/Cake/tests/cases/Console/ConsoleOutputTest.php b/lib/Cake/tests/Case/Console/ConsoleOutputTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/ConsoleOutputTest.php rename to lib/Cake/tests/Case/Console/ConsoleOutputTest.php diff --git a/lib/Cake/tests/cases/Console/HelpFormatterTest.php b/lib/Cake/tests/Case/Console/HelpFormatterTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/HelpFormatterTest.php rename to lib/Cake/tests/Case/Console/HelpFormatterTest.php diff --git a/lib/Cake/tests/cases/Console/ShellDispatcherTest.php b/lib/Cake/tests/Case/Console/ShellDispatcherTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/ShellDispatcherTest.php rename to lib/Cake/tests/Case/Console/ShellDispatcherTest.php diff --git a/lib/Cake/tests/cases/Console/TaskCollectionTest.php b/lib/Cake/tests/Case/Console/TaskCollectionTest.php similarity index 100% rename from lib/Cake/tests/cases/Console/TaskCollectionTest.php rename to lib/Cake/tests/Case/Console/TaskCollectionTest.php diff --git a/lib/Cake/tests/cases/Controller/Component/AclComponentTest.php b/lib/Cake/tests/Case/Controller/Component/AclComponentTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/Component/AclComponentTest.php rename to lib/Cake/tests/Case/Controller/Component/AclComponentTest.php diff --git a/lib/Cake/tests/cases/Controller/Component/Auth/ActionsAuthorizeTest.php b/lib/Cake/tests/Case/Controller/Component/Auth/ActionsAuthorizeTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/Component/Auth/ActionsAuthorizeTest.php rename to lib/Cake/tests/Case/Controller/Component/Auth/ActionsAuthorizeTest.php diff --git a/lib/Cake/tests/cases/Controller/Component/Auth/BasicAuthenticateTest.php b/lib/Cake/tests/Case/Controller/Component/Auth/BasicAuthenticateTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/Component/Auth/BasicAuthenticateTest.php rename to lib/Cake/tests/Case/Controller/Component/Auth/BasicAuthenticateTest.php diff --git a/lib/Cake/tests/cases/Controller/Component/Auth/ControllerAuthorizeTest.php b/lib/Cake/tests/Case/Controller/Component/Auth/ControllerAuthorizeTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/Component/Auth/ControllerAuthorizeTest.php rename to lib/Cake/tests/Case/Controller/Component/Auth/ControllerAuthorizeTest.php diff --git a/lib/Cake/tests/cases/Controller/Component/Auth/CrudAuthorizeTest.php b/lib/Cake/tests/Case/Controller/Component/Auth/CrudAuthorizeTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/Component/Auth/CrudAuthorizeTest.php rename to lib/Cake/tests/Case/Controller/Component/Auth/CrudAuthorizeTest.php diff --git a/lib/Cake/tests/cases/Controller/Component/Auth/DigestAuthenticateTest.php b/lib/Cake/tests/Case/Controller/Component/Auth/DigestAuthenticateTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/Component/Auth/DigestAuthenticateTest.php rename to lib/Cake/tests/Case/Controller/Component/Auth/DigestAuthenticateTest.php diff --git a/lib/Cake/tests/cases/Controller/Component/Auth/FormAuthenticate.php b/lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php similarity index 100% rename from lib/Cake/tests/cases/Controller/Component/Auth/FormAuthenticate.php rename to lib/Cake/tests/Case/Controller/Component/Auth/FormAuthenticate.php diff --git a/lib/Cake/tests/cases/Controller/Component/AuthComponentTest.php b/lib/Cake/tests/Case/Controller/Component/AuthComponentTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/Component/AuthComponentTest.php rename to lib/Cake/tests/Case/Controller/Component/AuthComponentTest.php diff --git a/lib/Cake/tests/cases/Controller/Component/CookieComponentTest.php b/lib/Cake/tests/Case/Controller/Component/CookieComponentTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/Component/CookieComponentTest.php rename to lib/Cake/tests/Case/Controller/Component/CookieComponentTest.php diff --git a/lib/Cake/tests/cases/Controller/Component/EmailComponentTest.php b/lib/Cake/tests/Case/Controller/Component/EmailComponentTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/Component/EmailComponentTest.php rename to lib/Cake/tests/Case/Controller/Component/EmailComponentTest.php diff --git a/lib/Cake/tests/cases/Controller/Component/PaginatorComponentTest.php b/lib/Cake/tests/Case/Controller/Component/PaginatorComponentTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/Component/PaginatorComponentTest.php rename to lib/Cake/tests/Case/Controller/Component/PaginatorComponentTest.php diff --git a/lib/Cake/tests/cases/Controller/Component/RequestHandlerComponentTest.php b/lib/Cake/tests/Case/Controller/Component/RequestHandlerComponentTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/Component/RequestHandlerComponentTest.php rename to lib/Cake/tests/Case/Controller/Component/RequestHandlerComponentTest.php diff --git a/lib/Cake/tests/cases/Controller/Component/SecurityComponentTest.php b/lib/Cake/tests/Case/Controller/Component/SecurityComponentTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/Component/SecurityComponentTest.php rename to lib/Cake/tests/Case/Controller/Component/SecurityComponentTest.php diff --git a/lib/Cake/tests/cases/Controller/Component/SessionComponentTest.php b/lib/Cake/tests/Case/Controller/Component/SessionComponentTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/Component/SessionComponentTest.php rename to lib/Cake/tests/Case/Controller/Component/SessionComponentTest.php diff --git a/lib/Cake/tests/cases/Controller/ComponentCollectionTest.php b/lib/Cake/tests/Case/Controller/ComponentCollectionTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/ComponentCollectionTest.php rename to lib/Cake/tests/Case/Controller/ComponentCollectionTest.php diff --git a/lib/Cake/tests/cases/Controller/ComponentTest.php b/lib/Cake/tests/Case/Controller/ComponentTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/ComponentTest.php rename to lib/Cake/tests/Case/Controller/ComponentTest.php diff --git a/lib/Cake/tests/cases/Controller/ControllerMergeVarsTest.php b/lib/Cake/tests/Case/Controller/ControllerMergeVarsTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/ControllerMergeVarsTest.php rename to lib/Cake/tests/Case/Controller/ControllerMergeVarsTest.php diff --git a/lib/Cake/tests/cases/Controller/ControllerTest.php b/lib/Cake/tests/Case/Controller/ControllerTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/ControllerTest.php rename to lib/Cake/tests/Case/Controller/ControllerTest.php diff --git a/lib/Cake/tests/cases/Controller/PagesControllerTest.php b/lib/Cake/tests/Case/Controller/PagesControllerTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/PagesControllerTest.php rename to lib/Cake/tests/Case/Controller/PagesControllerTest.php diff --git a/lib/Cake/tests/cases/Controller/ScaffoldTest.php b/lib/Cake/tests/Case/Controller/ScaffoldTest.php similarity index 100% rename from lib/Cake/tests/cases/Controller/ScaffoldTest.php rename to lib/Cake/tests/Case/Controller/ScaffoldTest.php diff --git a/lib/Cake/tests/cases/Core/AppTest.php b/lib/Cake/tests/Case/Core/AppTest.php similarity index 100% rename from lib/Cake/tests/cases/Core/AppTest.php rename to lib/Cake/tests/Case/Core/AppTest.php diff --git a/lib/Cake/tests/cases/Core/ConfigureTest.php b/lib/Cake/tests/Case/Core/ConfigureTest.php similarity index 100% rename from lib/Cake/tests/cases/Core/ConfigureTest.php rename to lib/Cake/tests/Case/Core/ConfigureTest.php diff --git a/lib/Cake/tests/cases/Core/ObjectTest.php b/lib/Cake/tests/Case/Core/ObjectTest.php similarity index 100% rename from lib/Cake/tests/cases/Core/ObjectTest.php rename to lib/Cake/tests/Case/Core/ObjectTest.php diff --git a/lib/Cake/tests/cases/Error/ErrorHanlderTest.php b/lib/Cake/tests/Case/Error/ErrorHanlderTest.php similarity index 100% rename from lib/Cake/tests/cases/Error/ErrorHanlderTest.php rename to lib/Cake/tests/Case/Error/ErrorHanlderTest.php diff --git a/lib/Cake/tests/cases/Error/ExceptionRendererTest.php b/lib/Cake/tests/Case/Error/ExceptionRendererTest.php similarity index 100% rename from lib/Cake/tests/cases/Error/ExceptionRendererTest.php rename to lib/Cake/tests/Case/Error/ExceptionRendererTest.php diff --git a/lib/Cake/tests/cases/I18n/I18nTest.php b/lib/Cake/tests/Case/I18n/I18nTest.php similarity index 100% rename from lib/Cake/tests/cases/I18n/I18nTest.php rename to lib/Cake/tests/Case/I18n/I18nTest.php diff --git a/lib/Cake/tests/cases/I18n/L10nTest.php b/lib/Cake/tests/Case/I18n/L10nTest.php similarity index 100% rename from lib/Cake/tests/cases/I18n/L10nTest.php rename to lib/Cake/tests/Case/I18n/L10nTest.php diff --git a/lib/Cake/tests/cases/I18n/MultibyteTest.php b/lib/Cake/tests/Case/I18n/MultibyteTest.php similarity index 100% rename from lib/Cake/tests/cases/I18n/MultibyteTest.php rename to lib/Cake/tests/Case/I18n/MultibyteTest.php diff --git a/lib/Cake/tests/cases/Log/CakeLogTest.php b/lib/Cake/tests/Case/Log/CakeLogTest.php similarity index 100% rename from lib/Cake/tests/cases/Log/CakeLogTest.php rename to lib/Cake/tests/Case/Log/CakeLogTest.php diff --git a/lib/Cake/tests/cases/Log/Engine/FileLog.php b/lib/Cake/tests/Case/Log/Engine/FileLog.php similarity index 100% rename from lib/Cake/tests/cases/Log/Engine/FileLog.php rename to lib/Cake/tests/Case/Log/Engine/FileLog.php diff --git a/lib/Cake/tests/cases/Model/Behavior/AclBehaviorTest.php b/lib/Cake/tests/Case/Model/Behavior/AclBehaviorTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/Behavior/AclBehaviorTest.php rename to lib/Cake/tests/Case/Model/Behavior/AclBehaviorTest.php diff --git a/lib/Cake/tests/cases/Model/Behavior/ContainableBehaviorTest.php b/lib/Cake/tests/Case/Model/Behavior/ContainableBehaviorTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/Behavior/ContainableBehaviorTest.php rename to lib/Cake/tests/Case/Model/Behavior/ContainableBehaviorTest.php diff --git a/lib/Cake/tests/cases/Model/Behavior/TranslateBehaviorTest.php b/lib/Cake/tests/Case/Model/Behavior/TranslateBehaviorTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/Behavior/TranslateBehaviorTest.php rename to lib/Cake/tests/Case/Model/Behavior/TranslateBehaviorTest.php diff --git a/lib/Cake/tests/cases/Model/Behavior/TreeBehaviorTest.php b/lib/Cake/tests/Case/Model/Behavior/TreeBehaviorTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/Behavior/TreeBehaviorTest.php rename to lib/Cake/tests/Case/Model/Behavior/TreeBehaviorTest.php diff --git a/lib/Cake/tests/cases/Model/BehaviorCollectionTest.php b/lib/Cake/tests/Case/Model/BehaviorCollectionTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/BehaviorCollectionTest.php rename to lib/Cake/tests/Case/Model/BehaviorCollectionTest.php diff --git a/lib/Cake/tests/cases/Model/CakeSchemaTest.php b/lib/Cake/tests/Case/Model/CakeSchemaTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/CakeSchemaTest.php rename to lib/Cake/tests/Case/Model/CakeSchemaTest.php diff --git a/lib/Cake/tests/cases/Model/ConnectionManagerTest.php b/lib/Cake/tests/Case/Model/ConnectionManagerTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/ConnectionManagerTest.php rename to lib/Cake/tests/Case/Model/ConnectionManagerTest.php diff --git a/lib/Cake/tests/cases/Model/Datasource/CakeSessionTest.php b/lib/Cake/tests/Case/Model/Datasource/CakeSessionTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/Datasource/CakeSessionTest.php rename to lib/Cake/tests/Case/Model/Datasource/CakeSessionTest.php diff --git a/lib/Cake/tests/cases/Model/Datasource/Database/MssqlTest.php b/lib/Cake/tests/Case/Model/Datasource/Database/MssqlTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/Datasource/Database/MssqlTest.php rename to lib/Cake/tests/Case/Model/Datasource/Database/MssqlTest.php diff --git a/lib/Cake/tests/cases/Model/Datasource/Database/MysqlTest.php b/lib/Cake/tests/Case/Model/Datasource/Database/MysqlTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/Datasource/Database/MysqlTest.php rename to lib/Cake/tests/Case/Model/Datasource/Database/MysqlTest.php diff --git a/lib/Cake/tests/cases/Model/Datasource/Database/OrcaleTest.php b/lib/Cake/tests/Case/Model/Datasource/Database/OrcaleTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/Datasource/Database/OrcaleTest.php rename to lib/Cake/tests/Case/Model/Datasource/Database/OrcaleTest.php diff --git a/lib/Cake/tests/cases/Model/Datasource/Database/PostgresTest.php b/lib/Cake/tests/Case/Model/Datasource/Database/PostgresTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/Datasource/Database/PostgresTest.php rename to lib/Cake/tests/Case/Model/Datasource/Database/PostgresTest.php diff --git a/lib/Cake/tests/cases/Model/Datasource/Database/SqliteTest.php b/lib/Cake/tests/Case/Model/Datasource/Database/SqliteTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/Datasource/Database/SqliteTest.php rename to lib/Cake/tests/Case/Model/Datasource/Database/SqliteTest.php diff --git a/lib/Cake/tests/cases/Model/Datasource/DboSourceTest.php b/lib/Cake/tests/Case/Model/Datasource/DboSourceTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/Datasource/DboSourceTest.php rename to lib/Cake/tests/Case/Model/Datasource/DboSourceTest.php diff --git a/lib/Cake/tests/cases/Model/Datasource/Session/CacheSessionTest.php b/lib/Cake/tests/Case/Model/Datasource/Session/CacheSessionTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/Datasource/Session/CacheSessionTest.php rename to lib/Cake/tests/Case/Model/Datasource/Session/CacheSessionTest.php diff --git a/lib/Cake/tests/cases/Model/Datasource/Session/DatabaseSessionTest.php b/lib/Cake/tests/Case/Model/Datasource/Session/DatabaseSessionTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/Datasource/Session/DatabaseSessionTest.php rename to lib/Cake/tests/Case/Model/Datasource/Session/DatabaseSessionTest.php diff --git a/lib/Cake/tests/cases/Model/DbAclTest.php b/lib/Cake/tests/Case/Model/DbAclTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/DbAclTest.php rename to lib/Cake/tests/Case/Model/DbAclTest.php diff --git a/lib/Cake/tests/cases/Model/ModelDeleteTest.php b/lib/Cake/tests/Case/Model/ModelDeleteTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/ModelDeleteTest.php rename to lib/Cake/tests/Case/Model/ModelDeleteTest.php diff --git a/lib/Cake/tests/cases/Model/ModelIntegrationTest.php b/lib/Cake/tests/Case/Model/ModelIntegrationTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/ModelIntegrationTest.php rename to lib/Cake/tests/Case/Model/ModelIntegrationTest.php diff --git a/lib/Cake/tests/cases/Model/ModelReadTest.php b/lib/Cake/tests/Case/Model/ModelReadTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/ModelReadTest.php rename to lib/Cake/tests/Case/Model/ModelReadTest.php diff --git a/lib/Cake/tests/cases/Model/ModelTestBase.php b/lib/Cake/tests/Case/Model/ModelTestBase.php similarity index 100% rename from lib/Cake/tests/cases/Model/ModelTestBase.php rename to lib/Cake/tests/Case/Model/ModelTestBase.php diff --git a/lib/Cake/tests/cases/Model/ModelValidationTest.php b/lib/Cake/tests/Case/Model/ModelValidationTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/ModelValidationTest.php rename to lib/Cake/tests/Case/Model/ModelValidationTest.php diff --git a/lib/Cake/tests/cases/Model/ModelWriteTest.php b/lib/Cake/tests/Case/Model/ModelWriteTest.php similarity index 100% rename from lib/Cake/tests/cases/Model/ModelWriteTest.php rename to lib/Cake/tests/Case/Model/ModelWriteTest.php diff --git a/lib/Cake/tests/cases/Model/models.php b/lib/Cake/tests/Case/Model/models.php similarity index 100% rename from lib/Cake/tests/cases/Model/models.php rename to lib/Cake/tests/Case/Model/models.php diff --git a/lib/Cake/tests/cases/Network/CakeRequestTest.php b/lib/Cake/tests/Case/Network/CakeRequestTest.php similarity index 100% rename from lib/Cake/tests/cases/Network/CakeRequestTest.php rename to lib/Cake/tests/Case/Network/CakeRequestTest.php diff --git a/lib/Cake/tests/cases/Network/CakeResponseTest.php b/lib/Cake/tests/Case/Network/CakeResponseTest.php similarity index 100% rename from lib/Cake/tests/cases/Network/CakeResponseTest.php rename to lib/Cake/tests/Case/Network/CakeResponseTest.php diff --git a/lib/Cake/tests/cases/Network/CakeSocketTest.php b/lib/Cake/tests/Case/Network/CakeSocketTest.php similarity index 100% rename from lib/Cake/tests/cases/Network/CakeSocketTest.php rename to lib/Cake/tests/Case/Network/CakeSocketTest.php diff --git a/lib/Cake/tests/cases/Network/Http/BasicAuthenticationTest.php b/lib/Cake/tests/Case/Network/Http/BasicAuthenticationTest.php similarity index 100% rename from lib/Cake/tests/cases/Network/Http/BasicAuthenticationTest.php rename to lib/Cake/tests/Case/Network/Http/BasicAuthenticationTest.php diff --git a/lib/Cake/tests/cases/Network/Http/DigestAuthenticationTest.php b/lib/Cake/tests/Case/Network/Http/DigestAuthenticationTest.php similarity index 100% rename from lib/Cake/tests/cases/Network/Http/DigestAuthenticationTest.php rename to lib/Cake/tests/Case/Network/Http/DigestAuthenticationTest.php diff --git a/lib/Cake/tests/cases/Network/Http/HttpResponseTest.php b/lib/Cake/tests/Case/Network/Http/HttpResponseTest.php similarity index 100% rename from lib/Cake/tests/cases/Network/Http/HttpResponseTest.php rename to lib/Cake/tests/Case/Network/Http/HttpResponseTest.php diff --git a/lib/Cake/tests/cases/Network/Http/HttpSocketTest.php b/lib/Cake/tests/Case/Network/Http/HttpSocketTest.php similarity index 100% rename from lib/Cake/tests/cases/Network/Http/HttpSocketTest.php rename to lib/Cake/tests/Case/Network/Http/HttpSocketTest.php diff --git a/lib/Cake/tests/cases/Routing/DispatcherTest.php b/lib/Cake/tests/Case/Routing/DispatcherTest.php similarity index 100% rename from lib/Cake/tests/cases/Routing/DispatcherTest.php rename to lib/Cake/tests/Case/Routing/DispatcherTest.php diff --git a/lib/Cake/tests/cases/Routing/Route/CakeRouteTest.php b/lib/Cake/tests/Case/Routing/Route/CakeRouteTest.php similarity index 100% rename from lib/Cake/tests/cases/Routing/Route/CakeRouteTest.php rename to lib/Cake/tests/Case/Routing/Route/CakeRouteTest.php diff --git a/lib/Cake/tests/cases/Routing/Route/PluginShortRouteTest.php b/lib/Cake/tests/Case/Routing/Route/PluginShortRouteTest.php similarity index 100% rename from lib/Cake/tests/cases/Routing/Route/PluginShortRouteTest.php rename to lib/Cake/tests/Case/Routing/Route/PluginShortRouteTest.php diff --git a/lib/Cake/tests/cases/Routing/Route/RedirectRouteTest.php b/lib/Cake/tests/Case/Routing/Route/RedirectRouteTest.php similarity index 100% rename from lib/Cake/tests/cases/Routing/Route/RedirectRouteTest.php rename to lib/Cake/tests/Case/Routing/Route/RedirectRouteTest.php diff --git a/lib/Cake/tests/cases/Routing/RouterTest.php b/lib/Cake/tests/Case/Routing/RouterTest.php similarity index 100% rename from lib/Cake/tests/cases/Routing/RouterTest.php rename to lib/Cake/tests/Case/Routing/RouterTest.php diff --git a/lib/Cake/tests/cases/TestSuite/CakeTestCaseTest.php b/lib/Cake/tests/Case/TestSuite/CakeTestCaseTest.php similarity index 100% rename from lib/Cake/tests/cases/TestSuite/CakeTestCaseTest.php rename to lib/Cake/tests/Case/TestSuite/CakeTestCaseTest.php diff --git a/lib/Cake/tests/cases/TestSuite/CakeTestFixtureTest.php b/lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php similarity index 100% rename from lib/Cake/tests/cases/TestSuite/CakeTestFixtureTest.php rename to lib/Cake/tests/Case/TestSuite/CakeTestFixtureTest.php diff --git a/lib/Cake/tests/cases/TestSuite/ControllerTestCaseTest.php b/lib/Cake/tests/Case/TestSuite/ControllerTestCaseTest.php similarity index 100% rename from lib/Cake/tests/cases/TestSuite/ControllerTestCaseTest.php rename to lib/Cake/tests/Case/TestSuite/ControllerTestCaseTest.php diff --git a/lib/Cake/tests/cases/TestSuite/HtmlCoverageReportTest.php b/lib/Cake/tests/Case/TestSuite/HtmlCoverageReportTest.php similarity index 100% rename from lib/Cake/tests/cases/TestSuite/HtmlCoverageReportTest.php rename to lib/Cake/tests/Case/TestSuite/HtmlCoverageReportTest.php diff --git a/lib/Cake/tests/cases/Utility/ClassRegistryTest.php b/lib/Cake/tests/Case/Utility/ClassRegistryTest.php similarity index 100% rename from lib/Cake/tests/cases/Utility/ClassRegistryTest.php rename to lib/Cake/tests/Case/Utility/ClassRegistryTest.php diff --git a/lib/Cake/tests/cases/Utility/DebuggerTest.php b/lib/Cake/tests/Case/Utility/DebuggerTest.php similarity index 100% rename from lib/Cake/tests/cases/Utility/DebuggerTest.php rename to lib/Cake/tests/Case/Utility/DebuggerTest.php diff --git a/lib/Cake/tests/cases/Utility/FileTest.php b/lib/Cake/tests/Case/Utility/FileTest.php similarity index 100% rename from lib/Cake/tests/cases/Utility/FileTest.php rename to lib/Cake/tests/Case/Utility/FileTest.php diff --git a/lib/Cake/tests/cases/Utility/FolderTest.php b/lib/Cake/tests/Case/Utility/FolderTest.php similarity index 100% rename from lib/Cake/tests/cases/Utility/FolderTest.php rename to lib/Cake/tests/Case/Utility/FolderTest.php diff --git a/lib/Cake/tests/cases/Utility/InflectorTest.php b/lib/Cake/tests/Case/Utility/InflectorTest.php similarity index 100% rename from lib/Cake/tests/cases/Utility/InflectorTest.php rename to lib/Cake/tests/Case/Utility/InflectorTest.php diff --git a/lib/Cake/tests/cases/Utility/ObjectCollectionTest.php b/lib/Cake/tests/Case/Utility/ObjectCollectionTest.php similarity index 100% rename from lib/Cake/tests/cases/Utility/ObjectCollectionTest.php rename to lib/Cake/tests/Case/Utility/ObjectCollectionTest.php diff --git a/lib/Cake/tests/cases/Utility/SanitizeTest.php b/lib/Cake/tests/Case/Utility/SanitizeTest.php similarity index 100% rename from lib/Cake/tests/cases/Utility/SanitizeTest.php rename to lib/Cake/tests/Case/Utility/SanitizeTest.php diff --git a/lib/Cake/tests/cases/Utility/SecurityTest.php b/lib/Cake/tests/Case/Utility/SecurityTest.php similarity index 100% rename from lib/Cake/tests/cases/Utility/SecurityTest.php rename to lib/Cake/tests/Case/Utility/SecurityTest.php diff --git a/lib/Cake/tests/cases/Utility/SetTest.php b/lib/Cake/tests/Case/Utility/SetTest.php similarity index 100% rename from lib/Cake/tests/cases/Utility/SetTest.php rename to lib/Cake/tests/Case/Utility/SetTest.php diff --git a/lib/Cake/tests/cases/Utility/StringTest.php b/lib/Cake/tests/Case/Utility/StringTest.php similarity index 100% rename from lib/Cake/tests/cases/Utility/StringTest.php rename to lib/Cake/tests/Case/Utility/StringTest.php diff --git a/lib/Cake/tests/cases/Utility/ValidationTest.php b/lib/Cake/tests/Case/Utility/ValidationTest.php similarity index 100% rename from lib/Cake/tests/cases/Utility/ValidationTest.php rename to lib/Cake/tests/Case/Utility/ValidationTest.php diff --git a/lib/Cake/tests/cases/Utility/XmlTest.php b/lib/Cake/tests/Case/Utility/XmlTest.php similarity index 100% rename from lib/Cake/tests/cases/Utility/XmlTest.php rename to lib/Cake/tests/Case/Utility/XmlTest.php diff --git a/lib/Cake/tests/cases/View/Helper/CacheHelperTest.php b/lib/Cake/tests/Case/View/Helper/CacheHelperTest.php similarity index 100% rename from lib/Cake/tests/cases/View/Helper/CacheHelperTest.php rename to lib/Cake/tests/Case/View/Helper/CacheHelperTest.php diff --git a/lib/Cake/tests/cases/View/Helper/FormHelperTest.php b/lib/Cake/tests/Case/View/Helper/FormHelperTest.php similarity index 100% rename from lib/Cake/tests/cases/View/Helper/FormHelperTest.php rename to lib/Cake/tests/Case/View/Helper/FormHelperTest.php diff --git a/lib/Cake/tests/cases/View/Helper/HtmlHelperTest.php b/lib/Cake/tests/Case/View/Helper/HtmlHelperTest.php similarity index 100% rename from lib/Cake/tests/cases/View/Helper/HtmlHelperTest.php rename to lib/Cake/tests/Case/View/Helper/HtmlHelperTest.php diff --git a/lib/Cake/tests/cases/View/Helper/JqueryEngineHelperTest.php b/lib/Cake/tests/Case/View/Helper/JqueryEngineHelperTest.php similarity index 100% rename from lib/Cake/tests/cases/View/Helper/JqueryEngineHelperTest.php rename to lib/Cake/tests/Case/View/Helper/JqueryEngineHelperTest.php diff --git a/lib/Cake/tests/cases/View/Helper/JsHelperTest.php b/lib/Cake/tests/Case/View/Helper/JsHelperTest.php similarity index 100% rename from lib/Cake/tests/cases/View/Helper/JsHelperTest.php rename to lib/Cake/tests/Case/View/Helper/JsHelperTest.php diff --git a/lib/Cake/tests/cases/View/Helper/MootoolsEngineHelperTest.php b/lib/Cake/tests/Case/View/Helper/MootoolsEngineHelperTest.php similarity index 100% rename from lib/Cake/tests/cases/View/Helper/MootoolsEngineHelperTest.php rename to lib/Cake/tests/Case/View/Helper/MootoolsEngineHelperTest.php diff --git a/lib/Cake/tests/cases/View/Helper/NumberHelperTest.php b/lib/Cake/tests/Case/View/Helper/NumberHelperTest.php similarity index 100% rename from lib/Cake/tests/cases/View/Helper/NumberHelperTest.php rename to lib/Cake/tests/Case/View/Helper/NumberHelperTest.php diff --git a/lib/Cake/tests/cases/View/Helper/PaginatorHelperTest.php b/lib/Cake/tests/Case/View/Helper/PaginatorHelperTest.php similarity index 100% rename from lib/Cake/tests/cases/View/Helper/PaginatorHelperTest.php rename to lib/Cake/tests/Case/View/Helper/PaginatorHelperTest.php diff --git a/lib/Cake/tests/cases/View/Helper/PrototypeEngineHelperTest.php b/lib/Cake/tests/Case/View/Helper/PrototypeEngineHelperTest.php similarity index 100% rename from lib/Cake/tests/cases/View/Helper/PrototypeEngineHelperTest.php rename to lib/Cake/tests/Case/View/Helper/PrototypeEngineHelperTest.php diff --git a/lib/Cake/tests/cases/View/Helper/RssHelperTest.php b/lib/Cake/tests/Case/View/Helper/RssHelperTest.php similarity index 100% rename from lib/Cake/tests/cases/View/Helper/RssHelperTest.php rename to lib/Cake/tests/Case/View/Helper/RssHelperTest.php diff --git a/lib/Cake/tests/cases/View/Helper/SessionHelperTest.php b/lib/Cake/tests/Case/View/Helper/SessionHelperTest.php similarity index 100% rename from lib/Cake/tests/cases/View/Helper/SessionHelperTest.php rename to lib/Cake/tests/Case/View/Helper/SessionHelperTest.php diff --git a/lib/Cake/tests/cases/View/Helper/TextHelperTest.php b/lib/Cake/tests/Case/View/Helper/TextHelperTest.php similarity index 100% rename from lib/Cake/tests/cases/View/Helper/TextHelperTest.php rename to lib/Cake/tests/Case/View/Helper/TextHelperTest.php diff --git a/lib/Cake/tests/cases/View/Helper/TimeHelperTest.php b/lib/Cake/tests/Case/View/Helper/TimeHelperTest.php similarity index 100% rename from lib/Cake/tests/cases/View/Helper/TimeHelperTest.php rename to lib/Cake/tests/Case/View/Helper/TimeHelperTest.php diff --git a/lib/Cake/tests/cases/View/HelperCollectionTest.php b/lib/Cake/tests/Case/View/HelperCollectionTest.php similarity index 100% rename from lib/Cake/tests/cases/View/HelperCollectionTest.php rename to lib/Cake/tests/Case/View/HelperCollectionTest.php diff --git a/lib/Cake/tests/cases/View/HelperTest.php b/lib/Cake/tests/Case/View/HelperTest.php similarity index 100% rename from lib/Cake/tests/cases/View/HelperTest.php rename to lib/Cake/tests/Case/View/HelperTest.php diff --git a/lib/Cake/tests/cases/View/MediaViewTest.php b/lib/Cake/tests/Case/View/MediaViewTest.php similarity index 100% rename from lib/Cake/tests/cases/View/MediaViewTest.php rename to lib/Cake/tests/Case/View/MediaViewTest.php diff --git a/lib/Cake/tests/cases/View/ThemeViewTest.php b/lib/Cake/tests/Case/View/ThemeViewTest.php similarity index 100% rename from lib/Cake/tests/cases/View/ThemeViewTest.php rename to lib/Cake/tests/Case/View/ThemeViewTest.php diff --git a/lib/Cake/tests/cases/View/ViewTest.php b/lib/Cake/tests/Case/View/ViewTest.php similarity index 100% rename from lib/Cake/tests/cases/View/ViewTest.php rename to lib/Cake/tests/Case/View/ViewTest.php diff --git a/lib/Cake/tests/fixtures/AccountFixture.php b/lib/Cake/tests/Fixture/AccountFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/AccountFixture.php rename to lib/Cake/tests/Fixture/AccountFixture.php diff --git a/lib/Cake/tests/fixtures/AcoActionFixture.php b/lib/Cake/tests/Fixture/AcoActionFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/AcoActionFixture.php rename to lib/Cake/tests/Fixture/AcoActionFixture.php diff --git a/lib/Cake/tests/fixtures/AcoFixture.php b/lib/Cake/tests/Fixture/AcoFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/AcoFixture.php rename to lib/Cake/tests/Fixture/AcoFixture.php diff --git a/lib/Cake/tests/fixtures/AcoTwoFixture.php b/lib/Cake/tests/Fixture/AcoTwoFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/AcoTwoFixture.php rename to lib/Cake/tests/Fixture/AcoTwoFixture.php diff --git a/lib/Cake/tests/fixtures/AdFixture.php b/lib/Cake/tests/Fixture/AdFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/AdFixture.php rename to lib/Cake/tests/Fixture/AdFixture.php diff --git a/lib/Cake/tests/fixtures/AdvertisementFixture.php b/lib/Cake/tests/Fixture/AdvertisementFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/AdvertisementFixture.php rename to lib/Cake/tests/Fixture/AdvertisementFixture.php diff --git a/lib/Cake/tests/fixtures/AfterTreeFixture.php b/lib/Cake/tests/Fixture/AfterTreeFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/AfterTreeFixture.php rename to lib/Cake/tests/Fixture/AfterTreeFixture.php diff --git a/lib/Cake/tests/fixtures/AnotherArticleFixture.php b/lib/Cake/tests/Fixture/AnotherArticleFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/AnotherArticleFixture.php rename to lib/Cake/tests/Fixture/AnotherArticleFixture.php diff --git a/lib/Cake/tests/fixtures/AppleFixture.php b/lib/Cake/tests/Fixture/AppleFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/AppleFixture.php rename to lib/Cake/tests/Fixture/AppleFixture.php diff --git a/lib/Cake/tests/fixtures/AroFixture.php b/lib/Cake/tests/Fixture/AroFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/AroFixture.php rename to lib/Cake/tests/Fixture/AroFixture.php diff --git a/lib/Cake/tests/fixtures/AroTwoFixture.php b/lib/Cake/tests/Fixture/AroTwoFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/AroTwoFixture.php rename to lib/Cake/tests/Fixture/AroTwoFixture.php diff --git a/lib/Cake/tests/fixtures/ArosAcoFixture.php b/lib/Cake/tests/Fixture/ArosAcoFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/ArosAcoFixture.php rename to lib/Cake/tests/Fixture/ArosAcoFixture.php diff --git a/lib/Cake/tests/fixtures/ArosAcoTwoFixture.php b/lib/Cake/tests/Fixture/ArosAcoTwoFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/ArosAcoTwoFixture.php rename to lib/Cake/tests/Fixture/ArosAcoTwoFixture.php diff --git a/lib/Cake/tests/fixtures/ArticleFeaturedFixture.php b/lib/Cake/tests/Fixture/ArticleFeaturedFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/ArticleFeaturedFixture.php rename to lib/Cake/tests/Fixture/ArticleFeaturedFixture.php diff --git a/lib/Cake/tests/fixtures/ArticleFeaturedsTagsFixture.php b/lib/Cake/tests/Fixture/ArticleFeaturedsTagsFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/ArticleFeaturedsTagsFixture.php rename to lib/Cake/tests/Fixture/ArticleFeaturedsTagsFixture.php diff --git a/lib/Cake/tests/fixtures/ArticleFixture.php b/lib/Cake/tests/Fixture/ArticleFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/ArticleFixture.php rename to lib/Cake/tests/Fixture/ArticleFixture.php diff --git a/lib/Cake/tests/fixtures/ArticlesTagFixture.php b/lib/Cake/tests/Fixture/ArticlesTagFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/ArticlesTagFixture.php rename to lib/Cake/tests/Fixture/ArticlesTagFixture.php diff --git a/lib/Cake/tests/fixtures/AssertTagsTestCase.php b/lib/Cake/tests/Fixture/AssertTagsTestCase.php similarity index 100% rename from lib/Cake/tests/fixtures/AssertTagsTestCase.php rename to lib/Cake/tests/Fixture/AssertTagsTestCase.php diff --git a/lib/Cake/tests/fixtures/AttachmentFixture.php b/lib/Cake/tests/Fixture/AttachmentFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/AttachmentFixture.php rename to lib/Cake/tests/Fixture/AttachmentFixture.php diff --git a/lib/Cake/tests/fixtures/AuthUserCustomFieldFixture.php b/lib/Cake/tests/Fixture/AuthUserCustomFieldFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/AuthUserCustomFieldFixture.php rename to lib/Cake/tests/Fixture/AuthUserCustomFieldFixture.php diff --git a/lib/Cake/tests/fixtures/AuthUserFixture.php b/lib/Cake/tests/Fixture/AuthUserFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/AuthUserFixture.php rename to lib/Cake/tests/Fixture/AuthUserFixture.php diff --git a/lib/Cake/tests/fixtures/AuthorFixture.php b/lib/Cake/tests/Fixture/AuthorFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/AuthorFixture.php rename to lib/Cake/tests/Fixture/AuthorFixture.php diff --git a/lib/Cake/tests/fixtures/BakeArticleFixture.php b/lib/Cake/tests/Fixture/BakeArticleFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/BakeArticleFixture.php rename to lib/Cake/tests/Fixture/BakeArticleFixture.php diff --git a/lib/Cake/tests/fixtures/BakeArticlesBakeTagFixture.php b/lib/Cake/tests/Fixture/BakeArticlesBakeTagFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/BakeArticlesBakeTagFixture.php rename to lib/Cake/tests/Fixture/BakeArticlesBakeTagFixture.php diff --git a/lib/Cake/tests/fixtures/BakeCommentFixture.php b/lib/Cake/tests/Fixture/BakeCommentFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/BakeCommentFixture.php rename to lib/Cake/tests/Fixture/BakeCommentFixture.php diff --git a/lib/Cake/tests/fixtures/BakeTagFixture.php b/lib/Cake/tests/Fixture/BakeTagFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/BakeTagFixture.php rename to lib/Cake/tests/Fixture/BakeTagFixture.php diff --git a/lib/Cake/tests/fixtures/BasketFixture.php b/lib/Cake/tests/Fixture/BasketFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/BasketFixture.php rename to lib/Cake/tests/Fixture/BasketFixture.php diff --git a/lib/Cake/tests/fixtures/BidFixture.php b/lib/Cake/tests/Fixture/BidFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/BidFixture.php rename to lib/Cake/tests/Fixture/BidFixture.php diff --git a/lib/Cake/tests/fixtures/BinaryTestFixture.php b/lib/Cake/tests/Fixture/BinaryTestFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/BinaryTestFixture.php rename to lib/Cake/tests/Fixture/BinaryTestFixture.php diff --git a/lib/Cake/tests/fixtures/BookFixture.php b/lib/Cake/tests/Fixture/BookFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/BookFixture.php rename to lib/Cake/tests/Fixture/BookFixture.php diff --git a/lib/Cake/tests/fixtures/CacheTestModelFixture.php b/lib/Cake/tests/Fixture/CacheTestModelFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/CacheTestModelFixture.php rename to lib/Cake/tests/Fixture/CacheTestModelFixture.php diff --git a/lib/Cake/tests/fixtures/CallbackFixture.php b/lib/Cake/tests/Fixture/CallbackFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/CallbackFixture.php rename to lib/Cake/tests/Fixture/CallbackFixture.php diff --git a/lib/Cake/tests/fixtures/CampaignFixture.php b/lib/Cake/tests/Fixture/CampaignFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/CampaignFixture.php rename to lib/Cake/tests/Fixture/CampaignFixture.php diff --git a/lib/Cake/tests/fixtures/CategoryFixture.php b/lib/Cake/tests/Fixture/CategoryFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/CategoryFixture.php rename to lib/Cake/tests/Fixture/CategoryFixture.php diff --git a/lib/Cake/tests/fixtures/CategoryThreadFixture.php b/lib/Cake/tests/Fixture/CategoryThreadFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/CategoryThreadFixture.php rename to lib/Cake/tests/Fixture/CategoryThreadFixture.php diff --git a/lib/Cake/tests/fixtures/CdFixture.php b/lib/Cake/tests/Fixture/CdFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/CdFixture.php rename to lib/Cake/tests/Fixture/CdFixture.php diff --git a/lib/Cake/tests/fixtures/CommentFixture.php b/lib/Cake/tests/Fixture/CommentFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/CommentFixture.php rename to lib/Cake/tests/Fixture/CommentFixture.php diff --git a/lib/Cake/tests/fixtures/ContentAccountFixture.php b/lib/Cake/tests/Fixture/ContentAccountFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/ContentAccountFixture.php rename to lib/Cake/tests/Fixture/ContentAccountFixture.php diff --git a/lib/Cake/tests/fixtures/ContentFixture.php b/lib/Cake/tests/Fixture/ContentFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/ContentFixture.php rename to lib/Cake/tests/Fixture/ContentFixture.php diff --git a/lib/Cake/tests/fixtures/CounterCachePostFixture.php b/lib/Cake/tests/Fixture/CounterCachePostFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/CounterCachePostFixture.php rename to lib/Cake/tests/Fixture/CounterCachePostFixture.php diff --git a/lib/Cake/tests/fixtures/CounterCachePostNonstandardPrimaryKeyFixture.php b/lib/Cake/tests/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/CounterCachePostNonstandardPrimaryKeyFixture.php rename to lib/Cake/tests/Fixture/CounterCachePostNonstandardPrimaryKeyFixture.php diff --git a/lib/Cake/tests/fixtures/CounterCacheUserFixture.php b/lib/Cake/tests/Fixture/CounterCacheUserFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/CounterCacheUserFixture.php rename to lib/Cake/tests/Fixture/CounterCacheUserFixture.php diff --git a/lib/Cake/tests/fixtures/CounterCacheUserNonstandardPrimaryKeyFixture.php b/lib/Cake/tests/Fixture/CounterCacheUserNonstandardPrimaryKeyFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/CounterCacheUserNonstandardPrimaryKeyFixture.php rename to lib/Cake/tests/Fixture/CounterCacheUserNonstandardPrimaryKeyFixture.php diff --git a/lib/Cake/tests/fixtures/DataTestFixture.php b/lib/Cake/tests/Fixture/DataTestFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/DataTestFixture.php rename to lib/Cake/tests/Fixture/DataTestFixture.php diff --git a/lib/Cake/tests/fixtures/DatatypeFixture.php b/lib/Cake/tests/Fixture/DatatypeFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/DatatypeFixture.php rename to lib/Cake/tests/Fixture/DatatypeFixture.php diff --git a/lib/Cake/tests/fixtures/DependencyFixture.php b/lib/Cake/tests/Fixture/DependencyFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/DependencyFixture.php rename to lib/Cake/tests/Fixture/DependencyFixture.php diff --git a/lib/Cake/tests/fixtures/DeviceFixture.php b/lib/Cake/tests/Fixture/DeviceFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/DeviceFixture.php rename to lib/Cake/tests/Fixture/DeviceFixture.php diff --git a/lib/Cake/tests/fixtures/DeviceTypeCategoryFixture.php b/lib/Cake/tests/Fixture/DeviceTypeCategoryFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/DeviceTypeCategoryFixture.php rename to lib/Cake/tests/Fixture/DeviceTypeCategoryFixture.php diff --git a/lib/Cake/tests/fixtures/DeviceTypeFixture.php b/lib/Cake/tests/Fixture/DeviceTypeFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/DeviceTypeFixture.php rename to lib/Cake/tests/Fixture/DeviceTypeFixture.php diff --git a/lib/Cake/tests/fixtures/DocumentDirectoryFixture.php b/lib/Cake/tests/Fixture/DocumentDirectoryFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/DocumentDirectoryFixture.php rename to lib/Cake/tests/Fixture/DocumentDirectoryFixture.php diff --git a/lib/Cake/tests/fixtures/DocumentFixture.php b/lib/Cake/tests/Fixture/DocumentFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/DocumentFixture.php rename to lib/Cake/tests/Fixture/DocumentFixture.php diff --git a/lib/Cake/tests/fixtures/ExteriorTypeCategoryFixture.php b/lib/Cake/tests/Fixture/ExteriorTypeCategoryFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/ExteriorTypeCategoryFixture.php rename to lib/Cake/tests/Fixture/ExteriorTypeCategoryFixture.php diff --git a/lib/Cake/tests/fixtures/FeatureSetFixture.php b/lib/Cake/tests/Fixture/FeatureSetFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/FeatureSetFixture.php rename to lib/Cake/tests/Fixture/FeatureSetFixture.php diff --git a/lib/Cake/tests/fixtures/FeaturedFixture.php b/lib/Cake/tests/Fixture/FeaturedFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/FeaturedFixture.php rename to lib/Cake/tests/Fixture/FeaturedFixture.php diff --git a/lib/Cake/tests/fixtures/FilmFileFixture.php b/lib/Cake/tests/Fixture/FilmFileFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/FilmFileFixture.php rename to lib/Cake/tests/Fixture/FilmFileFixture.php diff --git a/lib/Cake/tests/fixtures/FixturizedTestCase.php b/lib/Cake/tests/Fixture/FixturizedTestCase.php similarity index 100% rename from lib/Cake/tests/fixtures/FixturizedTestCase.php rename to lib/Cake/tests/Fixture/FixturizedTestCase.php diff --git a/lib/Cake/tests/fixtures/FlagTreeFixture.php b/lib/Cake/tests/Fixture/FlagTreeFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/FlagTreeFixture.php rename to lib/Cake/tests/Fixture/FlagTreeFixture.php diff --git a/lib/Cake/tests/fixtures/FruitFixture.php b/lib/Cake/tests/Fixture/FruitFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/FruitFixture.php rename to lib/Cake/tests/Fixture/FruitFixture.php diff --git a/lib/Cake/tests/fixtures/FruitsUuidTagFixture.php b/lib/Cake/tests/Fixture/FruitsUuidTagFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/FruitsUuidTagFixture.php rename to lib/Cake/tests/Fixture/FruitsUuidTagFixture.php diff --git a/lib/Cake/tests/fixtures/GroupUpdateAllFixture.php b/lib/Cake/tests/Fixture/GroupUpdateAllFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/GroupUpdateAllFixture.php rename to lib/Cake/tests/Fixture/GroupUpdateAllFixture.php diff --git a/lib/Cake/tests/fixtures/HomeFixture.php b/lib/Cake/tests/Fixture/HomeFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/HomeFixture.php rename to lib/Cake/tests/Fixture/HomeFixture.php diff --git a/lib/Cake/tests/fixtures/ImageFixture.php b/lib/Cake/tests/Fixture/ImageFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/ImageFixture.php rename to lib/Cake/tests/Fixture/ImageFixture.php diff --git a/lib/Cake/tests/fixtures/ItemFixture.php b/lib/Cake/tests/Fixture/ItemFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/ItemFixture.php rename to lib/Cake/tests/Fixture/ItemFixture.php diff --git a/lib/Cake/tests/fixtures/ItemsPortfolioFixture.php b/lib/Cake/tests/Fixture/ItemsPortfolioFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/ItemsPortfolioFixture.php rename to lib/Cake/tests/Fixture/ItemsPortfolioFixture.php diff --git a/lib/Cake/tests/fixtures/JoinABFixture.php b/lib/Cake/tests/Fixture/JoinABFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/JoinABFixture.php rename to lib/Cake/tests/Fixture/JoinABFixture.php diff --git a/lib/Cake/tests/fixtures/JoinACFixture.php b/lib/Cake/tests/Fixture/JoinACFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/JoinACFixture.php rename to lib/Cake/tests/Fixture/JoinACFixture.php diff --git a/lib/Cake/tests/fixtures/JoinAFixture.php b/lib/Cake/tests/Fixture/JoinAFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/JoinAFixture.php rename to lib/Cake/tests/Fixture/JoinAFixture.php diff --git a/lib/Cake/tests/fixtures/JoinBFixture.php b/lib/Cake/tests/Fixture/JoinBFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/JoinBFixture.php rename to lib/Cake/tests/Fixture/JoinBFixture.php diff --git a/lib/Cake/tests/fixtures/JoinCFixture.php b/lib/Cake/tests/Fixture/JoinCFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/JoinCFixture.php rename to lib/Cake/tests/Fixture/JoinCFixture.php diff --git a/lib/Cake/tests/fixtures/JoinThingFixture.php b/lib/Cake/tests/Fixture/JoinThingFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/JoinThingFixture.php rename to lib/Cake/tests/Fixture/JoinThingFixture.php diff --git a/lib/Cake/tests/fixtures/MessageFixture.php b/lib/Cake/tests/Fixture/MessageFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/MessageFixture.php rename to lib/Cake/tests/Fixture/MessageFixture.php diff --git a/lib/Cake/tests/fixtures/MyCategoriesMyProductsFixture.php b/lib/Cake/tests/Fixture/MyCategoriesMyProductsFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/MyCategoriesMyProductsFixture.php rename to lib/Cake/tests/Fixture/MyCategoriesMyProductsFixture.php diff --git a/lib/Cake/tests/fixtures/MyCategoriesMyUsersFixture.php b/lib/Cake/tests/Fixture/MyCategoriesMyUsersFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/MyCategoriesMyUsersFixture.php rename to lib/Cake/tests/Fixture/MyCategoriesMyUsersFixture.php diff --git a/lib/Cake/tests/fixtures/MyCategoryFixture.php b/lib/Cake/tests/Fixture/MyCategoryFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/MyCategoryFixture.php rename to lib/Cake/tests/Fixture/MyCategoryFixture.php diff --git a/lib/Cake/tests/fixtures/MyProductFixture.php b/lib/Cake/tests/Fixture/MyProductFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/MyProductFixture.php rename to lib/Cake/tests/Fixture/MyProductFixture.php diff --git a/lib/Cake/tests/fixtures/MyUserFixture.php b/lib/Cake/tests/Fixture/MyUserFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/MyUserFixture.php rename to lib/Cake/tests/Fixture/MyUserFixture.php diff --git a/lib/Cake/tests/fixtures/NodeFixture.php b/lib/Cake/tests/Fixture/NodeFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/NodeFixture.php rename to lib/Cake/tests/Fixture/NodeFixture.php diff --git a/lib/Cake/tests/fixtures/NumberTreeFixture.php b/lib/Cake/tests/Fixture/NumberTreeFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/NumberTreeFixture.php rename to lib/Cake/tests/Fixture/NumberTreeFixture.php diff --git a/lib/Cake/tests/fixtures/NumberTreeTwoFixture.php b/lib/Cake/tests/Fixture/NumberTreeTwoFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/NumberTreeTwoFixture.php rename to lib/Cake/tests/Fixture/NumberTreeTwoFixture.php diff --git a/lib/Cake/tests/fixtures/NumericArticleFixture.php b/lib/Cake/tests/Fixture/NumericArticleFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/NumericArticleFixture.php rename to lib/Cake/tests/Fixture/NumericArticleFixture.php diff --git a/lib/Cake/tests/fixtures/OverallFavoriteFixture.php b/lib/Cake/tests/Fixture/OverallFavoriteFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/OverallFavoriteFixture.php rename to lib/Cake/tests/Fixture/OverallFavoriteFixture.php diff --git a/lib/Cake/tests/fixtures/PersonFixture.php b/lib/Cake/tests/Fixture/PersonFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/PersonFixture.php rename to lib/Cake/tests/Fixture/PersonFixture.php diff --git a/lib/Cake/tests/fixtures/PortfolioFixture.php b/lib/Cake/tests/Fixture/PortfolioFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/PortfolioFixture.php rename to lib/Cake/tests/Fixture/PortfolioFixture.php diff --git a/lib/Cake/tests/fixtures/PostFixture.php b/lib/Cake/tests/Fixture/PostFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/PostFixture.php rename to lib/Cake/tests/Fixture/PostFixture.php diff --git a/lib/Cake/tests/fixtures/PostsTagFixture.php b/lib/Cake/tests/Fixture/PostsTagFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/PostsTagFixture.php rename to lib/Cake/tests/Fixture/PostsTagFixture.php diff --git a/lib/Cake/tests/fixtures/PrimaryModelFixture.php b/lib/Cake/tests/Fixture/PrimaryModelFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/PrimaryModelFixture.php rename to lib/Cake/tests/Fixture/PrimaryModelFixture.php diff --git a/lib/Cake/tests/fixtures/ProductFixture.php b/lib/Cake/tests/Fixture/ProductFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/ProductFixture.php rename to lib/Cake/tests/Fixture/ProductFixture.php diff --git a/lib/Cake/tests/fixtures/ProductUpdateAllFixture.php b/lib/Cake/tests/Fixture/ProductUpdateAllFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/ProductUpdateAllFixture.php rename to lib/Cake/tests/Fixture/ProductUpdateAllFixture.php diff --git a/lib/Cake/tests/fixtures/ProjectFixture.php b/lib/Cake/tests/Fixture/ProjectFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/ProjectFixture.php rename to lib/Cake/tests/Fixture/ProjectFixture.php diff --git a/lib/Cake/tests/fixtures/SampleFixture.php b/lib/Cake/tests/Fixture/SampleFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/SampleFixture.php rename to lib/Cake/tests/Fixture/SampleFixture.php diff --git a/lib/Cake/tests/fixtures/SecondaryModelFixture.php b/lib/Cake/tests/Fixture/SecondaryModelFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/SecondaryModelFixture.php rename to lib/Cake/tests/Fixture/SecondaryModelFixture.php diff --git a/lib/Cake/tests/fixtures/SessionFixture.php b/lib/Cake/tests/Fixture/SessionFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/SessionFixture.php rename to lib/Cake/tests/Fixture/SessionFixture.php diff --git a/lib/Cake/tests/fixtures/SomethingElseFixture.php b/lib/Cake/tests/Fixture/SomethingElseFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/SomethingElseFixture.php rename to lib/Cake/tests/Fixture/SomethingElseFixture.php diff --git a/lib/Cake/tests/fixtures/SomethingFixture.php b/lib/Cake/tests/Fixture/SomethingFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/SomethingFixture.php rename to lib/Cake/tests/Fixture/SomethingFixture.php diff --git a/lib/Cake/tests/fixtures/StoriesTagFixture.php b/lib/Cake/tests/Fixture/StoriesTagFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/StoriesTagFixture.php rename to lib/Cake/tests/Fixture/StoriesTagFixture.php diff --git a/lib/Cake/tests/fixtures/StoryFixture.php b/lib/Cake/tests/Fixture/StoryFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/StoryFixture.php rename to lib/Cake/tests/Fixture/StoryFixture.php diff --git a/lib/Cake/tests/fixtures/SyfileFixture.php b/lib/Cake/tests/Fixture/SyfileFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/SyfileFixture.php rename to lib/Cake/tests/Fixture/SyfileFixture.php diff --git a/lib/Cake/tests/fixtures/TagFixture.php b/lib/Cake/tests/Fixture/TagFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/TagFixture.php rename to lib/Cake/tests/Fixture/TagFixture.php diff --git a/lib/Cake/tests/fixtures/TestPluginArticleFixture.php b/lib/Cake/tests/Fixture/TestPluginArticleFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/TestPluginArticleFixture.php rename to lib/Cake/tests/Fixture/TestPluginArticleFixture.php diff --git a/lib/Cake/tests/fixtures/TestPluginCommentFixture.php b/lib/Cake/tests/Fixture/TestPluginCommentFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/TestPluginCommentFixture.php rename to lib/Cake/tests/Fixture/TestPluginCommentFixture.php diff --git a/lib/Cake/tests/fixtures/ThePaperMonkiesFixture.php b/lib/Cake/tests/Fixture/ThePaperMonkiesFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/ThePaperMonkiesFixture.php rename to lib/Cake/tests/Fixture/ThePaperMonkiesFixture.php diff --git a/lib/Cake/tests/fixtures/ThreadFixture.php b/lib/Cake/tests/Fixture/ThreadFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/ThreadFixture.php rename to lib/Cake/tests/Fixture/ThreadFixture.php diff --git a/lib/Cake/tests/fixtures/TranslateArticleFixture.php b/lib/Cake/tests/Fixture/TranslateArticleFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/TranslateArticleFixture.php rename to lib/Cake/tests/Fixture/TranslateArticleFixture.php diff --git a/lib/Cake/tests/fixtures/TranslateFixture.php b/lib/Cake/tests/Fixture/TranslateFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/TranslateFixture.php rename to lib/Cake/tests/Fixture/TranslateFixture.php diff --git a/lib/Cake/tests/fixtures/TranslateTableFixture.php b/lib/Cake/tests/Fixture/TranslateTableFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/TranslateTableFixture.php rename to lib/Cake/tests/Fixture/TranslateTableFixture.php diff --git a/lib/Cake/tests/fixtures/TranslateWithPrefixFixture.php b/lib/Cake/tests/Fixture/TranslateWithPrefixFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/TranslateWithPrefixFixture.php rename to lib/Cake/tests/Fixture/TranslateWithPrefixFixture.php diff --git a/lib/Cake/tests/fixtures/TranslatedArticleFixture.php b/lib/Cake/tests/Fixture/TranslatedArticleFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/TranslatedArticleFixture.php rename to lib/Cake/tests/Fixture/TranslatedArticleFixture.php diff --git a/lib/Cake/tests/fixtures/TranslatedItemFixture.php b/lib/Cake/tests/Fixture/TranslatedItemFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/TranslatedItemFixture.php rename to lib/Cake/tests/Fixture/TranslatedItemFixture.php diff --git a/lib/Cake/tests/fixtures/UnconventionalTreeFixture.php b/lib/Cake/tests/Fixture/UnconventionalTreeFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/UnconventionalTreeFixture.php rename to lib/Cake/tests/Fixture/UnconventionalTreeFixture.php diff --git a/lib/Cake/tests/fixtures/UnderscoreFieldFixture.php b/lib/Cake/tests/Fixture/UnderscoreFieldFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/UnderscoreFieldFixture.php rename to lib/Cake/tests/Fixture/UnderscoreFieldFixture.php diff --git a/lib/Cake/tests/fixtures/UserFixture.php b/lib/Cake/tests/Fixture/UserFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/UserFixture.php rename to lib/Cake/tests/Fixture/UserFixture.php diff --git a/lib/Cake/tests/fixtures/UuidFixture.php b/lib/Cake/tests/Fixture/UuidFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/UuidFixture.php rename to lib/Cake/tests/Fixture/UuidFixture.php diff --git a/lib/Cake/tests/fixtures/UuidTagFixture.php b/lib/Cake/tests/Fixture/UuidTagFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/UuidTagFixture.php rename to lib/Cake/tests/Fixture/UuidTagFixture.php diff --git a/lib/Cake/tests/fixtures/UuidTreeFixture.php b/lib/Cake/tests/Fixture/UuidTreeFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/UuidTreeFixture.php rename to lib/Cake/tests/Fixture/UuidTreeFixture.php diff --git a/lib/Cake/tests/fixtures/UuiditemFixture.php b/lib/Cake/tests/Fixture/UuiditemFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/UuiditemFixture.php rename to lib/Cake/tests/Fixture/UuiditemFixture.php diff --git a/lib/Cake/tests/fixtures/UuiditemsUuidportfolioFixture.php b/lib/Cake/tests/Fixture/UuiditemsUuidportfolioFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/UuiditemsUuidportfolioFixture.php rename to lib/Cake/tests/Fixture/UuiditemsUuidportfolioFixture.php diff --git a/lib/Cake/tests/fixtures/UuiditemsUuidportfolioNumericidFixture.php b/lib/Cake/tests/Fixture/UuiditemsUuidportfolioNumericidFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/UuiditemsUuidportfolioNumericidFixture.php rename to lib/Cake/tests/Fixture/UuiditemsUuidportfolioNumericidFixture.php diff --git a/lib/Cake/tests/fixtures/UuidportfolioFixture.php b/lib/Cake/tests/Fixture/UuidportfolioFixture.php similarity index 100% rename from lib/Cake/tests/fixtures/UuidportfolioFixture.php rename to lib/Cake/tests/Fixture/UuidportfolioFixture.php diff --git a/lib/Cake/tests/fixtures/rss.xml b/lib/Cake/tests/Fixture/rss.xml similarity index 100% rename from lib/Cake/tests/fixtures/rss.xml rename to lib/Cake/tests/Fixture/rss.xml diff --git a/lib/Cake/tests/fixtures/sample.xml b/lib/Cake/tests/Fixture/sample.xml similarity index 100% rename from lib/Cake/tests/fixtures/sample.xml rename to lib/Cake/tests/Fixture/sample.xml diff --git a/lib/Cake/tests/fixtures/soap_request.xml b/lib/Cake/tests/Fixture/soap_request.xml similarity index 100% rename from lib/Cake/tests/fixtures/soap_request.xml rename to lib/Cake/tests/Fixture/soap_request.xml diff --git a/lib/Cake/tests/fixtures/soap_response.xml b/lib/Cake/tests/Fixture/soap_response.xml similarity index 100% rename from lib/Cake/tests/fixtures/soap_response.xml rename to lib/Cake/tests/Fixture/soap_response.xml