diff --git a/lib/Drupal/views/Tests/AccessTest.php b/lib/Drupal/views/Tests/AccessTest.php
index 5db549d8ab28037d1cfddca1974b2da8708bada8..1b4d165816aafce6d5d8770e5328d55a76a5b1ae 100644
--- a/lib/Drupal/views/Tests/AccessTest.php
+++ b/lib/Drupal/views/Tests/AccessTest.php
@@ -8,7 +8,6 @@
namespace Drupal\views\Tests;
use Drupal\simpletest\WebTestBase;
-use ViewsSqlTest;
use Drupal\views\View;
use views_test_plugin_access_test_dynamic;
diff --git a/lib/Drupal/views/Tests/AnalyzeTest.php b/lib/Drupal/views/Tests/AnalyzeTest.php
index b2221ec3ff903b62ebe3633ebc5f2cc860894dbb..b86edbc166a1a54f4ee29c94056f12b31de3fc66 100644
--- a/lib/Drupal/views/Tests/AnalyzeTest.php
+++ b/lib/Drupal/views/Tests/AnalyzeTest.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Tests;
-use ViewsSqlTest;
-
/**
* Tests the views analyze system.
*/
diff --git a/lib/Drupal/views/Tests/ArgumentDefaultTest.php b/lib/Drupal/views/Tests/ArgumentDefaultTest.php
index afcdcd5d6ac5e5cb9abc07f0937c146b693e2954..7d49d232d40b813f13bbaddef71b5df221f42bd2 100644
--- a/lib/Drupal/views/Tests/ArgumentDefaultTest.php
+++ b/lib/Drupal/views/Tests/ArgumentDefaultTest.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Tests;
-use ViewsSqlTest;
use Drupal\views\View;
/**
diff --git a/lib/Drupal/views/Tests/ArgumentValidatorTest.php b/lib/Drupal/views/Tests/ArgumentValidatorTest.php
index bdf9e297485587349afc8ec2d441aabd4458597f..8ed578888cbf886dd86b54d2dc3b0f59e7bb3139 100644
--- a/lib/Drupal/views/Tests/ArgumentValidatorTest.php
+++ b/lib/Drupal/views/Tests/ArgumentValidatorTest.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Tests;
-use ViewsSqlTest;
use Drupal\views\View;
/**
diff --git a/lib/Drupal/views/Tests/BasicTest.php b/lib/Drupal/views/Tests/BasicTest.php
index dd2f5e9840648d3a89e3b81f763d604d6ad7d9fb..2b4eb5ee6eb345dad99e54c7f1082d61f9e54fb2 100644
--- a/lib/Drupal/views/Tests/BasicTest.php
+++ b/lib/Drupal/views/Tests/BasicTest.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Tests;
-use ViewsSqlTest;
-
/**
* Basic test class for Views query builder tests.
*/
diff --git a/lib/Drupal/views/Tests/CacheTest.php b/lib/Drupal/views/Tests/CacheTest.php
index a1c8d42adf4f66f0076b97e2503251c1e86eb293..845b9c971775839729bffc27c90238db33087a22 100644
--- a/lib/Drupal/views/Tests/CacheTest.php
+++ b/lib/Drupal/views/Tests/CacheTest.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Tests;
-use ViewsSqlTest;
use Drupal\views\View;
/**
diff --git a/lib/Drupal/views/Tests/Comment/ArgumentCommentUserUidTest.php b/lib/Drupal/views/Tests/Comment/ArgumentCommentUserUidTest.php
index ecc345c2ca0ea2c09c60c92f61d2cf2a2a92b071..f6abd57512f0bb874ec81e897d31dee6fe6672f2 100644
--- a/lib/Drupal/views/Tests/Comment/ArgumentCommentUserUidTest.php
+++ b/lib/Drupal/views/Tests/Comment/ArgumentCommentUserUidTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Comment;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
use Drupal\views\View;
/**
diff --git a/lib/Drupal/views/Tests/Comment/FilterCommentUserUidTest.php b/lib/Drupal/views/Tests/Comment/FilterCommentUserUidTest.php
index 4b67048ef51d9aa47f091f722d2870110d36769f..59c103bd242e7b67887a239a4c2995370bc0d7a7 100644
--- a/lib/Drupal/views/Tests/Comment/FilterCommentUserUidTest.php
+++ b/lib/Drupal/views/Tests/Comment/FilterCommentUserUidTest.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Tests\Comment;
-use ViewsSqlTest;
-
/**
* Tests the filter_comment_user_uid handler.
*
diff --git a/lib/Drupal/views/Tests/ExposedFormTest.php b/lib/Drupal/views/Tests/ExposedFormTest.php
index d6c8cd0b054bc0bd234b3fc4bea0efdad0516bb6..3546da25a28d605646dfae67d41f2116e036459a 100644
--- a/lib/Drupal/views/Tests/ExposedFormTest.php
+++ b/lib/Drupal/views/Tests/ExposedFormTest.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Tests;
-use ViewsSqlTest;
-
/**
* Tests exposed forms.
*/
diff --git a/lib/Drupal/views/Tests/Field/ApiDataTest.php b/lib/Drupal/views/Tests/Field/ApiDataTest.php
index 38a3d586f676b1dde7ee8b015cb3e06729e294c1..fc6082116f619eb2b1f621bfd526b161e528fbed 100644
--- a/lib/Drupal/views/Tests/Field/ApiDataTest.php
+++ b/lib/Drupal/views/Tests/Field/ApiDataTest.php
@@ -8,7 +8,6 @@
namespace Drupal\views\Tests\Field;
use Drupal\simpletest\WebTestBase;
-use ViewsSqlTest;
/**
* Test the produced views_data.
diff --git a/lib/Drupal/views/Tests/Field/ApiTestBase.php b/lib/Drupal/views/Tests/Field/ApiTestBase.php
index 253570988cf93210e4e77b01418fffe20573b22d..8b8b7165962c3ecdfc7f1c541f8c23c54ae6a2dc 100644
--- a/lib/Drupal/views/Tests/Field/ApiTestBase.php
+++ b/lib/Drupal/views/Tests/Field/ApiTestBase.php
@@ -19,7 +19,7 @@
namespace Drupal\views\Tests\Field;
use Drupal\simpletest\WebTestBase;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Provides some helper methods for testing fieldapi integration into views.
diff --git a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
index d8ad3cf3da6673048304f017ff7bcb0bfe923f6a..cb4f608360d6f6c6d34a4d2505ed906d66249fcf 100644
--- a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
+++ b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
@@ -8,7 +8,6 @@
namespace Drupal\views\Tests\Field;
use Drupal\simpletest\WebTestBase;
-use ViewsSqlTest;
use Drupal\views\View;
/**
diff --git a/lib/Drupal/views/Tests/GlossaryTest.php b/lib/Drupal/views/Tests/GlossaryTest.php
index 3745fc7e5de6e5900d3daf9edd1a589dbc35db7b..b915d8388f2da4e7ac0eb7f9a1136a1e79642bf5 100644
--- a/lib/Drupal/views/Tests/GlossaryTest.php
+++ b/lib/Drupal/views/Tests/GlossaryTest.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Tests;
-use ViewsSqlTest;
-
/**
* Tests glossary view ( summary of arguments ).
*/
diff --git a/lib/Drupal/views/Tests/Handler/AreaTextTest.php b/lib/Drupal/views/Tests/Handler/AreaTextTest.php
index 83f0b431dbd32dab012157716526f045eca014f5..5f04f7e8d9ae21c356c7566ea249e3a22fc92b3c 100644
--- a/lib/Drupal/views/Tests/Handler/AreaTextTest.php
+++ b/lib/Drupal/views/Tests/Handler/AreaTextTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the text area handler.
diff --git a/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php b/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
index 6f16dec0c1771d77372e4a73c21a073e9937c812..27d4cdbb09a22abf32d2a69843a762c7a1a12961 100644
--- a/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
+++ b/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the core views_handler_argument_null handler.
diff --git a/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php b/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
index 9833129e5e4c8edb03df7110cb9f37e40a7522da..8695cc3657cb896afaf2b64c1a668d1a3ad1bf7f 100644
--- a/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
+++ b/lib/Drupal/views/Tests/Handler/ArgumentStringTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
use Drupal\views\View;
/**
diff --git a/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php b/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
index a0e65c74a0318f4fea0e1b63869d060ef8c9846c..7e4e3758f76e1238b584ba9133be4821f12da445 100644
--- a/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the core views_handler_field_boolean handler.
diff --git a/lib/Drupal/views/Tests/Handler/FieldCounterTest.php b/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
index ad282793355b2f829f696551e260f926bd934bd7..589747820f19deeafe20669964c51be3b12d84f2 100644
--- a/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the views_handler_field_counter handler.
diff --git a/lib/Drupal/views/Tests/Handler/FieldCustomTest.php b/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
index d299fd77050e3712b1e4393884067df269e9ec8a..803ae616d0924c8dede77214e8ecf11dc4535dce 100644
--- a/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the core views_handler_field_custom handler.
diff --git a/lib/Drupal/views/Tests/Handler/FieldDateTest.php b/lib/Drupal/views/Tests/Handler/FieldDateTest.php
index d7ab303533caa301e1fb712fdda5c54dcdf1f8d9..eff9ae611906fe3c746eaa169738af1249b35d57 100644
--- a/lib/Drupal/views/Tests/Handler/FieldDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldDateTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the core views_handler_field_date handler.
diff --git a/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php b/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
index 1e6a3fa1997bd401335703e43c87305835eed9a5..5d74e908db653d9b5255d200360eec50daa11204 100644
--- a/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the core views_handler_field_file_size handler.
diff --git a/lib/Drupal/views/Tests/Handler/FieldMathTest.php b/lib/Drupal/views/Tests/Handler/FieldMathTest.php
index ec58303ab860724727ec774671f00dbfbed1ba21..cd7bbe1d559ccf9a090ad1e2dc18286cc180ec39 100644
--- a/lib/Drupal/views/Tests/Handler/FieldMathTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldMathTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the core views_handler_field_math handler.
diff --git a/lib/Drupal/views/Tests/Handler/FieldTest.php b/lib/Drupal/views/Tests/Handler/FieldTest.php
index 4b85e8ce23130d2a26d9eccf5f79e4c03375c4c9..c7190e6188ded3a79bd28d36181f7ad7a5975b61 100644
--- a/lib/Drupal/views/Tests/Handler/FieldTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the generic field handler
diff --git a/lib/Drupal/views/Tests/Handler/FieldUrlTest.php b/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
index 30880743e6f084f171f2075f4c1cab8f13c0978a..edd1ccd718993e5db5e1703faac96e8cbffe58dc 100644
--- a/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the core views_handler_field_url handler.
*/
diff --git a/lib/Drupal/views/Tests/Handler/FieldXssTest.php b/lib/Drupal/views/Tests/Handler/FieldXssTest.php
index 0fc0072bd8d5e14d0c5f0b4949a209fce862f772..97f636d5fa0f429a578808626c8f734eb4867414 100644
--- a/lib/Drupal/views/Tests/Handler/FieldXssTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldXssTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the core views_handler_field_css handler.
diff --git a/lib/Drupal/views/Tests/Handler/FilterCombineTest.php b/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
index 9371b05dc7e4768b6446657883cf162b93455bb6..ebb1bbf0417aa2ffceeca9dfe2d8c663464156e5 100644
--- a/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the combine filter handler.
diff --git a/lib/Drupal/views/Tests/Handler/FilterDateTest.php b/lib/Drupal/views/Tests/Handler/FilterDateTest.php
index 2efa686572e382a3bf8d9a131ecc0e7fbccd4a99..19d96a58ec751cbbadb1d38c8c744a3e2413389e 100644
--- a/lib/Drupal/views/Tests/Handler/FilterDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterDateTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
use Drupal\views\View;
/**
diff --git a/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php b/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
index 351b5076dd801ec50c3bb367d67afeb9a2a8da0e..7e1874b077bc221a072bffff796b4ced766bf133 100644
--- a/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the core views_handler_filter_equality handler.
diff --git a/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php b/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
index 1bdfb82805f3adaece50abdadf475217e4adfc96..f3b0da5c3c5f0ff3fefd4dea135ba969b5b36ec2 100644
--- a/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the core views_handler_filter_in_operator handler.
diff --git a/lib/Drupal/views/Tests/Handler/FilterNumericTest.php b/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
index 849cc4c372b8eed93db7145eceaac3bb6e9e6782..f24f4334e6e2165ec3389c21b9ed3035d576f777 100644
--- a/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the numeric filter handler.
diff --git a/lib/Drupal/views/Tests/Handler/FilterStringTest.php b/lib/Drupal/views/Tests/Handler/FilterStringTest.php
index 7c3679bc1598a4532abaea1013f09e0aec6d5931..426e6573e8ce1784ebbafb896eefb7eb3dc4b677 100644
--- a/lib/Drupal/views/Tests/Handler/FilterStringTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterStringTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the core views_handler_filter_string handler.
diff --git a/lib/Drupal/views/Tests/Handler/SortDateTest.php b/lib/Drupal/views/Tests/Handler/SortDateTest.php
index cf61bfd00fe33094c4cc97373979b9558bde6364..f2f67a2b92349439ba171b9c95ef128331861817 100644
--- a/lib/Drupal/views/Tests/Handler/SortDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortDateTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests for core views_handler_sort_date handler.
diff --git a/lib/Drupal/views/Tests/Handler/SortRandomTest.php b/lib/Drupal/views/Tests/Handler/SortRandomTest.php
index d2ef174eaeffa5b5994c571da3a05117788bf49d..da9f4aacc2a724b4761da97c079cba0aa0426924 100644
--- a/lib/Drupal/views/Tests/Handler/SortRandomTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortRandomTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests for core views_handler_sort_random handler.
diff --git a/lib/Drupal/views/Tests/Handler/SortTest.php b/lib/Drupal/views/Tests/Handler/SortTest.php
index 5d128cc20177de2811abc94aae94869c374be78b..cf6a4caf7d034d47cad1f3d65454b8bfbf4be7f1 100644
--- a/lib/Drupal/views/Tests/Handler/SortTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Handler;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests for core views_handler_sort handler.
diff --git a/lib/Drupal/views/Tests/HandlersTest.php b/lib/Drupal/views/Tests/HandlersTest.php
index b44ce0cfda9d3e91264e996af40254ac70726580..cae4efdd82f913893a4660922680c54d57042c83 100644
--- a/lib/Drupal/views/Tests/HandlersTest.php
+++ b/lib/Drupal/views/Tests/HandlersTest.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Tests;
-use ViewsSqlTest;
-
/**
* Tests abstract handlers of views.
*/
diff --git a/lib/Drupal/views/Tests/ModuleTest.php b/lib/Drupal/views/Tests/ModuleTest.php
index e97430bfec58ccb8e314752174f4de455cb98107..6cd8e3766b10473fd0a511c8f9c067adebc66cad 100644
--- a/lib/Drupal/views/Tests/ModuleTest.php
+++ b/lib/Drupal/views/Tests/ModuleTest.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Tests;
-use ViewsSqlTest;
-
/**
* Tests basic functions from the Views module.
*/
diff --git a/lib/Drupal/views/Tests/PagerTest.php b/lib/Drupal/views/Tests/PagerTest.php
index 9d21bd0b5f3c22f9ffe0f1ae287b378ab2fcd831..196743816189aabfafb4c49ffb06533e720c9289 100644
--- a/lib/Drupal/views/Tests/PagerTest.php
+++ b/lib/Drupal/views/Tests/PagerTest.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Tests;
-use ViewsSqlTest;
use Drupal\views\View;
/**
diff --git a/lib/Drupal/views/Tests/Plugins/DisplayTestCase.php b/lib/Drupal/views/Tests/Plugins/DisplayTestCase.php
index 40b01ed04bb155c8141786591d7e824a5cc71e0e..542d3ff3edf5ceade85c99a894bc124fcabcc01d 100644
--- a/lib/Drupal/views/Tests/Plugins/DisplayTestCase.php
+++ b/lib/Drupal/views/Tests/Plugins/DisplayTestCase.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Plugins;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
use Drupal\views\View;
/**
diff --git a/lib/Drupal/views/Tests/QueryGroupByTest.php b/lib/Drupal/views/Tests/QueryGroupByTest.php
index e871454105bd595661421dda99f8cc73f79339e7..4acc8ef204b873e194039358d44bcf88721e81f3 100644
--- a/lib/Drupal/views/Tests/QueryGroupByTest.php
+++ b/lib/Drupal/views/Tests/QueryGroupByTest.php
@@ -8,7 +8,6 @@
namespace Drupal\views\Tests;
use Drupal\views\View;
-use ViewsSqlTest;
/**
* Tests aggregate functionality of views, for example count.
diff --git a/lib/Drupal/views/Tests/Style/PluginStyleJumpMenuTest.php b/lib/Drupal/views/Tests/Style/PluginStyleJumpMenuTest.php
index ac2c0c3df9db104206dddc4623e503c3f449fee7..2518a373b6c1f83b635a4e909b7ea4943853dc62 100644
--- a/lib/Drupal/views/Tests/Style/PluginStyleJumpMenuTest.php
+++ b/lib/Drupal/views/Tests/Style/PluginStyleJumpMenuTest.php
@@ -7,7 +7,7 @@
namespace Drupal\views\Tests\Style;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
use Drupal\views\View;
/**
diff --git a/lib/Drupal/views/Tests/Style/PluginStyleTest.php b/lib/Drupal/views/Tests/Style/PluginStyleTest.php
index 52109bf584675fdf32d295e2c2154b9a770c2148..44522599ec726428d26ce615a1bd823e7946f9cc 100644
--- a/lib/Drupal/views/Tests/Style/PluginStyleTest.php
+++ b/lib/Drupal/views/Tests/Style/PluginStyleTest.php
@@ -9,7 +9,7 @@
use stdClass;
use DOMDocument;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests some general style plugin related functionality.
diff --git a/lib/Drupal/views/Tests/Style/PluginStyleUnformattedTest.php b/lib/Drupal/views/Tests/Style/PluginStyleUnformattedTest.php
index 39dc2278077a1137073b06ab7a074209792eaab3..608951eac81272dc1af151dd7667fd871228a840 100644
--- a/lib/Drupal/views/Tests/Style/PluginStyleUnformattedTest.php
+++ b/lib/Drupal/views/Tests/Style/PluginStyleUnformattedTest.php
@@ -8,7 +8,7 @@
namespace Drupal\views\Tests\Style;
use DOMDocument;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the default/unformatted row style.
diff --git a/lib/Drupal/views/Tests/TranslatableTest.php b/lib/Drupal/views/Tests/TranslatableTest.php
index ab054483cddf858af9b9606a754332256389a0db..93efcb5fb9119621532796f8c6930518cd64078a 100644
--- a/lib/Drupal/views/Tests/TranslatableTest.php
+++ b/lib/Drupal/views/Tests/TranslatableTest.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Tests;
-use ViewsSqlTest;
use Drupal\views\View;
/**
diff --git a/lib/Drupal/views/Tests/UpgradeTestCase.php b/lib/Drupal/views/Tests/UpgradeTestCase.php
index 04cf70727ce026cbbbab4064522737e799c1ec1a..e109d2288af2e12369cbee55470157edf7ae4f6d 100644
--- a/lib/Drupal/views/Tests/UpgradeTestCase.php
+++ b/lib/Drupal/views/Tests/UpgradeTestCase.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Tests;
-use ViewsSqlTest;
use Drupal\views\View;
/**
diff --git a/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php b/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
index 20272b7bafe02ab55acae274ed59fcbd225652da..6c7282cef847102a3296ce5ab2d649f6548b2a07 100644
--- a/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
+++ b/lib/Drupal/views/Tests/User/HandlerFieldUserNameTest.php
@@ -8,7 +8,7 @@
namespace Drupal\views\Tests\User;
use Drupal\views\View;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests the field username handler.
diff --git a/lib/Drupal/views/Tests/User/UserArgumentDefault.php b/lib/Drupal/views/Tests/User/UserArgumentDefault.php
index 68ae0503dfb28730ec9e8158ffeb3aa0b5b5105a..838fbfe5f5f3ce01758cd5e392301cb45a2cb8f0 100644
--- a/lib/Drupal/views/Tests/User/UserArgumentDefault.php
+++ b/lib/Drupal/views/Tests/User/UserArgumentDefault.php
@@ -8,7 +8,7 @@
namespace Drupal\views\Tests\User;
use Drupal\views\View;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests views user argument default plugin.
diff --git a/lib/Drupal/views/Tests/User/UserArgumentValidate.php b/lib/Drupal/views/Tests/User/UserArgumentValidate.php
index eb38d47c169556fc9a3623cdf9119a13b70dba10..06c71e26fac8b011f67f7008eca9090c694bfd27 100644
--- a/lib/Drupal/views/Tests/User/UserArgumentValidate.php
+++ b/lib/Drupal/views/Tests/User/UserArgumentValidate.php
@@ -8,7 +8,7 @@
namespace Drupal\views\Tests\User;
use Drupal\views\View;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests views user argument argument handler.
diff --git a/lib/Drupal/views/Tests/User/UserTestCase.php b/lib/Drupal/views/Tests/User/UserTestCase.php
index 359fb99c7eb482cb7439bbcf281d8191a02f7b53..2d2f9b6f5e3d1516a1335298588e018939a34fa5 100644
--- a/lib/Drupal/views/Tests/User/UserTestCase.php
+++ b/lib/Drupal/views/Tests/User/UserTestCase.php
@@ -8,7 +8,7 @@
namespace Drupal\views\Tests\User;
use Drupal\views\View;
-use ViewsSqlTest;
+use Drupal\views\Tests\ViewsSqlTest;
/**
* Tests basic user module integration into views.
diff --git a/lib/Drupal/views/Tests/ViewTest.php b/lib/Drupal/views/Tests/ViewTest.php
index fddd5026235d9b03e2582a1082d779209f9d9124..dffdc89acac7d405de7ad26a311eb4f9bb295da7 100644
--- a/lib/Drupal/views/Tests/ViewTest.php
+++ b/lib/Drupal/views/Tests/ViewTest.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Tests;
-use ViewsSqlTest;
use Drupal\views\View;
/**
diff --git a/tests/views_query.test b/lib/Drupal/views/Tests/ViewsSqlTest.php
similarity index 63%
rename from tests/views_query.test
rename to lib/Drupal/views/Tests/ViewsSqlTest.php
index 4ad03611caf451d48837e94a37d3f6ba33770c54..69372901291f1fbc7b4ca6234cd91009f6f94625 100644
--- a/tests/views_query.test
+++ b/lib/Drupal/views/Tests/ViewsSqlTest.php
@@ -1,132 +1,13 @@
<?php
-
/**
* @file
- * Tests for Views query features.
+ * Definition of Drupal\views\Tests\ViewsSqlTest
*/
+namespace Drupal\views\Tests;
-use Drupal\simpletest\WebTestBase;
use Drupal\views\View;
-/**
- * Abstract class for views testing.
- */
-abstract class ViewsTestCase extends WebTestBase {
- /**
- * Helper function: verify a result set returned by view.
- *
- * The comparison is done on the string representation of the columns of the
- * column map, taking the order of the rows into account, but not the order
- * of the columns.
- *
- * @param $view
- * An executed View.
- * @param $expected_result
- * An expected result set.
- * @param $column_map
- * An associative array mapping the columns of the result set from the view
- * (as keys) and the expected result set (as values).
- */
- protected function assertIdenticalResultset($view, $expected_result, $column_map = array(), $message = 'Identical result set') {
- return $this->assertIdenticalResultsetHelper($view, $expected_result, $column_map, $message, 'assertIdentical');
- }
-
- /**
- * Helper function: verify a result set returned by view..
- *
- * Inverse of ViewsTestCase::assertIdenticalResultset().
- *
- * @param $view
- * An executed View.
- * @param $expected_result
- * An expected result set.
- * @param $column_map
- * An associative array mapping the columns of the result set from the view
- * (as keys) and the expected result set (as values).
- */
- protected function assertNotIdenticalResultset($view, $expected_result, $column_map = array(), $message = 'Identical result set') {
- return $this->assertIdenticalResultsetHelper($view, $expected_result, $column_map, $message, 'assertNotIdentical');
- }
-
- protected function assertIdenticalResultsetHelper($view, $expected_result, $column_map, $message, $assert_method) {
- // Convert $view->result to an array of arrays.
- $result = array();
- foreach ($view->result as $key => $value) {
- $row = array();
- foreach ($column_map as $view_column => $expected_column) {
- // The comparison will be done on the string representation of the value.
- $row[$expected_column] = (string) $value->$view_column;
- }
- $result[$key] = $row;
- }
-
- // Remove the columns we don't need from the expected result.
- foreach ($expected_result as $key => $value) {
- $row = array();
- foreach ($column_map as $expected_column) {
- // The comparison will be done on the string representation of the value.
- $row[$expected_column] = (string) (is_object($value) ? $value->$expected_column : $value[$expected_column]);
- }
- $expected_result[$key] = $row;
- }
-
- // Reset the numbering of the arrays.
- $result = array_values($result);
- $expected_result = array_values($expected_result);
-
- $this->verbose('<pre>Returned data set: ' . print_r($result, TRUE) . "\n\nExpected: ". print_r($expected_result, TRUE));
-
- // Do the actual comparison.
- return $this->$assert_method($result, $expected_result, $message);
- }
-
- /**
- * Helper function: order an array of array based on a column.
- */
- protected function orderResultSet($result_set, $column, $reverse = FALSE) {
- $this->sort_column = $column;
- $this->sort_order = $reverse ? -1 : 1;
- usort($result_set, array($this, 'helperCompareFunction'));
- return $result_set;
- }
-
- protected $sort_column = NULL;
- protected $sort_order = 1;
-
- /**
- * Helper comparison function for orderResultSet().
- */
- protected function helperCompareFunction($a, $b) {
- $value1 = $a[$this->sort_column];
- $value2 = $b[$this->sort_column];
- if ($value1 == $value2) {
- return 0;
- }
- return $this->sort_order * (($value1 < $value2) ? -1 : 1);
- }
-
- /**
- * Helper function to check whether a button with a certain id exists and has a certain label.
- */
- protected function helperButtonHasLabel($id, $expected_label, $message = 'Label has the expected value: %label.') {
- return $this->assertFieldById($id, $expected_label, t($message, array('%label' => $expected_label)));
- }
-
- /**
- * Helper function to execute a view with debugging.
- *
- * @param view $view
- * @param array $args
- */
- protected function executeView($view, $args = array()) {
- $view->set_display();
- $view->pre_execute($args);
- $view->execute();
- $this->verbose('<pre>Executed view: ' . ((string) $view->build_info['query']) . '</pre>');
- }
-}
-
-abstract class ViewsSqlTest extends ViewsTestCase {
+abstract class ViewsSqlTest extends ViewsTestBase {
protected function setUp() {
parent::setUp('views', 'views_ui');
diff --git a/lib/Drupal/views/Tests/ViewsTestBase.php b/lib/Drupal/views/Tests/ViewsTestBase.php
new file mode 100644
index 0000000000000000000000000000000000000000..d6f021a0adde6bc63d6a9ed3da09e80adcde8774
--- /dev/null
+++ b/lib/Drupal/views/Tests/ViewsTestBase.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * @file
+ * Definition of Drupal\views\Tests\ViewsTestBase
+ */
+
+namespace Drupal\views\Tests;
+use Drupal\simpletest\WebTestBase;
+use Drupal\views\View;
+
+/**
+ * Abstract class for views testing.
+ */
+abstract class ViewsTestBase extends WebTestBase {
+ /**
+ * Helper function: verify a result set returned by view.
+ *
+ * The comparison is done on the string representation of the columns of the
+ * column map, taking the order of the rows into account, but not the order
+ * of the columns.
+ *
+ * @param $view
+ * An executed View.
+ * @param $expected_result
+ * An expected result set.
+ * @param $column_map
+ * An associative array mapping the columns of the result set from the view
+ * (as keys) and the expected result set (as values).
+ */
+ protected function assertIdenticalResultset($view, $expected_result, $column_map = array(), $message = 'Identical result set') {
+ return $this->assertIdenticalResultsetHelper($view, $expected_result, $column_map, $message, 'assertIdentical');
+ }
+
+ /**
+ * Helper function: verify a result set returned by view..
+ *
+ * Inverse of ViewsTestCase::assertIdenticalResultset().
+ *
+ * @param $view
+ * An executed View.
+ * @param $expected_result
+ * An expected result set.
+ * @param $column_map
+ * An associative array mapping the columns of the result set from the view
+ * (as keys) and the expected result set (as values).
+ */
+ protected function assertNotIdenticalResultset($view, $expected_result, $column_map = array(), $message = 'Identical result set') {
+ return $this->assertIdenticalResultsetHelper($view, $expected_result, $column_map, $message, 'assertNotIdentical');
+ }
+
+ protected function assertIdenticalResultsetHelper($view, $expected_result, $column_map, $message, $assert_method) {
+ // Convert $view->result to an array of arrays.
+ $result = array();
+ foreach ($view->result as $key => $value) {
+ $row = array();
+ foreach ($column_map as $view_column => $expected_column) {
+ // The comparison will be done on the string representation of the value.
+ $row[$expected_column] = (string) $value->$view_column;
+ }
+ $result[$key] = $row;
+ }
+
+ // Remove the columns we don't need from the expected result.
+ foreach ($expected_result as $key => $value) {
+ $row = array();
+ foreach ($column_map as $expected_column) {
+ // The comparison will be done on the string representation of the value.
+ $row[$expected_column] = (string) (is_object($value) ? $value->$expected_column : $value[$expected_column]);
+ }
+ $expected_result[$key] = $row;
+ }
+
+ // Reset the numbering of the arrays.
+ $result = array_values($result);
+ $expected_result = array_values($expected_result);
+
+ $this->verbose('<pre>Returned data set: ' . print_r($result, TRUE) . "\n\nExpected: ". print_r($expected_result, TRUE));
+
+ // Do the actual comparison.
+ return $this->$assert_method($result, $expected_result, $message);
+ }
+
+ /**
+ * Helper function: order an array of array based on a column.
+ */
+ protected function orderResultSet($result_set, $column, $reverse = FALSE) {
+ $this->sort_column = $column;
+ $this->sort_order = $reverse ? -1 : 1;
+ usort($result_set, array($this, 'helperCompareFunction'));
+ return $result_set;
+ }
+
+ protected $sort_column = NULL;
+ protected $sort_order = 1;
+
+ /**
+ * Helper comparison function for orderResultSet().
+ */
+ protected function helperCompareFunction($a, $b) {
+ $value1 = $a[$this->sort_column];
+ $value2 = $b[$this->sort_column];
+ if ($value1 == $value2) {
+ return 0;
+ }
+ return $this->sort_order * (($value1 < $value2) ? -1 : 1);
+ }
+
+ /**
+ * Helper function to check whether a button with a certain id exists and has a certain label.
+ */
+ protected function helperButtonHasLabel($id, $expected_label, $message = 'Label has the expected value: %label.') {
+ return $this->assertFieldById($id, $expected_label, t($message, array('%label' => $expected_label)));
+ }
+
+ /**
+ * Helper function to execute a view with debugging.
+ *
+ * @param view $view
+ * @param array $args
+ */
+ protected function executeView($view, $args = array()) {
+ $view->set_display();
+ $view->pre_execute($args);
+ $view->execute();
+ $this->verbose('<pre>Executed view: ' . ((string) $view->build_info['query']) . '</pre>');
+ }
+}
diff --git a/lib/Drupal/views/Tests/WizardTestBase.php b/lib/Drupal/views/Tests/WizardTestBase.php
index ab12aad9afb224c7b51eaa274e5203c0a17966a1..5f046e3550cc2151f75aaa297551ee23b6a63c7d 100644
--- a/lib/Drupal/views/Tests/WizardTestBase.php
+++ b/lib/Drupal/views/Tests/WizardTestBase.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Tests;
-use ViewsSqlTest;
-
/**
* Views UI wizard tests.
*/
diff --git a/views.info b/views.info
index 3ccd3b6e65b300fd9eb21c2e7f2015d84da92e6d..6d1b1ad416a6e5520625f2544c8f82910f3f7d64 100644
--- a/views.info
+++ b/views.info
@@ -246,5 +246,4 @@ files[] = plugins/views_plugin_style_table.inc
files[] = tests/test_plugins/views_test_plugin_access_test_dynamic.inc
files[] = tests/test_plugins/views_test_plugin_access_test_static.inc
files[] = tests/views_plugin_localization_test.inc
-files[] = tests/views_query.test
files[] = tests/views_test.views_default.inc