From e9d7edb7d7052f146a19c46e022b444cd88302d9 Mon Sep 17 00:00:00 2001
From: Tim Plunkett <git@plnktt.com>
Date: Sun, 26 Aug 2012 16:01:32 +0200
Subject: [PATCH] Issue #1757154 by tim.plunkett: Convert certain tests to use
ViewsSchemaTestBase.
---
lib/Drupal/views/Tests/AccessTest.php | 2 +-
lib/Drupal/views/Tests/ArgumentDefaultTest.php | 2 +-
lib/Drupal/views/Tests/BasicTest.php | 2 +-
lib/Drupal/views/Tests/CacheTest.php | 3 ++-
lib/Drupal/views/Tests/ExposedFormTest.php | 2 +-
lib/Drupal/views/Tests/Handler/ArgumentNullTest.php | 4 ++--
lib/Drupal/views/Tests/Handler/FieldBooleanTest.php | 4 ++--
lib/Drupal/views/Tests/Handler/FieldCounterTest.php | 4 ++--
lib/Drupal/views/Tests/Handler/FieldCustomTest.php | 4 ++--
lib/Drupal/views/Tests/Handler/FieldDateTest.php | 4 ++--
lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php | 4 ++--
lib/Drupal/views/Tests/Handler/FieldTest.php | 4 ++--
lib/Drupal/views/Tests/Handler/FieldUrlTest.php | 4 ++--
lib/Drupal/views/Tests/Handler/FieldXssTest.php | 4 ++--
lib/Drupal/views/Tests/Handler/FilterCombineTest.php | 4 ++--
lib/Drupal/views/Tests/Handler/FilterEqualityTest.php | 4 ++--
lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php | 4 ++--
lib/Drupal/views/Tests/Handler/FilterNumericTest.php | 4 ++--
lib/Drupal/views/Tests/Handler/FilterStringTest.php | 4 ++--
lib/Drupal/views/Tests/Handler/SortDateTest.php | 4 ++--
lib/Drupal/views/Tests/Handler/SortRandomTest.php | 4 ++--
lib/Drupal/views/Tests/Handler/SortTest.php | 4 ++--
lib/Drupal/views/Tests/HandlersTest.php | 2 +-
lib/Drupal/views/Tests/ModuleTest.php | 2 +-
lib/Drupal/views/Tests/Style/PluginStyleTest.php | 4 ++--
lib/Drupal/views/Tests/Style/PluginStyleUnformattedTest.php | 4 ++--
lib/Drupal/views/Tests/UiGroupByTest.php | 2 +-
lib/Drupal/views/Tests/UpgradeTestCase.php | 2 +-
28 files changed, 48 insertions(+), 47 deletions(-)
diff --git a/lib/Drupal/views/Tests/AccessTest.php b/lib/Drupal/views/Tests/AccessTest.php
index 6cd3283ee640..c52681fef8f8 100644
--- a/lib/Drupal/views/Tests/AccessTest.php
+++ b/lib/Drupal/views/Tests/AccessTest.php
@@ -12,7 +12,7 @@
/**
* Basic test for pluggable access.
*/
-class AccessTest extends ViewsSqlTest {
+class AccessTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Access',
diff --git a/lib/Drupal/views/Tests/ArgumentDefaultTest.php b/lib/Drupal/views/Tests/ArgumentDefaultTest.php
index 7fec4f5cfb90..782d3d5dd7dc 100644
--- a/lib/Drupal/views/Tests/ArgumentDefaultTest.php
+++ b/lib/Drupal/views/Tests/ArgumentDefaultTest.php
@@ -12,7 +12,7 @@
/**
* Basic test for pluggable argument default.
*/
-class ArgumentDefaultTest extends ViewsSqlTest {
+class ArgumentDefaultTest extends ViewsSchemaTestBase {
protected $profile = 'standard';
diff --git a/lib/Drupal/views/Tests/BasicTest.php b/lib/Drupal/views/Tests/BasicTest.php
index 2b4eb5ee6eb3..d1e1854db665 100644
--- a/lib/Drupal/views/Tests/BasicTest.php
+++ b/lib/Drupal/views/Tests/BasicTest.php
@@ -10,7 +10,7 @@
/**
* Basic test class for Views query builder tests.
*/
-class BasicTest extends ViewsSqlTest {
+class BasicTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Basic query test',
diff --git a/lib/Drupal/views/Tests/CacheTest.php b/lib/Drupal/views/Tests/CacheTest.php
index 845b9c971775..23f8472575c2 100644
--- a/lib/Drupal/views/Tests/CacheTest.php
+++ b/lib/Drupal/views/Tests/CacheTest.php
@@ -14,7 +14,8 @@
*
* @see views_plugin_cache
*/
-class CacheTest extends ViewsSqlTest {
+class CacheTest extends ViewsSchemaTestBase {
+
public static function getInfo() {
return array(
'name' => 'Cache',
diff --git a/lib/Drupal/views/Tests/ExposedFormTest.php b/lib/Drupal/views/Tests/ExposedFormTest.php
index 8207c50d6edc..967215e5bd0a 100644
--- a/lib/Drupal/views/Tests/ExposedFormTest.php
+++ b/lib/Drupal/views/Tests/ExposedFormTest.php
@@ -10,7 +10,7 @@
/**
* Tests exposed forms.
*/
-class ExposedFormTest extends ViewsSqlTest {
+class ExposedFormTest extends ViewsSchemaTestBase {
protected $profile = 'standard';
diff --git a/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php b/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
index c362e8f882e6..5ea49c36f3ce 100644
--- a/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
+++ b/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
@@ -7,12 +7,12 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests the core Drupal\views\Plugin\views\argument\Null handler.
*/
-class ArgumentNullTest extends ViewsSqlTest {
+class ArgumentNullTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Argument: Null',
diff --git a/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php b/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
index 21b9320cb99b..3d8478edeacf 100644
--- a/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
@@ -7,12 +7,12 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests the core Drupal\views\Plugin\views\field\Boolean handler.
*/
-class FieldBooleanTest extends ViewsSqlTest {
+class FieldBooleanTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Field: Boolean',
diff --git a/lib/Drupal/views/Tests/Handler/FieldCounterTest.php b/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
index c704bd40500b..166585a88e62 100644
--- a/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
@@ -7,12 +7,12 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests the Drupal\views\Plugin\views\field\Counter handler.
*/
-class FieldCounterTest extends ViewsSqlTest {
+class FieldCounterTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Field: Counter',
diff --git a/lib/Drupal/views/Tests/Handler/FieldCustomTest.php b/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
index b0a76a622188..4b7c3d1132e1 100644
--- a/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
@@ -7,12 +7,12 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests the core Drupal\views\Plugin\views\field\Custom handler.
*/
-class FieldCustomTest extends ViewsSqlTest {
+class FieldCustomTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Field: Custom',
diff --git a/lib/Drupal/views/Tests/Handler/FieldDateTest.php b/lib/Drupal/views/Tests/Handler/FieldDateTest.php
index f9cfbec02fd9..afa1414f7a22 100644
--- a/lib/Drupal/views/Tests/Handler/FieldDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldDateTest.php
@@ -7,12 +7,12 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests the core Drupal\views\Plugin\views\field\Date handler.
*/
-class FieldDateTest extends ViewsSqlTest {
+class FieldDateTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Field: Date',
diff --git a/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php b/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
index e02559e0a394..e51d4cb2ac6c 100644
--- a/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
@@ -7,14 +7,14 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests the core Drupal\views\Plugin\views\field\FileSize handler.
*
* @see CommonXssUnitTest
*/
-class FieldFileSizeTest extends ViewsSqlTest {
+class FieldFileSizeTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Field: file_size',
diff --git a/lib/Drupal/views/Tests/Handler/FieldTest.php b/lib/Drupal/views/Tests/Handler/FieldTest.php
index c7190e6188de..d324357d17be 100644
--- a/lib/Drupal/views/Tests/Handler/FieldTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldTest.php
@@ -7,14 +7,14 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests the generic field handler
*
* @see views_handler_field
*/
-class FieldTest extends ViewsSqlTest {
+class FieldTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Field',
diff --git a/lib/Drupal/views/Tests/Handler/FieldUrlTest.php b/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
index ffc5b55f85a0..6bb58ae91b4a 100644
--- a/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
@@ -7,11 +7,11 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests the core Drupal\views\Plugin\views\field\Url handler.
*/
-class FieldUrlTest extends ViewsSqlTest {
+class FieldUrlTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Field: Url',
diff --git a/lib/Drupal/views/Tests/Handler/FieldXssTest.php b/lib/Drupal/views/Tests/Handler/FieldXssTest.php
index c461915addd5..0c026958865e 100644
--- a/lib/Drupal/views/Tests/Handler/FieldXssTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldXssTest.php
@@ -7,14 +7,14 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests the core Drupal\views\Plugin\views\field\Xss handler.
*
* @see CommonXssUnitTest
*/
-class FieldXssTest extends ViewsSqlTest {
+class FieldXssTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Field: Xss',
diff --git a/lib/Drupal/views/Tests/Handler/FilterCombineTest.php b/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
index ebb1bbf0417a..d76516917a2c 100644
--- a/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
@@ -7,12 +7,12 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests the combine filter handler.
*/
-class FilterCombineTest extends ViewsSqlTest {
+class FilterCombineTest extends ViewsSchemaTestBase {
var $column_map = array();
public static function getInfo() {
diff --git a/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php b/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
index 3c81778c8c69..1e3a1af57b1e 100644
--- a/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
@@ -7,12 +7,12 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests the core Drupal\views\Plugin\views\filter\Equality handler.
*/
-class FilterEqualityTest extends ViewsSqlTest {
+class FilterEqualityTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Filter: Equality',
diff --git a/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php b/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
index 7b5bde51b903..e48a54340b64 100644
--- a/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
@@ -7,12 +7,12 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests the core Drupal\views\Plugin\views\filter\InOperator handler.
*/
-class FilterInOperatorTest extends ViewsSqlTest {
+class FilterInOperatorTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Filter: in_operator',
diff --git a/lib/Drupal/views/Tests/Handler/FilterNumericTest.php b/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
index d190ffb38bea..6e3466023a61 100644
--- a/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
@@ -7,12 +7,12 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests the numeric filter handler.
*/
-class FilterNumericTest extends ViewsSqlTest {
+class FilterNumericTest extends ViewsSchemaTestBase {
var $column_map = array();
public static function getInfo() {
diff --git a/lib/Drupal/views/Tests/Handler/FilterStringTest.php b/lib/Drupal/views/Tests/Handler/FilterStringTest.php
index 2f8a4940fcee..cffa15a7be7f 100644
--- a/lib/Drupal/views/Tests/Handler/FilterStringTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterStringTest.php
@@ -7,12 +7,12 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests the core Drupal\views\Plugin\views\filter\String handler.
*/
-class FilterStringTest extends ViewsSqlTest {
+class FilterStringTest extends ViewsSchemaTestBase {
var $column_map = array();
public static function getInfo() {
diff --git a/lib/Drupal/views/Tests/Handler/SortDateTest.php b/lib/Drupal/views/Tests/Handler/SortDateTest.php
index a0756f7075f5..e61a57cce0ef 100644
--- a/lib/Drupal/views/Tests/Handler/SortDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortDateTest.php
@@ -7,12 +7,12 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests for core Drupal\views\Plugin\views\sort\Date handler.
*/
-class SortDateTest extends ViewsSqlTest {
+class SortDateTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Sort: date',
diff --git a/lib/Drupal/views/Tests/Handler/SortRandomTest.php b/lib/Drupal/views/Tests/Handler/SortRandomTest.php
index 577e6bad1101..b705db602b72 100644
--- a/lib/Drupal/views/Tests/Handler/SortRandomTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortRandomTest.php
@@ -7,12 +7,12 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests for core Drupal\views\Plugin\views\sort\Random handler.
*/
-class SortRandomTest extends ViewsSqlTest {
+class SortRandomTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Sort: random',
diff --git a/lib/Drupal/views/Tests/Handler/SortTest.php b/lib/Drupal/views/Tests/Handler/SortTest.php
index 86f22d101bfc..55539ad6f51d 100644
--- a/lib/Drupal/views/Tests/Handler/SortTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortTest.php
@@ -7,12 +7,12 @@
namespace Drupal\views\Tests\Handler;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests for core Drupal\views\Plugin\views\sort\SortPluginBase handler.
*/
-class SortTest extends ViewsSqlTest {
+class SortTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Sort: generic',
diff --git a/lib/Drupal/views/Tests/HandlersTest.php b/lib/Drupal/views/Tests/HandlersTest.php
index 19605cf83bda..15a4cb68a9f8 100644
--- a/lib/Drupal/views/Tests/HandlersTest.php
+++ b/lib/Drupal/views/Tests/HandlersTest.php
@@ -10,7 +10,7 @@
/**
* Tests abstract handlers of views.
*/
-class HandlersTest extends ViewsSqlTest {
+class HandlersTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
diff --git a/lib/Drupal/views/Tests/ModuleTest.php b/lib/Drupal/views/Tests/ModuleTest.php
index 5b9888d1dfb3..5563db83a767 100644
--- a/lib/Drupal/views/Tests/ModuleTest.php
+++ b/lib/Drupal/views/Tests/ModuleTest.php
@@ -10,7 +10,7 @@
/**
* Tests basic functions from the Views module.
*/
-class ModuleTest extends ViewsSqlTest {
+class ModuleTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Tests views.module',
diff --git a/lib/Drupal/views/Tests/Style/PluginStyleTest.php b/lib/Drupal/views/Tests/Style/PluginStyleTest.php
index 76c7d95b4c29..b813b8151be0 100644
--- a/lib/Drupal/views/Tests/Style/PluginStyleTest.php
+++ b/lib/Drupal/views/Tests/Style/PluginStyleTest.php
@@ -9,12 +9,12 @@
use stdClass;
use DOMDocument;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests some general style plugin related functionality.
*/
-class PluginStyleTest extends ViewsSqlTest {
+class PluginStyleTest extends ViewsSchemaTestBase {
public static function getInfo() {
return array(
'name' => 'Styles',
diff --git a/lib/Drupal/views/Tests/Style/PluginStyleUnformattedTest.php b/lib/Drupal/views/Tests/Style/PluginStyleUnformattedTest.php
index a048d9bdfc22..98982d491901 100644
--- a/lib/Drupal/views/Tests/Style/PluginStyleUnformattedTest.php
+++ b/lib/Drupal/views/Tests/Style/PluginStyleUnformattedTest.php
@@ -8,12 +8,12 @@
namespace Drupal\views\Tests\Style;
use DOMDocument;
-use Drupal\views\Tests\ViewsSqlTest;
+use Drupal\views\Tests\ViewsSchemaTestBase;
/**
* Tests the default/unformatted row style.
*/
-class PluginStyleUnformattedTest extends ViewsSqlTest {
+class PluginStyleUnformattedTest extends ViewsSchemaTestBase {
/**
* Stores all created nodes.
diff --git a/lib/Drupal/views/Tests/UiGroupByTest.php b/lib/Drupal/views/Tests/UiGroupByTest.php
index eb42f7ead724..93360ac4b7a3 100644
--- a/lib/Drupal/views/Tests/UiGroupByTest.php
+++ b/lib/Drupal/views/Tests/UiGroupByTest.php
@@ -10,7 +10,7 @@
/**
* Tests UI of aggregate functionality..
*/
-class UiGroupByTest extends ViewsSqlTest {
+class UiGroupByTest extends ViewsSchemaTestBase {
protected $profile = 'standard';
diff --git a/lib/Drupal/views/Tests/UpgradeTestCase.php b/lib/Drupal/views/Tests/UpgradeTestCase.php
index f2105dff1c65..d0f420e0c5ad 100644
--- a/lib/Drupal/views/Tests/UpgradeTestCase.php
+++ b/lib/Drupal/views/Tests/UpgradeTestCase.php
@@ -14,7 +14,7 @@
*
* You can find all conversions by searching for "moved to".
*/
-class UpgradeTestCase extends ViewsSqlTest {
+class UpgradeTestCase extends ViewsSchemaTestBase {
/**
* Modules to enable.
--
GitLab