From 06d80a6119e848191797e271fd7f3f963a0e76c7 Mon Sep 17 00:00:00 2001 From: Pedro Lozano Date: Sat, 16 Jun 2012 12:30:20 +0200 Subject: [PATCH] Issue #1637532: Move most tests in the main test dir to PSR-0. --- .../Drupal/views/Tests/AccessTest.php | 19 +++++++++++------ .../Drupal/views/Tests/AnalyzeTest.php | 8 +++++- .../Drupal/views/Tests/ArgumentDefaultTest.php | 13 ++++++++--- .../Drupal/views/Tests/ArgumentValidatorTest.php | 13 ++++++++--- .../Drupal/views/Tests/BasicTest.php | 8 +++++- .../Drupal/views/Tests/CacheTest.php | 11 +++++++-- .../Drupal/views/Tests/ExposedFormTest.php | 8 +++++- .../Drupal/views/Tests/GlossaryTest.php | 8 +++++- .../Drupal/views/Tests/HandlersTest.php | 12 +++++++--- .../Drupal/views/Tests/ModuleTest.php | 8 +++++- .../Drupal/views/Tests/PagerTest.php | 21 ++++++++++++------- .../Drupal/views/Tests/QueryGroupByTest.php | 13 ++++++++--- .../Drupal/views/Tests/TranslatableTest.php | 11 +++++++-- .../Drupal/views/Tests/UpgradeTestCase.php | 17 ++++++++++----- .../Drupal/views/Tests/ViewTest.php | 13 ++++++++--- 15 files changed, 126 insertions(+), 57 deletions(-) rename tests/views_access.test => lib/Drupal/views/Tests/AccessTest.php (97%) rename tests/views_analyze.test => lib/Drupal/views/Tests/AnalyzeTest.php (89%) rename tests/views_argument_default.test => lib/Drupal/views/Tests/ArgumentDefaultTest.php (95%) rename tests/views_argument_validator.test => lib/Drupal/views/Tests/ArgumentValidatorTest.php (95%) rename tests/views_basic.test => lib/Drupal/views/Tests/BasicTest.php (97%) rename tests/views_cache.test => lib/Drupal/views/Tests/CacheTest.php (97%) rename tests/views_exposed_form.test => lib/Drupal/views/Tests/ExposedFormTest.php (96%) rename tests/views_glossary.test => lib/Drupal/views/Tests/GlossaryTest.php (90%) rename tests/views_handlers.test => lib/Drupal/views/Tests/HandlersTest.php (95%) rename tests/views_module.test => lib/Drupal/views/Tests/ModuleTest.php (97%) rename tests/views_pager.test => lib/Drupal/views/Tests/PagerTest.php (98%) rename tests/views_groupby.test => lib/Drupal/views/Tests/QueryGroupByTest.php (98%) rename tests/views_translatable.test => lib/Drupal/views/Tests/TranslatableTest.php (98%) rename tests/views_upgrade.test => lib/Drupal/views/Tests/UpgradeTestCase.php (98%) rename tests/views_view.test => lib/Drupal/views/Tests/ViewTest.php (98%) diff --git a/tests/views_access.test b/lib/Drupal/views/Tests/AccessTest.php similarity index 97% rename from tests/views_access.test rename to lib/Drupal/views/Tests/AccessTest.php index f02eca9..790bf0b 100644 --- a/tests/views_access.test +++ b/lib/Drupal/views/Tests/AccessTest.php @@ -2,13 +2,18 @@ /** * @file - * Definition of ViewsAccessTest. + * Definition of Drupal\views\Tests\AccessTest. */ +namespace Drupal\views\Tests; + +use Drupal\simpletest\WebTestBase; +use ViewsSqlTest; + /** * Basic test for pluggable access. */ -class ViewsAccessTest extends ViewsSqlTest { +class AccessTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Access', @@ -159,7 +164,7 @@ class ViewsAccessTest extends ViewsSqlTest { } function view_access_none() { - $view = new view; + $view = new \view; $view->name = 'test_access_none'; $view->description = ''; $view->tag = ''; @@ -182,7 +187,7 @@ class ViewsAccessTest extends ViewsSqlTest { } function view_access_perm() { - $view = new view; + $view = new \view; $view->name = 'test_access_perm'; $view->description = ''; $view->tag = ''; @@ -206,7 +211,7 @@ class ViewsAccessTest extends ViewsSqlTest { } function view_access_role() { - $view = new view; + $view = new \view; $view->name = 'test_access_role'; $view->description = ''; $view->tag = ''; @@ -232,7 +237,7 @@ class ViewsAccessTest extends ViewsSqlTest { } function view_access_dynamic() { - $view = new view; + $view = new \view; $view->name = 'test_access_dynamic'; $view->description = ''; $view->tag = ''; @@ -258,7 +263,7 @@ class ViewsAccessTest extends ViewsSqlTest { } function view_access_static() { - $view = new view; + $view = new \view; $view->name = 'test_access_static'; $view->description = ''; $view->tag = ''; diff --git a/tests/views_analyze.test b/lib/Drupal/views/Tests/AnalyzeTest.php similarity index 89% rename from tests/views_analyze.test rename to lib/Drupal/views/Tests/AnalyzeTest.php index e9311e5..64e450e 100644 --- a/tests/views_analyze.test +++ b/lib/Drupal/views/Tests/AnalyzeTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsAnalyzeTest. + * Definition of Drupal\views\Tests\AnalyzeTest. */ +namespace Drupal\views\Tests; + +use ViewsSqlTest; + /** * Tests the views analyze system. */ -class ViewsAnalyzeTest extends ViewsSqlTest { +class AnalyzeTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Views Analyze', diff --git a/tests/views_argument_default.test b/lib/Drupal/views/Tests/ArgumentDefaultTest.php similarity index 95% rename from tests/views_argument_default.test rename to lib/Drupal/views/Tests/ArgumentDefaultTest.php index 9c0a7eb..865ffdc 100644 --- a/tests/views_argument_default.test +++ b/lib/Drupal/views/Tests/ArgumentDefaultTest.php @@ -2,16 +2,21 @@ /** * @file - * Definition of ViewsArgumentDefaultTest. + * Definition of Drupal\views\Tests\ArgumentDefaultTest. */ +namespace Drupal\views\Tests; + +use ViewsSqlTest; +use View; + /** * Basic test for pluggable argument default. */ -class ViewsArgumentDefaultTest extends ViewsSqlTest { +class ArgumentDefaultTest extends ViewsSqlTest { public static function getInfo() { return array( - 'name' => 'Argument_default', + 'name' => 'Argument default', 'description' => 'Tests pluggable argument_default for views.', 'group' => 'Views Plugins' ); @@ -87,7 +92,7 @@ class ViewsArgumentDefaultTest extends ViewsSqlTest { } function view_argument_default_fixed() { - $view = new view; + $view = new View; $view->name = 'test_argument_default_fixed'; $view->description = ''; $view->tag = ''; diff --git a/tests/views_argument_validator.test b/lib/Drupal/views/Tests/ArgumentValidatorTest.php similarity index 95% rename from tests/views_argument_validator.test rename to lib/Drupal/views/Tests/ArgumentValidatorTest.php index fb2e4f2..8cc23ce 100644 --- a/tests/views_argument_validator.test +++ b/lib/Drupal/views/Tests/ArgumentValidatorTest.php @@ -2,13 +2,18 @@ /** * @file - * Definition of ViewsArgumentValidatorTest. + * Definition of Drupal\views\Tests\ArgumentValidatorTest. */ +namespace Drupal\views\Tests; + +use ViewsSqlTest; +use View; + /** * Tests Views argument validators. */ -class ViewsArgumentValidatorTest extends ViewsSqlTest { +class ArgumentValidatorTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Argument validator', @@ -42,7 +47,7 @@ class ViewsArgumentValidatorTest extends ViewsSqlTest { function view_test_argument_validate_php($string) { $code = 'return $argument == \''. $string .'\';'; - $view = new view; + $view = new View; $view->name = 'view_argument_validate_numeric'; $view->description = ''; $view->tag = ''; @@ -74,7 +79,7 @@ class ViewsArgumentValidatorTest extends ViewsSqlTest { } function view_argument_validate_numeric() { - $view = new view; + $view = new View; $view->name = 'view_argument_validate_numeric'; $view->description = ''; $view->tag = ''; diff --git a/tests/views_basic.test b/lib/Drupal/views/Tests/BasicTest.php similarity index 97% rename from tests/views_basic.test rename to lib/Drupal/views/Tests/BasicTest.php index 5fc60d8..dd2f5e9 100644 --- a/tests/views_basic.test +++ b/lib/Drupal/views/Tests/BasicTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsBasicTest. + * Definition of Drupal\views\Tests\BasicTest. */ +namespace Drupal\views\Tests; + +use ViewsSqlTest; + /** * Basic test class for Views query builder tests. */ -class ViewsBasicTest extends ViewsSqlTest { +class BasicTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Basic query test', diff --git a/tests/views_cache.test b/lib/Drupal/views/Tests/CacheTest.php similarity index 97% rename from tests/views_cache.test rename to lib/Drupal/views/Tests/CacheTest.php index df80453..66f4e7f 100644 --- a/tests/views_cache.test +++ b/lib/Drupal/views/Tests/CacheTest.php @@ -2,15 +2,20 @@ /** * @file - * Definition of ViewsCacheTest. + * Definition of Drupal\views\Tests\CacheTest. */ +namespace Drupal\views\Tests; + +use ViewsSqlTest; +use View; + /** * Basic test for pluggable caching. * * @see views_plugin_cache */ -class ViewsCacheTest extends ViewsSqlTest { +class CacheTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Cache', @@ -28,7 +33,7 @@ class ViewsCacheTest extends ViewsSqlTest { views_include('view'); // Create the basic view. - $view = new view(); + $view = new View(); $view->name = 'test_view'; $view->add_display('default'); $view->base_table = 'views_test'; diff --git a/tests/views_exposed_form.test b/lib/Drupal/views/Tests/ExposedFormTest.php similarity index 96% rename from tests/views_exposed_form.test rename to lib/Drupal/views/Tests/ExposedFormTest.php index 3b2933b..d6c8cd0 100644 --- a/tests/views_exposed_form.test +++ b/lib/Drupal/views/Tests/ExposedFormTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsExposedFormTest. + * Definition of Drupal\views\Tests\ExposedFormTest. */ +namespace Drupal\views\Tests; + +use ViewsSqlTest; + /** * Tests exposed forms. */ -class ViewsExposedFormTest extends ViewsSqlTest { +class ExposedFormTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Exposed forms', diff --git a/tests/views_glossary.test b/lib/Drupal/views/Tests/GlossaryTest.php similarity index 90% rename from tests/views_glossary.test rename to lib/Drupal/views/Tests/GlossaryTest.php index 0fe0fba..3745fc7 100644 --- a/tests/views_glossary.test +++ b/lib/Drupal/views/Tests/GlossaryTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsGlossaryTestCase. + * Definition of Drupal\views\Tests\GlossaryTest. */ +namespace Drupal\views\Tests; + +use ViewsSqlTest; + /** * Tests glossary view ( summary of arguments ). */ -class ViewsGlossaryTestCase extends ViewsSqlTest { +class GlossaryTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Glossary Test', diff --git a/tests/views_handlers.test b/lib/Drupal/views/Tests/HandlersTest.php similarity index 95% rename from tests/views_handlers.test rename to lib/Drupal/views/Tests/HandlersTest.php index 0a74361..610fd62 100644 --- a/tests/views_handlers.test +++ b/lib/Drupal/views/Tests/HandlersTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsHandlersTest. + * Definition of Drupal\views\Tests\HandlersTest. */ +namespace Drupal\views\Tests; + +use ViewsSqlTest; + /** * Tests abstract handlers of views. */ -class ViewsHandlersTest extends ViewsSqlTest { +class HandlersTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Handlers test', @@ -43,7 +47,7 @@ class ViewsHandlersTest extends ViewsSqlTest { * Tests views_break_phrase_string function. */ function test_views_break_phrase_string() { - $empty_stdclass = new stdClass(); + $empty_stdclass = new \StdClass(); $empty_stdclass->operator = 'or'; $empty_stdclass->value = array(); @@ -79,7 +83,7 @@ class ViewsHandlersTest extends ViewsSqlTest { * Tests views_break_phrase function. */ function test_views_break_phrase() { - $empty_stdclass = new stdClass(); + $empty_stdclass = new \StdClass(); $empty_stdclass->operator = 'or'; $empty_stdclass->value = array(); diff --git a/tests/views_module.test b/lib/Drupal/views/Tests/ModuleTest.php similarity index 97% rename from tests/views_module.test rename to lib/Drupal/views/Tests/ModuleTest.php index dc6c164..e97430b 100644 --- a/tests/views_module.test +++ b/lib/Drupal/views/Tests/ModuleTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsModuleTest. + * Definition of Drupal\views\Tests\ModuleTest. */ +namespace Drupal\views\Tests; + +use ViewsSqlTest; + /** * Tests basic functions from the Views module. */ -class ViewsModuleTest extends ViewsSqlTest { +class ModuleTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Tests views.module', diff --git a/tests/views_pager.test b/lib/Drupal/views/Tests/PagerTest.php similarity index 98% rename from tests/views_pager.test rename to lib/Drupal/views/Tests/PagerTest.php index fef4915..e0bbec9 100644 --- a/tests/views_pager.test +++ b/lib/Drupal/views/Tests/PagerTest.php @@ -2,13 +2,18 @@ /** * @file - * Definition of ViewsPagerTest. + * Definition of Drupal\views\Tests\PagerTest. */ +namespace Drupal\views\Tests; + +use ViewsSqlTest; +use View; + /** * Tests the pluggable pager system. */ -class ViewsPagerTest extends ViewsSqlTest { +class PagerTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Pager', @@ -95,7 +100,7 @@ class ViewsPagerTest extends ViewsSqlTest { } public function viewsStorePagerSettings() { - $view = new view; + $view = new View; $view->name = 'test_store_pager_settings'; $view->description = ''; $view->tag = ''; @@ -154,7 +159,7 @@ class ViewsPagerTest extends ViewsSqlTest { } public function viewsPagerNoLimit() { - $view = new view; + $view = new View; $view->name = 'test_pager_none'; $view->description = ''; $view->tag = ''; @@ -230,7 +235,7 @@ class ViewsPagerTest extends ViewsSqlTest { } public function viewsPagerLimit() { - $view = new view; + $view = new View; $view->name = 'test_pager_some'; $view->description = ''; $view->tag = ''; @@ -314,7 +319,7 @@ class ViewsPagerTest extends ViewsSqlTest { } function viewPagerFullZeroItemsPerPage() { - $view = new view; + $view = new View; $view->name = 'view_pager_full_zero_items_per_page'; $view->description = ''; $view->tag = ''; @@ -354,7 +359,7 @@ class ViewsPagerTest extends ViewsSqlTest { } function viewsPagerFull() { - $view = new view; + $view = new View; $view->name = 'test_pager_full'; $view->description = ''; $view->tag = ''; @@ -380,7 +385,7 @@ class ViewsPagerTest extends ViewsSqlTest { } function viewsPagerFullFields() { - $view = new view; + $view = new View; $view->name = 'test_pager_full'; $view->description = ''; $view->tag = ''; diff --git a/tests/views_groupby.test b/lib/Drupal/views/Tests/QueryGroupByTest.php similarity index 98% rename from tests/views_groupby.test rename to lib/Drupal/views/Tests/QueryGroupByTest.php index c59fb6b..d900336 100644 --- a/tests/views_groupby.test +++ b/lib/Drupal/views/Tests/QueryGroupByTest.php @@ -2,15 +2,20 @@ /** * @file + * Definition of Drupal\views\Tests\QueryGroupByTest. * Tests aggregate functionality of Views. */ +namespace Drupal\views\Tests; + +use ViewsSqlTest; use Drupal\simpletest\WebTestBase; +use View; /** * Tests aggregate functionality of views, for example count. */ -class ViewsQueryGroupByTest extends ViewsSqlTest { +class QueryGroupByTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Groupby', @@ -62,7 +67,7 @@ class ViewsQueryGroupByTest extends ViewsSqlTest { //} public function viewsAggregateCountView() { - $view = new view; + $view = new View; $view->name = 'aggregate_count'; $view->description = ''; $view->tag = ''; @@ -147,7 +152,7 @@ class ViewsQueryGroupByTest extends ViewsSqlTest { } function viewsGroupByViewHelper($group_by) { - $view = new view; + $view = new View; $view->name = 'group_by_count'; $view->description = ''; $view->tag = ''; @@ -241,7 +246,7 @@ class ViewsQueryGroupByTest extends ViewsSqlTest { } function viewsGroupByCountViewOnlyFilters() { - $view = new view; + $view = new View; $view->name = 'group_by_in_filters'; $view->description = ''; $view->tag = ''; diff --git a/tests/views_translatable.test b/lib/Drupal/views/Tests/TranslatableTest.php similarity index 98% rename from tests/views_translatable.test rename to lib/Drupal/views/Tests/TranslatableTest.php index f3454cf..dd292d8 100644 --- a/tests/views_translatable.test +++ b/lib/Drupal/views/Tests/TranslatableTest.php @@ -2,13 +2,18 @@ /** * @file - * Definition of ViewsTranslatableTest. + * Definition of Drupal\views\Tests\TranslatableTest. */ +namespace Drupal\views\Tests; + +use ViewsSqlTest; +use View; + /** * Tests Views pluggable translations. */ -class ViewsTranslatableTest extends ViewsSqlTest { +class TranslatableTest extends ViewsSqlTest { var $strings; public static function getInfo() { @@ -132,7 +137,7 @@ class ViewsTranslatableTest extends ViewsSqlTest { } public function view_unpack_translatable() { - $view = new view; + $view = new View; $view->name = 'view_unpack_translatable'; $view->description = ''; $view->tag = ''; diff --git a/tests/views_upgrade.test b/lib/Drupal/views/Tests/UpgradeTestCase.php similarity index 98% rename from tests/views_upgrade.test rename to lib/Drupal/views/Tests/UpgradeTestCase.php index 3f453db..3a0d5a6 100644 --- a/tests/views_upgrade.test +++ b/lib/Drupal/views/Tests/UpgradeTestCase.php @@ -2,15 +2,20 @@ /** * @file - * Definition of ViewsUpgradeTestCase. + * Definition of Drupal\views\Tests\UpgradeTestCase. */ +namespace Drupal\views\Tests; + +use ViewsSqlTest; +use View; + /** * Try to test the upgrade path of all conversions. * * You can find all conversions by searching for "moved to". */ -class ViewsUpgradeTestCase extends ViewsSqlTest { +class UpgradeTestCase extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Views Upgrade test', @@ -107,7 +112,7 @@ class ViewsUpgradeTestCase extends ViewsSqlTest { } public function viewsMovedToField() { - $view = new view; + $view = new View; $view->name = 'test_views_move_to_field'; $view->description = ''; $view->tag = ''; @@ -128,7 +133,7 @@ class ViewsUpgradeTestCase extends ViewsSqlTest { } public function viewsMovedToHandler() { - $view = new view; + $view = new View; $view->name = 'test_views_move_to_handler'; $view->description = ''; $view->tag = ''; @@ -153,7 +158,7 @@ class ViewsUpgradeTestCase extends ViewsSqlTest { } public function viewsMovedToTable() { - $view = new view; + $view = new View; $view->name = 'test_views_move_to_table'; $view->description = ''; $view->tag = ''; @@ -175,7 +180,7 @@ class ViewsUpgradeTestCase extends ViewsSqlTest { protected function viewUpgradeImport() { $import = ' - $view = new view; + $view = new View; $view->name = "comments_recent"; $view->description = "Contains a block and a page to list recent comments; the block will automatically link to the page, which displays the comment body as well as a link to the node."; $view->tag = "default"; diff --git a/tests/views_view.test b/lib/Drupal/views/Tests/ViewTest.php similarity index 98% rename from tests/views_view.test rename to lib/Drupal/views/Tests/ViewTest.php index d268a0c..d5b1263 100644 --- a/tests/views_view.test +++ b/lib/Drupal/views/Tests/ViewTest.php @@ -2,13 +2,18 @@ /** * @file - * Definition of ViewsViewTest. + * Definition of Drupal\views\Tests\ViewTest. */ +namespace Drupal\views\Tests; + +use ViewsSqlTest; +use View; + /** * Views class tests. */ -class ViewsViewTest extends ViewsSqlTest { +class ViewTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Test the view class', @@ -93,7 +98,7 @@ class ViewsViewTest extends ViewsSqlTest { * This view provides some filters, fields, arguments, relationships, sorts, areas and attachments. */ function view_test_destroy() { - $view = new view; + $view = new View; $view->name = 'test_destroy'; $view->description = ''; $view->tag = ''; @@ -253,7 +258,7 @@ class ViewsViewTest extends ViewsSqlTest { return $view; } function view_test_delete() { - $view = new view; + $view = new View; $view->name = 'test_view_delete'; $view->description = ''; $view->tag = ''; -- 1.7.9