diff --git a/tests/handlers/views_handler_area_text.test b/lib/Drupal/views/Tests/Handler/AreaTextTest.php similarity index 91% rename from tests/handlers/views_handler_area_text.test rename to lib/Drupal/views/Tests/Handler/AreaTextTest.php index 9f30e0c52733b191588401f5be416db0b6bd7c98..83f0b431dbd32dab012157716526f045eca014f5 100644 --- a/tests/handlers/views_handler_area_text.test +++ b/lib/Drupal/views/Tests/Handler/AreaTextTest.php @@ -2,15 +2,19 @@ /** * @file - * Definition of ViewsHandlerAreaTextTest. + * Definition of Drupal\views\Tests\Handler\AreaTextTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests the text area handler. * * @see views_handler_area_text */ -class ViewsHandlerAreaTextTest extends ViewsSqlTest { +class AreaTextTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Area: Text', diff --git a/tests/handlers/views_handler_argument_null.test b/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php similarity index 92% rename from tests/handlers/views_handler_argument_null.test rename to lib/Drupal/views/Tests/Handler/ArgumentNullTest.php index e8650a3837a72b9c7592b70ed36d38b2caf6f20b..6f16dec0c1771d77372e4a73c21a073e9937c812 100644 --- a/tests/handlers/views_handler_argument_null.test +++ b/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsHandlerArgumentNullTest. + * Definition of Drupal\views\Tests\Handler\ArgumentNullTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests the core views_handler_argument_null handler. */ -class ViewsHandlerArgumentNullTest extends ViewsSqlTest { +class ArgumentNullTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Argument: Null', diff --git a/tests/handlers/views_handler_argument_string.test b/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php similarity index 94% rename from tests/handlers/views_handler_argument_string.test rename to lib/Drupal/views/Tests/Handler/ArgumentStringTest.php index d078abfe22568c6a63ccb7d5597b7fdd9d9e0c67..9e5cabc078e5a4d797ac83f5fb26a380ff1e60e1 100644 --- a/tests/handlers/views_handler_argument_string.test +++ b/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php @@ -1,13 +1,20 @@ <?php + /** * @file - * Definition of ViewsHandlerArgumentNullTest. + * Definition of Drupal\views\Tests\Handler\ArgumentStringTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + +use view; + /** * Tests the core views_handler_argument_string handler. */ -class ViewsHandlerArgumentStringTest extends ViewsSqlTest { +class ArgumentStringTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Argument: String', diff --git a/tests/handlers/views_handler_field_boolean.test b/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php similarity index 93% rename from tests/handlers/views_handler_field_boolean.test rename to lib/Drupal/views/Tests/Handler/FieldBooleanTest.php index 92ec7a51da61aabf7aed71a8f1fe94f4a2ba2ad2..a0e65c74a0318f4fea0e1b63869d060ef8c9846c 100644 --- a/tests/handlers/views_handler_field_boolean.test +++ b/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsHandlerFieldBooleanTest. + * Definition of Drupal\views\Tests\Handler\FieldBooleanTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests the core views_handler_field_boolean handler. */ -class ViewsHandlerFieldBooleanTest extends ViewsSqlTest { +class FieldBooleanTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Field: Boolean', diff --git a/tests/handlers/views_handler_field_counter.test b/lib/Drupal/views/Tests/Handler/FieldCounterTest.php similarity index 91% rename from tests/handlers/views_handler_field_counter.test rename to lib/Drupal/views/Tests/Handler/FieldCounterTest.php index 2ddcb6f653f8bb36a17d2019566270dbb1c25c01..afeb1ecac3fc79c8e6245b6692a062fef74c101d 100644 --- a/tests/handlers/views_handler_field_counter.test +++ b/lib/Drupal/views/Tests/Handler/FieldCounterTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsHandlerFilterCounterTest. + * Definition of Drupal\views\Tests\Handler\FilterCounterTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests the views_handler_field_counter handler. */ -class ViewsHandlerFilterCounterTest extends ViewsSqlTest { +class FilterCounterTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Field: Counter', diff --git a/tests/handlers/views_handler_field_custom.test b/lib/Drupal/views/Tests/Handler/FieldCustomTest.php similarity index 86% rename from tests/handlers/views_handler_field_custom.test rename to lib/Drupal/views/Tests/Handler/FieldCustomTest.php index b45fd1770d7eee14ac58bb95b216b0f8c34958ba..d299fd77050e3712b1e4393884067df269e9ec8a 100644 --- a/tests/handlers/views_handler_field_custom.test +++ b/lib/Drupal/views/Tests/Handler/FieldCustomTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsHandlerFieldCustomTest. + * Definition of Drupal\views\Tests\Handler\FieldCustomTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests the core views_handler_field_custom handler. */ -class ViewsHandlerFieldCustomTest extends ViewsSqlTest { +class FieldCustomTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Field: Custom', diff --git a/tests/handlers/views_handler_field_date.test b/lib/Drupal/views/Tests/Handler/FieldDateTest.php similarity index 92% rename from tests/handlers/views_handler_field_date.test rename to lib/Drupal/views/Tests/Handler/FieldDateTest.php index 5b0962c2d4ddd477feb9b8a40ecd91a52bedc801..d7ab303533caa301e1fb712fdda5c54dcdf1f8d9 100644 --- a/tests/handlers/views_handler_field_date.test +++ b/lib/Drupal/views/Tests/Handler/FieldDateTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsHandlerFieldDateTest. + * Definition of Drupal\views\Tests\Handler\FieldDateTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests the core views_handler_field_date handler. */ -class ViewsHandlerFieldDateTest extends ViewsSqlTest { +class FieldDateTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Field: Date', diff --git a/tests/handlers/views_handler_field_file_size.test b/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php similarity index 91% rename from tests/handlers/views_handler_field_file_size.test rename to lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php index 8652754fea11df8c59acb16467c62bb6c40e3937..1e6a3fa1997bd401335703e43c87305835eed9a5 100644 --- a/tests/handlers/views_handler_field_file_size.test +++ b/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php @@ -2,15 +2,19 @@ /** * @file - * Definition of ViewsHandlerTestFileSize. + * Definition of Drupal\views\Tests\Handler\FieldFileSizeTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests the core views_handler_field_file_size handler. * * @see CommonXssUnitTest */ -class ViewsHandlerTestFileSize extends ViewsSqlTest { +class FieldFileSizeTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Field: file_size', diff --git a/tests/handlers/views_handler_field_math.test b/lib/Drupal/views/Tests/Handler/FieldMathTest.php similarity index 85% rename from tests/handlers/views_handler_field_math.test rename to lib/Drupal/views/Tests/Handler/FieldMathTest.php index ac33ac4a4feb0bc21e5279b4e30f6a078a81bc66..ec58303ab860724727ec774671f00dbfbed1ba21 100644 --- a/tests/handlers/views_handler_field_math.test +++ b/lib/Drupal/views/Tests/Handler/FieldMathTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsHandlerFieldMath. + * Definition of Drupal\views\Tests\Handler\FieldMathTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests the core views_handler_field_math handler. */ -class ViewsHandlerFieldMath extends ViewsSqlTest { +class FieldMathTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Field: Math', diff --git a/tests/handlers/views_handler_field.test b/lib/Drupal/views/Tests/Handler/FieldTest.php similarity index 99% rename from tests/handlers/views_handler_field.test rename to lib/Drupal/views/Tests/Handler/FieldTest.php index 9e6dfca2563a55f617b60219cb211ea906347dc0..4b85e8ce23130d2a26d9eccf5f79e4c03375c4c9 100644 --- a/tests/handlers/views_handler_field.test +++ b/lib/Drupal/views/Tests/Handler/FieldTest.php @@ -2,15 +2,19 @@ /** * @file - * Definition of ViewsHandlerFieldTest. + * Definition of Drupal\views\Tests\Handler\FieldTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests the generic field handler * * @see views_handler_field */ -class ViewsHandlerFieldTest extends ViewsSqlTest { +class FieldTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Field', diff --git a/tests/handlers/views_handler_field_url.test b/lib/Drupal/views/Tests/Handler/FieldUrlTest.php similarity index 89% rename from tests/handlers/views_handler_field_url.test rename to lib/Drupal/views/Tests/Handler/FieldUrlTest.php index 527e94fb41265629712e1fd325fb0c2ae25d215b..30880743e6f084f171f2075f4c1cab8f13c0978a 100644 --- a/tests/handlers/views_handler_field_url.test +++ b/lib/Drupal/views/Tests/Handler/FieldUrlTest.php @@ -2,13 +2,16 @@ /** * @file - * Definition of ViewsHandlerFieldUrlTest. + * Definition of Drupal\views\Tests\Handler\FieldUrlTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; /** * Tests the core views_handler_field_url handler. */ -class ViewsHandlerFieldUrlTest extends ViewsSqlTest { +class FieldUrlTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Field: Url', diff --git a/tests/handlers/views_handler_field_xss.test b/lib/Drupal/views/Tests/Handler/FieldXssTest.php similarity index 88% rename from tests/handlers/views_handler_field_xss.test rename to lib/Drupal/views/Tests/Handler/FieldXssTest.php index 65a1ce282900d1e0851ad3ed3a9ffc06a7a62054..0fc0072bd8d5e14d0c5f0b4949a209fce862f772 100644 --- a/tests/handlers/views_handler_field_xss.test +++ b/lib/Drupal/views/Tests/Handler/FieldXssTest.php @@ -2,15 +2,19 @@ /** * @file - * Definition of ViewsHandlerTestXss. + * Definition of Drupal\views\Tests\Handler\FieldXssTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests the core views_handler_field_css handler. * * @see CommonXssUnitTest */ -class ViewsHandlerTestXss extends ViewsSqlTest { +class FieldXssTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Field: Xss', diff --git a/tests/handlers/views_handler_filter_combine.test b/lib/Drupal/views/Tests/Handler/FilterCombineTest.php similarity index 93% rename from tests/handlers/views_handler_filter_combine.test rename to lib/Drupal/views/Tests/Handler/FilterCombineTest.php index 99bf1eb557a61b978ee03c3c19a0147fb0a4ba6f..9371b05dc7e4768b6446657883cf162b93455bb6 100644 --- a/tests/handlers/views_handler_filter_combine.test +++ b/lib/Drupal/views/Tests/Handler/FilterCombineTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsHandlerFilterCombineTest. + * Definition of Drupal\views\Tests\Handler\FilterCombineTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests the combine filter handler. */ -class ViewsHandlerFilterCombineTest extends ViewsSqlTest { +class FilterCombineTest extends ViewsSqlTest { var $column_map = array(); public static function getInfo() { diff --git a/tests/handlers/views_handler_filter_date.test b/lib/Drupal/views/Tests/Handler/FilterDateTest.php similarity index 97% rename from tests/handlers/views_handler_filter_date.test rename to lib/Drupal/views/Tests/Handler/FilterDateTest.php index cc1eced7899cfe4ebf94493dbe861ba06abbc9b9..d2cc6f9a3a4df409f42d61d2509e064d27b007b3 100644 --- a/tests/handlers/views_handler_filter_date.test +++ b/lib/Drupal/views/Tests/Handler/FilterDateTest.php @@ -2,13 +2,19 @@ /** * @file - * Definition of ViewsHandlerFilterDateTest. + * Definition of Drupal\views\Tests\Handler\FilterDateTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + +use view; + /** * Tests the core views_handler_filter_date handler. */ -class ViewsHandlerFilterDateTest extends ViewsSqlTest { +class FilterDateTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Filter: Date', diff --git a/tests/handlers/views_handler_filter_equality.test b/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php similarity index 91% rename from tests/handlers/views_handler_filter_equality.test rename to lib/Drupal/views/Tests/Handler/FilterEqualityTest.php index 43e13985826c1494e43f0d3513c475894cade2c8..351b5076dd801ec50c3bb367d67afeb9a2a8da0e 100644 --- a/tests/handlers/views_handler_filter_equality.test +++ b/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsHandlerFilterEqualityTest. + * Definition of Drupal\views\Tests\Handler\FilterEqualityTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests the core views_handler_filter_equality handler. */ -class ViewsHandlerFilterEqualityTest extends ViewsSqlTest { +class FilterEqualityTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Filter: Equality', diff --git a/tests/handlers/views_handler_filter_in_operator.test b/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php similarity index 92% rename from tests/handlers/views_handler_filter_in_operator.test rename to lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php index 4f35be900c85b6a72b5ec1aedc950fe867680ec5..1bdfb82805f3adaece50abdadf475217e4adfc96 100644 --- a/tests/handlers/views_handler_filter_in_operator.test +++ b/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsHandlerFilterInOperator. + * Definition of Drupal\views\Tests\Handler\FilterInOperatorTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests the core views_handler_filter_in_operator handler. */ -class ViewsHandlerFilterInOperator extends ViewsSqlTest { +class FilterInOperatorTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Filter: in_operator', diff --git a/tests/handlers/views_handler_filter_numeric.test b/lib/Drupal/views/Tests/Handler/FilterNumericTest.php similarity index 96% rename from tests/handlers/views_handler_filter_numeric.test rename to lib/Drupal/views/Tests/Handler/FilterNumericTest.php index d5f14d51a0d0fdc70db5e75068f2df30561315fd..849cc4c372b8eed93db7145eceaac3bb6e9e6782 100644 --- a/tests/handlers/views_handler_filter_numeric.test +++ b/lib/Drupal/views/Tests/Handler/FilterNumericTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsHandlerFilterNumericTest. + * Definition of Drupal\views\Tests\Handler\FilterNumericTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests the numeric filter handler. */ -class ViewsHandlerFilterNumericTest extends ViewsSqlTest { +class FilterNumericTest extends ViewsSqlTest { var $column_map = array(); public static function getInfo() { diff --git a/tests/handlers/views_handler_filter_string.test b/lib/Drupal/views/Tests/Handler/FilterStringTest.php similarity index 98% rename from tests/handlers/views_handler_filter_string.test rename to lib/Drupal/views/Tests/Handler/FilterStringTest.php index 73b845c38ed20fa5da0f4dc69225b66b171992fc..7c3679bc1598a4532abaea1013f09e0aec6d5931 100644 --- a/tests/handlers/views_handler_filter_string.test +++ b/lib/Drupal/views/Tests/Handler/FilterStringTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsHandlerFilterStringTest. + * Definition of Drupal\views\Tests\Handler\FilterStringTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests the core views_handler_filter_string handler. */ -class ViewsHandlerFilterStringTest extends ViewsSqlTest { +class FilterStringTest extends ViewsSqlTest { var $column_map = array(); public static function getInfo() { diff --git a/tests/handlers/views_handler_sort_date.test b/lib/Drupal/views/Tests/Handler/SortDateTest.php similarity index 97% rename from tests/handlers/views_handler_sort_date.test rename to lib/Drupal/views/Tests/Handler/SortDateTest.php index 65a94e815d2ccf7eca62f956eae57796e93d4718..cf61bfd00fe33094c4cc97373979b9558bde6364 100644 --- a/tests/handlers/views_handler_sort_date.test +++ b/lib/Drupal/views/Tests/Handler/SortDateTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsHandlerSortDateTest. + * Definition of Drupal\views\Tests\Handler\SortDateTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests for core views_handler_sort_date handler. */ -class ViewsHandlerSortDateTest extends ViewsSqlTest { +class SortDateTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Sort: date', diff --git a/tests/handlers/views_handler_sort_random.test b/lib/Drupal/views/Tests/Handler/SortRandomTest.php similarity index 93% rename from tests/handlers/views_handler_sort_random.test rename to lib/Drupal/views/Tests/Handler/SortRandomTest.php index 19db8a90d47515939e6a606eefb26370141d1555..d2ef174eaeffa5b5994c571da3a05117788bf49d 100644 --- a/tests/handlers/views_handler_sort_random.test +++ b/lib/Drupal/views/Tests/Handler/SortRandomTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsHandlerSortRandomTest. + * Definition of Drupal\views\Tests\Handler\SortRandomTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests for core views_handler_sort_random handler. */ -class ViewsHandlerSortRandomTest extends ViewsSqlTest { +class SortRandomTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Sort: random', diff --git a/tests/handlers/views_handler_sort.test b/lib/Drupal/views/Tests/Handler/SortTest.php similarity index 95% rename from tests/handlers/views_handler_sort.test rename to lib/Drupal/views/Tests/Handler/SortTest.php index 70f2aac4f46be541b9aea2f1e5c8c15ddcb4abbe..5d128cc20177de2811abc94aae94869c374be78b 100644 --- a/tests/handlers/views_handler_sort.test +++ b/lib/Drupal/views/Tests/Handler/SortTest.php @@ -2,13 +2,17 @@ /** * @file - * Definition of ViewsHandlerSortTest. + * Definition of Drupal\views\Tests\Handler\SortTest. */ +namespace Drupal\views\Tests\Handler; + +use ViewsSqlTest; + /** * Tests for core views_handler_sort handler. */ -class ViewsHandlerSortTest extends ViewsSqlTest { +class SortTest extends ViewsSqlTest { public static function getInfo() { return array( 'name' => 'Sort: generic', diff --git a/views.info b/views.info index 70f1bf5b9cab354f714b200b8b5a786ea71027df..3e0d2e19110413c8252e7531071647c7cfede102 100644 --- a/views.info +++ b/views.info @@ -244,27 +244,6 @@ files[] = plugins/views_plugin_style_summary_unformatted.inc files[] = plugins/views_plugin_style_table.inc ; Tests -files[] = tests/handlers/views_handler_area_text.test -files[] = tests/handlers/views_handler_argument_null.test -files[] = tests/handlers/views_handler_argument_string.test -files[] = tests/handlers/views_handler_field.test -files[] = tests/handlers/views_handler_field_boolean.test -files[] = tests/handlers/views_handler_field_custom.test -files[] = tests/handlers/views_handler_field_counter.test -files[] = tests/handlers/views_handler_field_date.test -files[] = tests/handlers/views_handler_field_file_size.test -files[] = tests/handlers/views_handler_field_math.test -files[] = tests/handlers/views_handler_field_url.test -files[] = tests/handlers/views_handler_field_xss.test -files[] = tests/handlers/views_handler_filter_combine.test -files[] = tests/handlers/views_handler_filter_date.test -files[] = tests/handlers/views_handler_filter_equality.test -files[] = tests/handlers/views_handler_filter_in_operator.test -files[] = tests/handlers/views_handler_filter_numeric.test -files[] = tests/handlers/views_handler_filter_string.test -files[] = tests/handlers/views_handler_sort_random.test -files[] = tests/handlers/views_handler_sort_date.test -files[] = tests/handlers/views_handler_sort.test files[] = tests/test_plugins/views_test_plugin_access_test_dynamic.inc files[] = tests/test_plugins/views_test_plugin_access_test_static.inc files[] = tests/plugins/views_plugin_display.test