From 42bd78773ecd0e69db2de61df13cef08aa409f47 Mon Sep 17 00:00:00 2001
From: robloach <robloach@61114.no-reply.drupal.org>
Date: Fri, 15 Jun 2012 19:32:19 +0200
Subject: [PATCH] Issue #1637412 by Manuel Garcia, Rob Loach: [8.x] Convert
 Handler tests to PSR-0.

---
 .../views/Tests/Handler/AreaTextTest.php      |  8 +++++--
 .../views/Tests/Handler/ArgumentNullTest.php  |  8 +++++--
 .../Tests/Handler/ArgumentStringTest.php      | 11 ++++++++--
 .../views/Tests/Handler/FieldBooleanTest.php  |  8 +++++--
 .../views/Tests/Handler/FieldCounterTest.php  |  8 +++++--
 .../views/Tests/Handler/FieldCustomTest.php   |  8 +++++--
 .../views/Tests/Handler/FieldDateTest.php     |  8 +++++--
 .../views/Tests/Handler/FieldFileSizeTest.php |  8 +++++--
 .../views/Tests/Handler/FieldMathTest.php     |  8 +++++--
 .../Drupal/views/Tests/Handler/FieldTest.php  |  8 +++++--
 .../views/Tests/Handler/FieldUrlTest.php      |  7 +++++--
 .../views/Tests/Handler/FieldXssTest.php      |  8 +++++--
 .../views/Tests/Handler/FilterCombineTest.php |  8 +++++--
 .../views/Tests/Handler/FilterDateTest.php    | 10 +++++++--
 .../Tests/Handler/FilterEqualityTest.php      |  8 +++++--
 .../Tests/Handler/FilterInOperatorTest.php    |  8 +++++--
 .../views/Tests/Handler/FilterNumericTest.php |  8 +++++--
 .../views/Tests/Handler/FilterStringTest.php  |  8 +++++--
 .../views/Tests/Handler/SortDateTest.php      |  8 +++++--
 .../views/Tests/Handler/SortRandomTest.php    |  8 +++++--
 .../Drupal/views/Tests/Handler/SortTest.php   |  8 +++++--
 views.info                                    | 21 -------------------
 22 files changed, 130 insertions(+), 63 deletions(-)
 rename tests/handlers/views_handler_area_text.test => lib/Drupal/views/Tests/Handler/AreaTextTest.php (91%)
 rename tests/handlers/views_handler_argument_null.test => lib/Drupal/views/Tests/Handler/ArgumentNullTest.php (92%)
 rename tests/handlers/views_handler_argument_string.test => lib/Drupal/views/Tests/Handler/ArgumentStringTest.php (94%)
 rename tests/handlers/views_handler_field_boolean.test => lib/Drupal/views/Tests/Handler/FieldBooleanTest.php (93%)
 rename tests/handlers/views_handler_field_counter.test => lib/Drupal/views/Tests/Handler/FieldCounterTest.php (91%)
 rename tests/handlers/views_handler_field_custom.test => lib/Drupal/views/Tests/Handler/FieldCustomTest.php (86%)
 rename tests/handlers/views_handler_field_date.test => lib/Drupal/views/Tests/Handler/FieldDateTest.php (92%)
 rename tests/handlers/views_handler_field_file_size.test => lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php (91%)
 rename tests/handlers/views_handler_field_math.test => lib/Drupal/views/Tests/Handler/FieldMathTest.php (85%)
 rename tests/handlers/views_handler_field.test => lib/Drupal/views/Tests/Handler/FieldTest.php (99%)
 rename tests/handlers/views_handler_field_url.test => lib/Drupal/views/Tests/Handler/FieldUrlTest.php (89%)
 rename tests/handlers/views_handler_field_xss.test => lib/Drupal/views/Tests/Handler/FieldXssTest.php (88%)
 rename tests/handlers/views_handler_filter_combine.test => lib/Drupal/views/Tests/Handler/FilterCombineTest.php (93%)
 rename tests/handlers/views_handler_filter_date.test => lib/Drupal/views/Tests/Handler/FilterDateTest.php (97%)
 rename tests/handlers/views_handler_filter_equality.test => lib/Drupal/views/Tests/Handler/FilterEqualityTest.php (91%)
 rename tests/handlers/views_handler_filter_in_operator.test => lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php (92%)
 rename tests/handlers/views_handler_filter_numeric.test => lib/Drupal/views/Tests/Handler/FilterNumericTest.php (96%)
 rename tests/handlers/views_handler_filter_string.test => lib/Drupal/views/Tests/Handler/FilterStringTest.php (98%)
 rename tests/handlers/views_handler_sort_date.test => lib/Drupal/views/Tests/Handler/SortDateTest.php (97%)
 rename tests/handlers/views_handler_sort_random.test => lib/Drupal/views/Tests/Handler/SortRandomTest.php (93%)
 rename tests/handlers/views_handler_sort.test => lib/Drupal/views/Tests/Handler/SortTest.php (95%)

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 9f30e0c52733..83f0b431dbd3 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 e8650a3837a7..6f16dec0c177 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 d078abfe2256..9e5cabc078e5 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 92ec7a51da61..a0e65c74a031 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 2ddcb6f653f8..afeb1ecac3fc 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 b45fd1770d7e..d299fd77050e 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 5b0962c2d4dd..d7ab303533ca 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 8652754fea11..1e6a3fa1997b 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 ac33ac4a4feb..ec58303ab860 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 9e6dfca2563a..4b85e8ce2313 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 527e94fb4126..30880743e6f0 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 65a1ce282900..0fc0072bd8d5 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 99bf1eb557a6..9371b05dc7e4 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 cc1eced7899c..d2cc6f9a3a4d 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 43e13985826c..351b5076dd80 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 4f35be900c85..1bdfb82805f3 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 d5f14d51a0d0..849cc4c372b8 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 73b845c38ed2..7c3679bc1598 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 65a94e815d2c..cf61bfd00fe3 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 19db8a90d475..d2ef174eaeff 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 70f2aac4f46b..5d128cc20177 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 70f1bf5b9cab..3e0d2e191104 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
-- 
GitLab