diff --git a/app/views/tests/index.thtml b/app/views/tests/index.thtml new file mode 100644 index 000000000..e5f845bbf --- /dev/null +++ b/app/views/tests/index.thtml @@ -0,0 +1,4 @@ + diff --git a/libs/model.php b/libs/model.php index f0fc0a76c..3ac07c234 100644 --- a/libs/model.php +++ b/libs/model.php @@ -1526,11 +1526,10 @@ class Model extends Object * @return True if the input string ends in "_id", else false. */ function isForeignKey( $field ) { - // get the length of the field. - $length = strlen( $field ); - - // if a reverse search for the string _id reveals that this string appears three characters from the end, then this is a foreign key. - if( strrpos( $field, "_id" ) == $length - 3 ) { + + // search for the string _id reveals that this string appears three characters from the end, then this is a foreign key. + if( substr($field, -3) === '_id' ) + { return true; } return false; diff --git a/libs/scaffold.php b/libs/scaffold.php index 6734aa256..584faf570 100644 --- a/libs/scaffold.php +++ b/libs/scaffold.php @@ -162,7 +162,6 @@ class Scaffold extends Object { */ function scaffoldList($params) { - $model = $this->model; $this->controllerClass->set('fieldNames', $this->controllerClass->generateFieldNames(null,false) ); $this->controllerClass->set('data', $this->controllerClass->models[$this->model]->findAll()); $this->controllerClass->render($this->actionView, '', LIBS.'controllers'.DS.'templates'.DS.'scaffolds'.DS.'list.thtml'); diff --git a/tests/caketest.config.ini b/tests/caketest.config.ini deleted file mode 100644 index 992765b42..000000000 --- a/tests/caketest.config.ini +++ /dev/null @@ -1,27 +0,0 @@ -;========================================================================= -; Cake Test Suite configuration file -; -; License http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License -; -; $Id$ -; $Date$ -; $LastChangedBy$ -;========================================================================= - - -[paths] -TEST_CASES = cases -TEST_GROUPS = groups - -; Modify these values -TEST_HTTP_PATH = http://somedomain/tests/cases/ -CAKE_EXAMPLES_HTTP_PATH = http://somedomain/examples - -; For remote tests -REMOTE_TEST_HTTP_PATH = http://somedomain/tests/index.php - -; This is set for subversion repository layout currently -; each developers sandbox should resolve to path below properly - -[simpletest] -library_path = ../../../../vendor/simpletest/ diff --git a/tests/caketest.config.php b/tests/caketest.config.php deleted file mode 100644 index 11834f83d..000000000 --- a/tests/caketest.config.php +++ /dev/null @@ -1,45 +0,0 @@ - - * Copyright (c) 2005, CakePHP Test Suite Authors/Developers - * - * Author(s): Larry E. Masters aka PhpNut - * Kamil Dzielinski aka Brego - * - * Licensed under The Open Group Test Suite License - * Redistributions of files must retain the above copyright notice. - * - * @filesource - * @author CakePHP Test Suite Authors/Developers - * @copyright Copyright (c) 2005, CakePHP Test Suite Authors/Developers - * @link https://trac.cakephp.org/wiki/TestSuite/Authors/ Authors/Developers - * @package test_suite - * @since CakePHP Test Suite v 1.0.0.0 - * @version $Revision$ - * @modifiedby $LastChangedBy$ - * @lastmodified $Date$ - * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License - */ - -/** Cake SimpleTest config file - * - * Set the path to the simpletest package. - * The default define: - * ('SIMPLE_TEST', '../../../../vendor/simpletest/'); - * links SimpleTest to each developers sandbox. - * - * This must be changed by endusers wishing to run test suite - * - */ - -define('SIMPLE_TEST', '../../../../vendor/simpletest/'); - -?> \ No newline at end of file diff --git a/tests/cases/app/apis/apis.test.php b/tests/core/cases/app/apis/apis.test.php similarity index 100% rename from tests/cases/app/apis/apis.test.php rename to tests/core/cases/app/apis/apis.test.php diff --git a/tests/cases/app/app_controller.test.php b/tests/core/cases/app/app_controller.test.php similarity index 100% rename from tests/cases/app/app_controller.test.php rename to tests/core/cases/app/app_controller.test.php diff --git a/tests/cases/app/app_model.test.php b/tests/core/cases/app/app_model.test.php similarity index 100% rename from tests/cases/app/app_model.test.php rename to tests/core/cases/app/app_model.test.php diff --git a/tests/cases/app/controllers/pages_controller.test..php b/tests/core/cases/app/controllers/pages_controller.test..php similarity index 100% rename from tests/cases/app/controllers/pages_controller.test..php rename to tests/core/cases/app/controllers/pages_controller.test..php diff --git a/tests/cases/app/helpers/pages_helper.test.php b/tests/core/cases/app/helpers/pages_helper.test.php similarity index 100% rename from tests/cases/app/helpers/pages_helper.test.php rename to tests/core/cases/app/helpers/pages_helper.test.php diff --git a/tests/cases/app/models/models.test.php b/tests/core/cases/app/models/models.test.php similarity index 100% rename from tests/cases/app/models/models.test.php rename to tests/core/cases/app/models/models.test.php diff --git a/tests/cases/app/views/errors/missing_action.test.php b/tests/core/cases/app/views/errors/missing_action.test.php similarity index 100% rename from tests/cases/app/views/errors/missing_action.test.php rename to tests/core/cases/app/views/errors/missing_action.test.php diff --git a/tests/cases/app/views/errors/missing_controller.test.php b/tests/core/cases/app/views/errors/missing_controller.test.php similarity index 100% rename from tests/cases/app/views/errors/missing_controller.test.php rename to tests/core/cases/app/views/errors/missing_controller.test.php diff --git a/tests/cases/app/views/errors/missing_view.test.php b/tests/core/cases/app/views/errors/missing_view.test.php similarity index 100% rename from tests/cases/app/views/errors/missing_view.test.php rename to tests/core/cases/app/views/errors/missing_view.test.php diff --git a/tests/cases/app/views/layouts/ajax.test.php b/tests/core/cases/app/views/layouts/ajax.test.php similarity index 100% rename from tests/cases/app/views/layouts/ajax.test.php rename to tests/core/cases/app/views/layouts/ajax.test.php diff --git a/tests/cases/app/views/layouts/default.test.php b/tests/core/cases/app/views/layouts/default.test.php similarity index 100% rename from tests/cases/app/views/layouts/default.test.php rename to tests/core/cases/app/views/layouts/default.test.php diff --git a/tests/cases/app/views/layouts/error.test.php b/tests/core/cases/app/views/layouts/error.test.php similarity index 100% rename from tests/cases/app/views/layouts/error.test.php rename to tests/core/cases/app/views/layouts/error.test.php diff --git a/tests/cases/app/views/layouts/flash.test.php b/tests/core/cases/app/views/layouts/flash.test.php similarity index 100% rename from tests/cases/app/views/layouts/flash.test.php rename to tests/core/cases/app/views/layouts/flash.test.php diff --git a/tests/cases/app/views/pages/home.test.php b/tests/core/cases/app/views/pages/home.test.php similarity index 100% rename from tests/cases/app/views/pages/home.test.php rename to tests/core/cases/app/views/pages/home.test.php diff --git a/tests/cases/app/views/views.test.php b/tests/core/cases/app/views/views.test.php similarity index 100% rename from tests/cases/app/views/views.test.php rename to tests/core/cases/app/views/views.test.php diff --git a/tests/cases/config/core.test.php b/tests/core/cases/config/core.test.php similarity index 100% rename from tests/cases/config/core.test.php rename to tests/core/cases/config/core.test.php diff --git a/tests/cases/config/paths.test.php b/tests/core/cases/config/paths.test.php similarity index 100% rename from tests/cases/config/paths.test.php rename to tests/core/cases/config/paths.test.php diff --git a/tests/cases/config/routes.test.php b/tests/core/cases/config/routes.test.php similarity index 100% rename from tests/cases/config/routes.test.php rename to tests/core/cases/config/routes.test.php diff --git a/tests/cases/config/tags.test.php b/tests/core/cases/config/tags.test.php similarity index 100% rename from tests/cases/config/tags.test.php rename to tests/core/cases/config/tags.test.php diff --git a/tests/cases/libs/bake.test.php b/tests/core/cases/libs/bake.test.php similarity index 100% rename from tests/cases/libs/bake.test.php rename to tests/core/cases/libs/bake.test.php diff --git a/tests/cases/libs/basics.test.php b/tests/core/cases/libs/basics.test.php similarity index 100% rename from tests/cases/libs/basics.test.php rename to tests/core/cases/libs/basics.test.php diff --git a/tests/cases/libs/cache.test.php b/tests/core/cases/libs/cache.test.php similarity index 100% rename from tests/cases/libs/cache.test.php rename to tests/core/cases/libs/cache.test.php diff --git a/tests/cases/libs/controller.test.php b/tests/core/cases/libs/controller.test.php similarity index 100% rename from tests/cases/libs/controller.test.php rename to tests/core/cases/libs/controller.test.php diff --git a/tests/cases/libs/controllers/templates/rescues/_request_and_response.test.php b/tests/core/cases/libs/controllers/templates/rescues/_request_and_response.test.php similarity index 100% rename from tests/cases/libs/controllers/templates/rescues/_request_and_response.test.php rename to tests/core/cases/libs/controllers/templates/rescues/_request_and_response.test.php diff --git a/tests/cases/libs/controllers/templates/rescues/diagnostics.test.php b/tests/core/cases/libs/controllers/templates/rescues/diagnostics.test.php similarity index 100% rename from tests/cases/libs/controllers/templates/rescues/diagnostics.test.php rename to tests/core/cases/libs/controllers/templates/rescues/diagnostics.test.php diff --git a/tests/cases/libs/controllers/templates/rescues/layout.test.php b/tests/core/cases/libs/controllers/templates/rescues/layout.test.php similarity index 100% rename from tests/cases/libs/controllers/templates/rescues/layout.test.php rename to tests/core/cases/libs/controllers/templates/rescues/layout.test.php diff --git a/tests/cases/libs/controllers/templates/rescues/missing_template.test.php b/tests/core/cases/libs/controllers/templates/rescues/missing_template.test.php similarity index 100% rename from tests/cases/libs/controllers/templates/rescues/missing_template.test.php rename to tests/core/cases/libs/controllers/templates/rescues/missing_template.test.php diff --git a/tests/cases/libs/controllers/templates/rescues/routing_error.test.php b/tests/core/cases/libs/controllers/templates/rescues/routing_error.test.php similarity index 100% rename from tests/cases/libs/controllers/templates/rescues/routing_error.test.php rename to tests/core/cases/libs/controllers/templates/rescues/routing_error.test.php diff --git a/tests/cases/libs/controllers/templates/rescues/template_error.test.php b/tests/core/cases/libs/controllers/templates/rescues/template_error.test.php similarity index 100% rename from tests/cases/libs/controllers/templates/rescues/template_error.test.php rename to tests/core/cases/libs/controllers/templates/rescues/template_error.test.php diff --git a/tests/cases/libs/controllers/templates/rescues/unknown_action.test.php b/tests/core/cases/libs/controllers/templates/rescues/unknown_action.test.php similarity index 100% rename from tests/cases/libs/controllers/templates/rescues/unknown_action.test.php rename to tests/core/cases/libs/controllers/templates/rescues/unknown_action.test.php diff --git a/tests/cases/libs/controllers/templates/scaffolds/edit.test.php b/tests/core/cases/libs/controllers/templates/scaffolds/edit.test.php similarity index 100% rename from tests/cases/libs/controllers/templates/scaffolds/edit.test.php rename to tests/core/cases/libs/controllers/templates/scaffolds/edit.test.php diff --git a/tests/cases/libs/controllers/templates/scaffolds/list.test.php b/tests/core/cases/libs/controllers/templates/scaffolds/list.test.php similarity index 100% rename from tests/cases/libs/controllers/templates/scaffolds/list.test.php rename to tests/core/cases/libs/controllers/templates/scaffolds/list.test.php diff --git a/tests/cases/libs/controllers/templates/scaffolds/new.test.php b/tests/core/cases/libs/controllers/templates/scaffolds/new.test.php similarity index 100% rename from tests/cases/libs/controllers/templates/scaffolds/new.test.php rename to tests/core/cases/libs/controllers/templates/scaffolds/new.test.php diff --git a/tests/cases/libs/controllers/templates/scaffolds/scaffold.test.php b/tests/core/cases/libs/controllers/templates/scaffolds/scaffold.test.php similarity index 100% rename from tests/cases/libs/controllers/templates/scaffolds/scaffold.test.php rename to tests/core/cases/libs/controllers/templates/scaffolds/scaffold.test.php diff --git a/tests/cases/libs/controllers/templates/scaffolds/show.test.php b/tests/core/cases/libs/controllers/templates/scaffolds/show.test.php similarity index 100% rename from tests/cases/libs/controllers/templates/scaffolds/show.test.php rename to tests/core/cases/libs/controllers/templates/scaffolds/show.test.php diff --git a/tests/cases/libs/dbo.test.php b/tests/core/cases/libs/dbo.test.php similarity index 100% rename from tests/cases/libs/dbo.test.php rename to tests/core/cases/libs/dbo.test.php diff --git a/tests/cases/libs/dbo/dbo_adodb.test.php b/tests/core/cases/libs/dbo/dbo_adodb.test.php similarity index 100% rename from tests/cases/libs/dbo/dbo_adodb.test.php rename to tests/core/cases/libs/dbo/dbo_adodb.test.php diff --git a/tests/cases/libs/dbo/dbo_generic.test.php b/tests/core/cases/libs/dbo/dbo_generic.test.php similarity index 100% rename from tests/cases/libs/dbo/dbo_generic.test.php rename to tests/core/cases/libs/dbo/dbo_generic.test.php diff --git a/tests/cases/libs/dbo/dbo_mysql.test.php b/tests/core/cases/libs/dbo/dbo_mysql.test.php similarity index 100% rename from tests/cases/libs/dbo/dbo_mysql.test.php rename to tests/core/cases/libs/dbo/dbo_mysql.test.php diff --git a/tests/cases/libs/dbo/dbo_pear.test.php b/tests/core/cases/libs/dbo/dbo_pear.test.php similarity index 100% rename from tests/cases/libs/dbo/dbo_pear.test.php rename to tests/core/cases/libs/dbo/dbo_pear.test.php diff --git a/tests/cases/libs/dbo/dbo_postgres.test.php b/tests/core/cases/libs/dbo/dbo_postgres.test.php similarity index 100% rename from tests/cases/libs/dbo/dbo_postgres.test.php rename to tests/core/cases/libs/dbo/dbo_postgres.test.php diff --git a/tests/cases/libs/dbo/dbo_sqlite.test.php b/tests/core/cases/libs/dbo/dbo_sqlite.test.php similarity index 100% rename from tests/cases/libs/dbo/dbo_sqlite.test.php rename to tests/core/cases/libs/dbo/dbo_sqlite.test.php diff --git a/tests/cases/libs/dbo_factory.test.php b/tests/core/cases/libs/dbo_factory.test.php similarity index 100% rename from tests/cases/libs/dbo_factory.test.php rename to tests/core/cases/libs/dbo_factory.test.php diff --git a/tests/cases/libs/dispatcher.test.php b/tests/core/cases/libs/dispatcher.test.php similarity index 100% rename from tests/cases/libs/dispatcher.test.php rename to tests/core/cases/libs/dispatcher.test.php diff --git a/tests/cases/libs/error_messages.test.php b/tests/core/cases/libs/error_messages.test.php similarity index 100% rename from tests/cases/libs/error_messages.test.php rename to tests/core/cases/libs/error_messages.test.php diff --git a/tests/cases/libs/file.test.php b/tests/core/cases/libs/file.test.php similarity index 100% rename from tests/cases/libs/file.test.php rename to tests/core/cases/libs/file.test.php diff --git a/tests/cases/libs/flay.test.php b/tests/core/cases/libs/flay.test.php similarity index 100% rename from tests/cases/libs/flay.test.php rename to tests/core/cases/libs/flay.test.php diff --git a/tests/cases/libs/folder.test.php b/tests/core/cases/libs/folder.test.php similarity index 100% rename from tests/cases/libs/folder.test.php rename to tests/core/cases/libs/folder.test.php diff --git a/tests/cases/libs/generator/base.test.php b/tests/core/cases/libs/generator/base.test.php similarity index 100% rename from tests/cases/libs/generator/base.test.php rename to tests/core/cases/libs/generator/base.test.php diff --git a/tests/cases/libs/generator/commands.test.php b/tests/core/cases/libs/generator/commands.test.php similarity index 100% rename from tests/cases/libs/generator/commands.test.php rename to tests/core/cases/libs/generator/commands.test.php diff --git a/tests/cases/libs/generator/generators/applications/app/app_generator.php b/tests/core/cases/libs/generator/generators/applications/app/app_generator.php similarity index 100% rename from tests/cases/libs/generator/generators/applications/app/app_generator.php rename to tests/core/cases/libs/generator/generators/applications/app/app_generator.php diff --git a/tests/cases/libs/generator/generators/components/controller/controller_generator.test.php b/tests/core/cases/libs/generator/generators/components/controller/controller_generator.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/controller/controller_generator.test.php rename to tests/core/cases/libs/generator/generators/components/controller/controller_generator.test.php diff --git a/tests/cases/libs/generator/generators/components/controller/templates/controller.test.php b/tests/core/cases/libs/generator/generators/components/controller/templates/controller.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/controller/templates/controller.test.php rename to tests/core/cases/libs/generator/generators/components/controller/templates/controller.test.php diff --git a/tests/cases/libs/generator/generators/components/controller/templates/functional_test.test.php b/tests/core/cases/libs/generator/generators/components/controller/templates/functional_test.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/controller/templates/functional_test.test.php rename to tests/core/cases/libs/generator/generators/components/controller/templates/functional_test.test.php diff --git a/tests/cases/libs/generator/generators/components/controller/templates/helper.test.php b/tests/core/cases/libs/generator/generators/components/controller/templates/helper.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/controller/templates/helper.test.php rename to tests/core/cases/libs/generator/generators/components/controller/templates/helper.test.php diff --git a/tests/cases/libs/generator/generators/components/controller/templates/view.test.php b/tests/core/cases/libs/generator/generators/components/controller/templates/view.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/controller/templates/view.test.php rename to tests/core/cases/libs/generator/generators/components/controller/templates/view.test.php diff --git a/tests/cases/libs/generator/generators/components/model/model_generator.test.php b/tests/core/cases/libs/generator/generators/components/model/model_generator.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/model/model_generator.test.php rename to tests/core/cases/libs/generator/generators/components/model/model_generator.test.php diff --git a/tests/cases/libs/generator/generators/components/model/templates/fixtures.test.php b/tests/core/cases/libs/generator/generators/components/model/templates/fixtures.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/model/templates/fixtures.test.php rename to tests/core/cases/libs/generator/generators/components/model/templates/fixtures.test.php diff --git a/tests/cases/libs/generator/generators/components/model/templates/model.test.php b/tests/core/cases/libs/generator/generators/components/model/templates/model.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/model/templates/model.test.php rename to tests/core/cases/libs/generator/generators/components/model/templates/model.test.php diff --git a/tests/cases/libs/generator/generators/components/model/templates/unit_test.test.php b/tests/core/cases/libs/generator/generators/components/model/templates/unit_test.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/model/templates/unit_test.test.php rename to tests/core/cases/libs/generator/generators/components/model/templates/unit_test.test.php diff --git a/tests/cases/libs/generator/generators/components/scaffold/scaffold_generator.test.php b/tests/core/cases/libs/generator/generators/components/scaffold/scaffold_generator.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/scaffold/scaffold_generator.test.php rename to tests/core/cases/libs/generator/generators/components/scaffold/scaffold_generator.test.php diff --git a/tests/cases/libs/generator/generators/components/scaffold/templates/controller.test.php b/tests/core/cases/libs/generator/generators/components/scaffold/templates/controller.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/scaffold/templates/controller.test.php rename to tests/core/cases/libs/generator/generators/components/scaffold/templates/controller.test.php diff --git a/tests/cases/libs/generator/generators/components/scaffold/templates/form.test.php b/tests/core/cases/libs/generator/generators/components/scaffold/templates/form.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/scaffold/templates/form.test.php rename to tests/core/cases/libs/generator/generators/components/scaffold/templates/form.test.php diff --git a/tests/cases/libs/generator/generators/components/scaffold/templates/form_scaffolding.test.php b/tests/core/cases/libs/generator/generators/components/scaffold/templates/form_scaffolding.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/scaffold/templates/form_scaffolding.test.php rename to tests/core/cases/libs/generator/generators/components/scaffold/templates/form_scaffolding.test.php diff --git a/tests/cases/libs/generator/generators/components/scaffold/templates/functional_test.test.php b/tests/core/cases/libs/generator/generators/components/scaffold/templates/functional_test.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/scaffold/templates/functional_test.test.php rename to tests/core/cases/libs/generator/generators/components/scaffold/templates/functional_test.test.php diff --git a/tests/cases/libs/generator/generators/components/scaffold/templates/helper.test.php b/tests/core/cases/libs/generator/generators/components/scaffold/templates/helper.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/scaffold/templates/helper.test.php rename to tests/core/cases/libs/generator/generators/components/scaffold/templates/helper.test.php diff --git a/tests/cases/libs/generator/generators/components/scaffold/templates/layout.test.php b/tests/core/cases/libs/generator/generators/components/scaffold/templates/layout.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/scaffold/templates/layout.test.php rename to tests/core/cases/libs/generator/generators/components/scaffold/templates/layout.test.php diff --git a/tests/cases/libs/generator/generators/components/scaffold/templates/view_edit.test.php b/tests/core/cases/libs/generator/generators/components/scaffold/templates/view_edit.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/scaffold/templates/view_edit.test.php rename to tests/core/cases/libs/generator/generators/components/scaffold/templates/view_edit.test.php diff --git a/tests/cases/libs/generator/generators/components/scaffold/templates/view_list.test.php b/tests/core/cases/libs/generator/generators/components/scaffold/templates/view_list.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/scaffold/templates/view_list.test.php rename to tests/core/cases/libs/generator/generators/components/scaffold/templates/view_list.test.php diff --git a/tests/cases/libs/generator/generators/components/scaffold/templates/view_new.test.php b/tests/core/cases/libs/generator/generators/components/scaffold/templates/view_new.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/scaffold/templates/view_new.test.php rename to tests/core/cases/libs/generator/generators/components/scaffold/templates/view_new.test.php diff --git a/tests/cases/libs/generator/generators/components/scaffold/templates/view_show.test.php b/tests/core/cases/libs/generator/generators/components/scaffold/templates/view_show.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/scaffold/templates/view_show.test.php rename to tests/core/cases/libs/generator/generators/components/scaffold/templates/view_show.test.php diff --git a/tests/cases/libs/generator/generators/components/web/templates/api_definition.test.php b/tests/core/cases/libs/generator/generators/components/web/templates/api_definition.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/web/templates/api_definition.test.php rename to tests/core/cases/libs/generator/generators/components/web/templates/api_definition.test.php diff --git a/tests/cases/libs/generator/generators/components/web/templates/controller.test.php b/tests/core/cases/libs/generator/generators/components/web/templates/controller.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/web/templates/controller.test.php rename to tests/core/cases/libs/generator/generators/components/web/templates/controller.test.php diff --git a/tests/cases/libs/generator/generators/components/web/templates/functional_test.test.php b/tests/core/cases/libs/generator/generators/components/web/templates/functional_test.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/web/templates/functional_test.test.php rename to tests/core/cases/libs/generator/generators/components/web/templates/functional_test.test.php diff --git a/tests/cases/libs/generator/generators/components/web/web_generator.test.php b/tests/core/cases/libs/generator/generators/components/web/web_generator.test.php similarity index 100% rename from tests/cases/libs/generator/generators/components/web/web_generator.test.php rename to tests/core/cases/libs/generator/generators/components/web/web_generator.test.php diff --git a/tests/cases/libs/generator/lookup.test.php b/tests/core/cases/libs/generator/lookup.test.php similarity index 100% rename from tests/cases/libs/generator/lookup.test.php rename to tests/core/cases/libs/generator/lookup.test.php diff --git a/tests/cases/libs/generator/manifest.test.php b/tests/core/cases/libs/generator/manifest.test.php similarity index 100% rename from tests/cases/libs/generator/manifest.test.php rename to tests/core/cases/libs/generator/manifest.test.php diff --git a/tests/cases/libs/generator/options.test.php b/tests/core/cases/libs/generator/options.test.php similarity index 100% rename from tests/cases/libs/generator/options.test.php rename to tests/core/cases/libs/generator/options.test.php diff --git a/tests/cases/libs/generator/scripts.test.php b/tests/core/cases/libs/generator/scripts.test.php similarity index 100% rename from tests/cases/libs/generator/scripts.test.php rename to tests/core/cases/libs/generator/scripts.test.php diff --git a/tests/cases/libs/generator/scripts/destroy.test.php b/tests/core/cases/libs/generator/scripts/destroy.test.php similarity index 100% rename from tests/cases/libs/generator/scripts/destroy.test.php rename to tests/core/cases/libs/generator/scripts/destroy.test.php diff --git a/tests/cases/libs/generator/scripts/generate.test.php b/tests/core/cases/libs/generator/scripts/generate.test.php similarity index 100% rename from tests/cases/libs/generator/scripts/generate.test.php rename to tests/core/cases/libs/generator/scripts/generate.test.php diff --git a/tests/cases/libs/generator/scripts/update.test.php b/tests/core/cases/libs/generator/scripts/update.test.php similarity index 100% rename from tests/cases/libs/generator/scripts/update.test.php rename to tests/core/cases/libs/generator/scripts/update.test.php diff --git a/tests/cases/libs/generator/simple_logger.test.php b/tests/core/cases/libs/generator/simple_logger.test.php similarity index 100% rename from tests/cases/libs/generator/simple_logger.test.php rename to tests/core/cases/libs/generator/simple_logger.test.php diff --git a/tests/cases/libs/generator/spec.test.php b/tests/core/cases/libs/generator/spec.test.php similarity index 100% rename from tests/cases/libs/generator/spec.test.php rename to tests/core/cases/libs/generator/spec.test.php diff --git a/tests/cases/libs/helper.test.php b/tests/core/cases/libs/helper.test.php similarity index 100% rename from tests/cases/libs/helper.test.php rename to tests/core/cases/libs/helper.test.php diff --git a/tests/cases/libs/helpers/acl.test.php b/tests/core/cases/libs/helpers/acl.test.php similarity index 100% rename from tests/cases/libs/helpers/acl.test.php rename to tests/core/cases/libs/helpers/acl.test.php diff --git a/tests/cases/libs/helpers/ajax.test.php b/tests/core/cases/libs/helpers/ajax.test.php similarity index 100% rename from tests/cases/libs/helpers/ajax.test.php rename to tests/core/cases/libs/helpers/ajax.test.php diff --git a/tests/cases/libs/helpers/form.test.php b/tests/core/cases/libs/helpers/form.test.php similarity index 100% rename from tests/cases/libs/helpers/form.test.php rename to tests/core/cases/libs/helpers/form.test.php diff --git a/tests/cases/libs/helpers/html.test.php b/tests/core/cases/libs/helpers/html.test.php similarity index 100% rename from tests/cases/libs/helpers/html.test.php rename to tests/core/cases/libs/helpers/html.test.php diff --git a/tests/cases/libs/helpers/number.test.php b/tests/core/cases/libs/helpers/number.test.php similarity index 100% rename from tests/cases/libs/helpers/number.test.php rename to tests/core/cases/libs/helpers/number.test.php diff --git a/tests/cases/libs/helpers/text.test.php b/tests/core/cases/libs/helpers/text.test.php similarity index 100% rename from tests/cases/libs/helpers/text.test.php rename to tests/core/cases/libs/helpers/text.test.php diff --git a/tests/cases/libs/inflector.test.php b/tests/core/cases/libs/inflector.test.php similarity index 100% rename from tests/cases/libs/inflector.test.php rename to tests/core/cases/libs/inflector.test.php diff --git a/tests/cases/libs/legacy.test.php b/tests/core/cases/libs/legacy.test.php similarity index 100% rename from tests/cases/libs/legacy.test.php rename to tests/core/cases/libs/legacy.test.php diff --git a/tests/cases/libs/log.test.php b/tests/core/cases/libs/log.test.php similarity index 100% rename from tests/cases/libs/log.test.php rename to tests/core/cases/libs/log.test.php diff --git a/tests/cases/libs/model.test.php b/tests/core/cases/libs/model.test.php similarity index 100% rename from tests/cases/libs/model.test.php rename to tests/core/cases/libs/model.test.php diff --git a/tests/cases/libs/model_collection.test.php b/tests/core/cases/libs/model_collection.test.php similarity index 100% rename from tests/cases/libs/model_collection.test.php rename to tests/core/cases/libs/model_collection.test.php diff --git a/tests/cases/libs/neat_array.test.php b/tests/core/cases/libs/neat_array.test.php similarity index 100% rename from tests/cases/libs/neat_array.test.php rename to tests/core/cases/libs/neat_array.test.php diff --git a/tests/cases/libs/neat_string.test.php b/tests/core/cases/libs/neat_string.test.php similarity index 100% rename from tests/cases/libs/neat_string.test.php rename to tests/core/cases/libs/neat_string.test.php diff --git a/tests/cases/libs/object.test.php b/tests/core/cases/libs/object.test.php similarity index 100% rename from tests/cases/libs/object.test.php rename to tests/core/cases/libs/object.test.php diff --git a/tests/cases/libs/router.test.php b/tests/core/cases/libs/router.test.php similarity index 100% rename from tests/cases/libs/router.test.php rename to tests/core/cases/libs/router.test.php diff --git a/tests/cases/libs/sanitize.test.php b/tests/core/cases/libs/sanitize.test.php similarity index 100% rename from tests/cases/libs/sanitize.test.php rename to tests/core/cases/libs/sanitize.test.php diff --git a/tests/cases/libs/scaffold.test.php b/tests/core/cases/libs/scaffold.test.php similarity index 100% rename from tests/cases/libs/scaffold.test.php rename to tests/core/cases/libs/scaffold.test.php diff --git a/tests/cases/libs/template.test.php b/tests/core/cases/libs/template.test.php similarity index 100% rename from tests/cases/libs/template.test.php rename to tests/core/cases/libs/template.test.php diff --git a/tests/cases/libs/time.test.php b/tests/core/cases/libs/time.test.php similarity index 100% rename from tests/cases/libs/time.test.php rename to tests/core/cases/libs/time.test.php diff --git a/tests/cases/libs/validators.test.php b/tests/core/cases/libs/validators.test.php similarity index 100% rename from tests/cases/libs/validators.test.php rename to tests/core/cases/libs/validators.test.php diff --git a/tests/cases/libs/view.test.php b/tests/core/cases/libs/view.test.php similarity index 100% rename from tests/cases/libs/view.test.php rename to tests/core/cases/libs/view.test.php diff --git a/tests/cases/libs/web/templates/scaffolds/layout.test.php b/tests/core/cases/libs/web/templates/scaffolds/layout.test.php similarity index 100% rename from tests/cases/libs/web/templates/scaffolds/layout.test.php rename to tests/core/cases/libs/web/templates/scaffolds/layout.test.php diff --git a/tests/cases/libs/web/templates/scaffolds/methods.test.php b/tests/core/cases/libs/web/templates/scaffolds/methods.test.php similarity index 100% rename from tests/cases/libs/web/templates/scaffolds/methods.test.php rename to tests/core/cases/libs/web/templates/scaffolds/methods.test.php diff --git a/tests/cases/libs/web/templates/scaffolds/parameters.test.php b/tests/core/cases/libs/web/templates/scaffolds/parameters.test.php similarity index 100% rename from tests/cases/libs/web/templates/scaffolds/parameters.test.php rename to tests/core/cases/libs/web/templates/scaffolds/parameters.test.php diff --git a/tests/cases/libs/web/templates/scaffolds/result.test.php b/tests/core/cases/libs/web/templates/scaffolds/result.test.php similarity index 100% rename from tests/cases/libs/web/templates/scaffolds/result.test.php rename to tests/core/cases/libs/web/templates/scaffolds/result.test.php diff --git a/tests/cases/logs/logs.test.php b/tests/core/cases/logs/logs.test.php similarity index 100% rename from tests/cases/logs/logs.test.php rename to tests/core/cases/logs/logs.test.php diff --git a/tests/cases/modules/modules.test.php b/tests/core/cases/modules/modules.test.php similarity index 100% rename from tests/cases/modules/modules.test.php rename to tests/core/cases/modules/modules.test.php diff --git a/tests/cases/public/css/css.test.php b/tests/core/cases/public/css/css.test.php similarity index 100% rename from tests/cases/public/css/css.test.php rename to tests/core/cases/public/css/css.test.php diff --git a/tests/cases/public/files/files.test.php b/tests/core/cases/public/files/files.test.php similarity index 100% rename from tests/cases/public/files/files.test.php rename to tests/core/cases/public/files/files.test.php diff --git a/tests/cases/public/img/img.test.php b/tests/core/cases/public/img/img.test.php similarity index 100% rename from tests/cases/public/img/img.test.php rename to tests/core/cases/public/img/img.test.php diff --git a/tests/cases/public/js/js.test.php b/tests/core/cases/public/js/js.test.php similarity index 100% rename from tests/cases/public/js/js.test.php rename to tests/core/cases/public/js/js.test.php diff --git a/tests/cases/public/public.test.php b/tests/core/cases/public/public.test.php similarity index 100% rename from tests/cases/public/public.test.php rename to tests/core/cases/public/public.test.php diff --git a/tests/cases/scripts/bake.bat.test.php b/tests/core/cases/scripts/bake.bat.test.php similarity index 100% rename from tests/cases/scripts/bake.bat.test.php rename to tests/core/cases/scripts/bake.bat.test.php diff --git a/tests/cases/scripts/bake.test.php b/tests/core/cases/scripts/bake.test.php similarity index 100% rename from tests/cases/scripts/bake.test.php rename to tests/core/cases/scripts/bake.test.php diff --git a/tests/cases/scripts/cake_generator/generators/applications/app/cake_generator_applications_app.test.php b/tests/core/cases/scripts/cake_generator/generators/applications/app/cake_generator_applications_app.test.php similarity index 100% rename from tests/cases/scripts/cake_generator/generators/applications/app/cake_generator_applications_app.test.php rename to tests/core/cases/scripts/cake_generator/generators/applications/app/cake_generator_applications_app.test.php diff --git a/tests/cases/scripts/cake_generator/generators/applications/cake_generator_applications.test.php b/tests/core/cases/scripts/cake_generator/generators/applications/cake_generator_applications.test.php similarity index 100% rename from tests/cases/scripts/cake_generator/generators/applications/cake_generator_applications.test.php rename to tests/core/cases/scripts/cake_generator/generators/applications/cake_generator_applications.test.php diff --git a/tests/cases/scripts/cake_generator/scripts/cake_generator_scripts.test.php b/tests/core/cases/scripts/cake_generator/scripts/cake_generator_scripts.test.php similarity index 100% rename from tests/cases/scripts/cake_generator/scripts/cake_generator_scripts.test.php rename to tests/core/cases/scripts/cake_generator/scripts/cake_generator_scripts.test.php diff --git a/tests/cases/scripts/test.bat.test.php b/tests/core/cases/scripts/test.bat.test.php similarity index 100% rename from tests/cases/scripts/test.bat.test.php rename to tests/core/cases/scripts/test.bat.test.php diff --git a/tests/cases/scripts/test.test.php b/tests/core/cases/scripts/test.test.php similarity index 100% rename from tests/cases/scripts/test.test.php rename to tests/core/cases/scripts/test.test.php diff --git a/tests/groups/AllButExamplesTest.group.php b/tests/core/groups/AllButExamplesTest.group.php similarity index 100% rename from tests/groups/AllButExamplesTest.group.php rename to tests/core/groups/AllButExamplesTest.group.php diff --git a/tests/index.php b/tests/index.php new file mode 100644 index 000000000..0b78cfa38 --- /dev/null +++ b/tests/index.php @@ -0,0 +1,108 @@ + + * Copyright (c) 2005, CakePHP Test Suite Authors/Developers + * + * Author(s): Larry E. Masters aka PhpNut + * Kamil Dzielinski aka Brego + * + * Licensed under The Open Group Test Suite License + * Redistributions of files must retain the above copyright notice. + * + * @filesource + * @author CakePHP Test Suite Authors/Developers + * @copyright Copyright (c) 2005, CakePHP Test Suite Authors/Developers + * @link https://trac.cakephp.org/wiki/Cake/Manual/TestSuite/Authors Authors/Developers + * @package test_suite + * @subpackage test_suite.tests_1_x + * @since CakePHP Test Suite v 1.0.0.0 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License + */ + +error_reporting(E_ALL); +set_time_limit(600); +ini_set('memory_limit','128M'); + +/** + * Get root directory + */ + if (!defined('DS')) + { + define('DS', DIRECTORY_SEPARATOR); + } + if (!defined('ROOT')) + { + define('ROOT', dirname(dirname(dirname(__FILE__))).DS); + } + + require_once ROOT . 'config/paths.php'; + require_once TESTS . 'test_paths.php'; + require_once TESTS . 'suite_libs'.DS.'test_manager.php'; + require_once SIMPLE_TEST . 'unit_tester.php'; + require_once SIMPLE_TEST . 'web_tester.php'; + require_once SIMPLE_TEST . 'mock_objects.php'; + + function CakePHPTestHeader() + { + $header = << + + + + CakePHP Test Suite v 1.0.0.0 + + + + +EOF; +echo $header; + } + + function CakePHPTestSuiteHeader() + { + $suiteHeader = << + +

Test Groups || Test Cases

+EOD; +echo $suiteHeader; + } + + function CakePHPTestSuiteFooter() + { + $footer = << + +EOD; +echo $footer; + } + +CakePHPTestHeader(); +CakePHPTestSuiteHeader(); + + if (isset($_GET['show']) && $_GET['show'] == 'cases') + { + CakePHPTestCaseList(); + } + elseif (isset($_GET['show']) && $_GET['show'] == 'groups') + { + CakePHPTestGroupTestList(); + } +CakePHPTestSuiteFooter(); +?> \ No newline at end of file diff --git a/tests/menu.php b/tests/test_paths.php similarity index 80% rename from tests/menu.php rename to tests/test_paths.php index c255f2fc7..80373c791 100644 --- a/tests/menu.php +++ b/tests/test_paths.php @@ -20,8 +20,9 @@ * @filesource * @author CakePHP Test Suite Authors/Developers * @copyright Copyright (c) 2005, CakePHP Test Suite Authors/Developers - * @link https://trac.cakephp.org/wiki/TestSuite/Authors/ Authors/Developers + * @link https://trac.cakephp.org/wiki/Cake/Manual/TestSuite/Authors Authors/Developers * @package test_suite + * @subpackage test_suite.tests_1_x * @since CakePHP Test Suite v 1.0.0.0 * @version $Revision$ * @modifiedby $LastChangedBy$ @@ -29,8 +30,10 @@ * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License */ -error_reporting(E_ALL); -set_time_limit(600); -ini_set('memory_limit','128M'); +/** + * Path to the simpletest directory. + */ +define ('SIMPLE_TEST',VENDORS.'simpletest'.DS); + ?> \ No newline at end of file