Issue #1641694 by Rob Loach, chrisdolby, dawehner, tim.plunkett: Convert query test to PSR-0.

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;
 

lib/Drupal/views/Tests/AnalyzeTest.php

@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
-
 /**
  * Tests the views analyze system.
  */

lib/Drupal/views/Tests/ArgumentDefaultTest.php

@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
 use Drupal\views\View;
 
 /**

lib/Drupal/views/Tests/ArgumentValidatorTest.php

@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
 use Drupal\views\View;
 
 /**

lib/Drupal/views/Tests/BasicTest.php

@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
-
 /**
  * Basic test class for Views query builder tests.
  */

lib/Drupal/views/Tests/CacheTest.php

@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
 use Drupal\views\View;
 
 /**

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;
 
 /**

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.
  *

lib/Drupal/views/Tests/ExposedFormTest.php

@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
-
 /**
  * Tests exposed forms.
  */

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.

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.

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;
 
 /**

lib/Drupal/views/Tests/GlossaryTest.php

@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
-
 /**
  * Tests glossary view ( summary of arguments ).
  */

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.

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.

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;
 
 /**

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.

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.

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.

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.

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.

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.

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

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.
  */

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.

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.

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;
 
 /**

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.

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.

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.

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.

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.

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.

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.

lib/Drupal/views/Tests/HandlersTest.php

@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
-
 /**
  * Tests abstract handlers of views.
  */

lib/Drupal/views/Tests/ModuleTest.php

@@ -7,8 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
-
 /**
  * Tests basic functions from the Views module.
  */

lib/Drupal/views/Tests/PagerTest.php

@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
 use Drupal\views\View;
 
 /**

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;
 
 /**

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.

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;
 
 /**

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.

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.

lib/Drupal/views/Tests/TranslatableTest.php

@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
 use Drupal\views\View;
 
 /**

lib/Drupal/views/Tests/UpgradeTestCase.php

@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
 use Drupal\views\View;
 
 /**

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.

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.

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.

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.

lib/Drupal/views/Tests/ViewTest.php

@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use ViewsSqlTest;
 use Drupal\views\View;
 
 /**

tests/views_query.test → lib/Drupal/views/Tests/ViewsSqlTest.php

 <?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>');
-  }
-}
-