diff --git a/core/modules/views/lib/Drupal/views/Tests/BasicTest.php b/core/modules/views/lib/Drupal/views/Tests/BasicTest.php index b9c1d35..dc65207 100644 --- a/core/modules/views/lib/Drupal/views/Tests/BasicTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/BasicTest.php @@ -7,10 +7,12 @@ namespace Drupal\views\Tests; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Basic test class for Views query builder tests. */ -class BasicTest extends ViewTestBase { +class BasicTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -20,17 +22,12 @@ public static function getInfo() { ); } - protected function setUp() { - parent::setUp(); - - $this->enableViewsTestModule(); - } - /** * Tests a trivial result set. */ public function testSimpleResultSet() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Execute the view. $this->executeView($view); @@ -47,7 +44,8 @@ public function testSimpleResultSet() { * Tests filtering of the result set. */ public function testSimpleFiltering() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Add a filter. $view->displayHandlers['default']->overrideOption('filters', array( @@ -105,7 +103,8 @@ public function testSimpleFiltering() { * Tests simple argument. */ public function testSimpleArgument() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Add a argument. $view->displayHandlers['default']->overrideOption('arguments', array( diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php index 6cda26e..f8f78af 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php @@ -7,12 +7,14 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests the text area handler. * * @see Drupal\views\Plugin\views\area\Text */ -class AreaTextTest extends HandlerTestBase { +class AreaTextTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -25,11 +27,13 @@ public static function getInfo() { protected function setUp() { parent::setUp(); - $this->enableViewsTestModule(); + $this->enableModules(array('system')); + $this->enableModules(array('filter')); } public function testAreaText() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // add a text header $string = $this->randomName(); diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php index a5e26de..bead17a 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php @@ -7,10 +7,12 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests the core Drupal\views\Plugin\views\argument\Null handler. */ -class ArgumentNullTest extends HandlerTestBase { +class ArgumentNullTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -20,12 +22,6 @@ public static function getInfo() { ); } - protected function setUp() { - parent::setUp(); - - $this->enableViewsTestModule(); - } - function viewsData() { $data = parent::viewsData(); $data['views_test_data']['id']['argument']['id'] = 'null'; @@ -35,7 +31,8 @@ function viewsData() { public function testAreaText() { // Test validation - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Add a null argument. $string = $this->randomString(); @@ -60,7 +57,8 @@ public function testAreaText() { $this->assertTrue($view->argument['null']->validateArgument(NULL), 'must_not_be returns TRUE, if there is no argument'); // Test execution. - $view = $this->getView(); + $view->destroy(); + $view->setDisplay(); // Add a argument, which has null as handler. $string = $this->randomString(); diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php index b3d3599..6b75e28 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php @@ -7,10 +7,12 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests the core Drupal\views\Plugin\views\field\Boolean handler. */ -class FieldBooleanTest extends HandlerTestBase { +class FieldBooleanTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -20,12 +22,6 @@ public static function getInfo() { ); } - protected function setUp() { - parent::setUp(); - - $this->enableViewsTestModule(); - } - function dataSet() { // Use default dataset but remove the age from john and paul $data = parent::dataSet(); @@ -41,7 +37,8 @@ function viewsData() { } public function testFieldBoolean() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); $view->displayHandlers['default']->overrideOption('fields', array( 'age' => array( diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCounterTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCounterTest.php index a39ece6..ac325c3 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCounterTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCounterTest.php @@ -7,10 +7,12 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests the Drupal\views\Plugin\views\field\Counter handler. */ -class FieldCounterTest extends HandlerTestBase { +class FieldCounterTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -23,11 +25,12 @@ public static function getInfo() { protected function setUp() { parent::setUp(); - $this->enableViewsTestModule(); + $this->enableModules(array('user')); } function testSimple() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); $view->displayHandlers['default']->overrideOption('fields', array( 'counter' => array( 'id' => 'counter', @@ -44,7 +47,6 @@ function testSimple() { )); $view->preview(); - $counter = $view->style_plugin->rendered_fields[0]['counter']; $this->assertEqual($counter, 1, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 1, '@counter' => $counter))); $counter = $view->style_plugin->rendered_fields[1]['counter']; @@ -53,7 +55,7 @@ function testSimple() { $this->assertEqual($counter, 3, format_string('Make sure the expected number (@expected) patches with the rendered number (@counter)', array('@expected' => 3, '@counter' => $counter))); $view->destroy(); - $view = $this->getView(); + $view->setDisplay(); $rand_start = rand(5, 10); $view->displayHandlers['default']->overrideOption('fields', array( 'counter' => array( diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCustomTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCustomTest.php index 4cc3291..1b78cf9 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCustomTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldCustomTest.php @@ -7,10 +7,12 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests the core Drupal\views\Plugin\views\field\Custom handler. */ -class FieldCustomTest extends HandlerTestBase { +class FieldCustomTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -20,12 +22,6 @@ public static function getInfo() { ); } - protected function setUp() { - parent::setUp(); - - $this->enableViewsTestModule(); - } - function viewsData() { $data = parent::viewsData(); $data['views_test_data']['name']['field']['id'] = 'custom'; @@ -33,7 +29,8 @@ function viewsData() { } public function testFieldCustom() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Alter the text of the field to a random string. $random = $this->randomName(); diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldDateTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldDateTest.php index 6040d40..764d573 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldDateTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldDateTest.php @@ -7,10 +7,12 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests the core Drupal\views\Plugin\views\field\Date handler. */ -class FieldDateTest extends HandlerTestBase { +class FieldDateTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -20,12 +22,6 @@ public static function getInfo() { ); } - protected function setUp() { - parent::setUp(); - - $this->enableViewsTestModule(); - } - function viewsData() { $data = parent::viewsData(); $data['views_test_data']['created']['field']['id'] = 'date'; @@ -33,7 +29,8 @@ function viewsData() { } public function testFieldDate() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); $view->displayHandlers['default']->overrideOption('fields', array( 'created' => array( diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php index f8c0dde..9755e62 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php @@ -7,12 +7,14 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests the core Drupal\views\Plugin\views\field\FileSize handler. * * @see CommonXssUnitTest */ -class FieldFileSizeTest extends HandlerTestBase { +class FieldFileSizeTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -22,12 +24,6 @@ public static function getInfo() { ); } - protected function setUp() { - parent::setUp(); - - $this->enableViewsTestModule(); - } - function dataSet() { $data = parent::dataSet(); $data[0]['age'] = 0; @@ -46,7 +42,8 @@ function viewsData() { } public function testFieldFileSize() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); $view->displayHandlers['default']->overrideOption('fields', array( 'age' => array( diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php new file mode 100644 index 0000000..7e21ec2 --- /dev/null +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUnitTest.php @@ -0,0 +1,498 @@ + 'name', + ); + + public static function getInfo() { + return array( + 'name' => 'Field: Unit Test', + 'description' => 'Tests the generic field handler.', + 'group' => 'Views Handlers', + ); + } + + protected function setUp() { + parent::setUp(); + + $this->enableModules(array('user')); + } + + /** + * Overrides Drupal\views\Tests\ViewTestBase::viewsData(). + */ + protected function viewsData() { + $data = parent::viewsData(); + $data['views_test_data']['job']['field']['id'] = 'test_field'; + return $data; + } + + /** + * Tests that the render function is called. + */ + public function testRender() { + $view = views_get_view('test_field_tokens'); + $this->executeView($view); + + $random_text = $this->randomName(); + $view->field['job']->setTestValue($random_text); + $this->assertEqual($view->field['job']->theme($view->result[0]), $random_text, 'Make sure the render method rendered the manual set value.'); + } + + /** + * Tests all things related to the query. + */ + public function testQuery() { + // Tests adding additional fields to the query. + $view = views_get_view('test_view'); + $view->initHandlers(); + + $id_field = $view->field['id']; + $id_field->additional_fields['job'] = 'job'; + // Choose also a field alias key which doesn't match to the table field. + $id_field->additional_fields['created_test'] = array('table' => 'views_test_data', 'field' => 'created'); + $view->build(); + + // Make sure the field aliases have the expected value. + $this->assertEqual($id_field->aliases['job'], 'views_test_data_job'); + $this->assertEqual($id_field->aliases['created_test'], 'views_test_data_created'); + + $this->executeView($view); + // Tests the get_value method with and without a field aliases. + foreach ($this->dataSet() as $key => $row) { + $id = $key + 1; + $result = $view->result[$key]; + $this->assertEqual($id_field->get_value($result), $id); + $this->assertEqual($id_field->get_value($result, 'job'), $row['job']); + $this->assertEqual($id_field->get_value($result, 'created_test'), $row['created']); + } + } + + /** + * Assertion helper which checks whether a string is part of another string. + * + * @param string $haystack + * The value to search in. + * @param string $needle + * The value to search for. + * @param string $message + * The message to display along with the assertion. + * @param string $group + * The type of assertion - examples are "Browser", "PHP". + * @return bool + * TRUE if the assertion succeeded, FALSE otherwise. + */ + protected function assertSubString($haystack, $needle, $message = '', $group = 'Other') { + return $this->assertTrue(strpos($haystack, $needle) !== FALSE, $message, $group); + } + + /** + * Assertion helper which checks whether a string is not part of another string. + * + * @param string $haystack + * The value to search in. + * @param string $needle + * The value to search for. + * @param string $message + * The message to display along with the assertion. + * @param string $group + * The type of assertion - examples are "Browser", "PHP". + * @return bool + * TRUE if the assertion succeeded, FALSE otherwise. + */ + protected function assertNotSubString($haystack, $needle, $message = '', $group = 'Other') { + return $this->assertTrue(strpos($haystack, $needle) === FALSE, $message, $group); + } + + /** + * Tests general rewriting of the output. + */ + public function testRewrite() { + $view = views_get_view('test_view'); + $view->initHandlers(); + $this->executeView($view); + $row = $view->result[0]; + $id_field = $view->field['id']; + + // Don't check the rewrite checkbox, so the text shouldn't appear. + $id_field->options['alter']['text'] = $random_text = $this->randomName(); + $output = $id_field->theme($row); + $this->assertNotSubString($output, $random_text); + + $id_field->options['alter']['alter_text'] = TRUE; + $output = $id_field->theme($row); + $this->assertSubString($output, $random_text); + } + + /** + * Tests the field tokens, row level and field level. + */ + public function testFieldTokens() { + $view = views_get_view('test_field_tokens'); + $this->executeView($view); + $name_field_0 = $view->field['name']; + $name_field_1 = $view->field['name_1']; + $name_field_2 = $view->field['name_2']; + $row = $view->result[0]; + + $name_field_0->options['alter']['alter_text'] = TRUE; + $name_field_0->options['alter']['text'] = '[name]'; + + $name_field_1->options['alter']['alter_text'] = TRUE; + $name_field_1->options['alter']['text'] = '[name_1] [name]'; + + $name_field_2->options['alter']['alter_text'] = TRUE; + $name_field_2->options['alter']['text'] = '[name_2] [name_1]'; + + foreach ($view->result as $row) { + $expected_output_0 = $row->views_test_data_name; + $expected_output_1 = "$row->views_test_data_name $row->views_test_data_name"; + $expected_output_2 = "$row->views_test_data_name $row->views_test_data_name $row->views_test_data_name"; + + $output = $name_field_0->advanced_render($row); + $this->assertEqual($output, $expected_output_0); + + $output = $name_field_1->advanced_render($row); + $this->assertEqual($output, $expected_output_1); + + $output = $name_field_2->advanced_render($row); + $this->assertEqual($output, $expected_output_2); + } + + $job_field = $view->field['job']; + $job_field->options['alter']['alter_text'] = TRUE; + $job_field->options['alter']['text'] = '[test-token]'; + + $random_text = $this->randomName(); + $job_field->setTestValue($random_text); + $output = $job_field->advanced_render($row); + $this->assertSubString($output, $random_text, format_string('Make sure the self token (!value) appears in the output (!output)'. array('!value' => $random_text, '!output' => $output))); + } + + /** + * Tests the exclude setting. + */ + public function testExclude() { + $view = views_get_view('test_field_output'); + $view->initHandlers(); + // Hide the field and see whether it's rendered. + $view->field['name']->options['exclude'] = TRUE; + + $output = $view->preview(); + foreach ($this->dataSet() as $entry) { + $this->assertNotSubString($output, $entry['name']); + } + + // Show and check the field. + $view->field['name']->options['exclude'] = FALSE; + + $output = $view->preview(); + foreach ($this->dataSet() as $entry) { + $this->assertSubString($output, $entry['name']); + } + } + + /** + * Tests everything related to empty output of a field. + */ + function testEmpty() { + $this->_testHideIfEmpty(); + $this->_testEmptyText(); + } + + /** + * Tests the hide if empty functionality. + * + * This tests alters the result to get easier and less coupled results. + */ + function _testHideIfEmpty() { + $view = views_get_view('test_view'); + $view->initDisplay(); + $this->executeView($view); + + $column_map_reversed = array_flip($this->column_map); + $view->row_index = 0; + $random_name = $this->randomName(); + $random_value = $this->randomName(); + + // Test when results are not rewritten and empty values are not hidden. + $view->field['name']->options['hide_alter_empty'] = FALSE; + $view->field['name']->options['hide_empty'] = FALSE; + $view->field['name']->options['empty_zero'] = FALSE; + + // Test a valid string. + $view->result[0]->{$column_map_reversed['name']} = $random_name; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, $random_name, 'By default, a string should not be treated as empty.'); + + // Test an empty string. + $view->result[0]->{$column_map_reversed['name']} = ""; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "", 'By default, "" should not be treated as empty.'); + + // Test zero as an integer. + $view->result[0]->{$column_map_reversed['name']} = 0; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, '0', 'By default, 0 should not be treated as empty.'); + + // Test zero as a string. + $view->result[0]->{$column_map_reversed['name']} = "0"; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "0", 'By default, "0" should not be treated as empty.'); + + // Test when results are not rewritten and non-zero empty values are hidden. + $view->field['name']->options['hide_alter_empty'] = TRUE; + $view->field['name']->options['hide_empty'] = TRUE; + $view->field['name']->options['empty_zero'] = FALSE; + + // Test a valid string. + $view->result[0]->{$column_map_reversed['name']} = $random_name; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, $random_name, 'If hide_empty is checked, a string should not be treated as empty.'); + + // Test an empty string. + $view->result[0]->{$column_map_reversed['name']} = ""; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "", 'If hide_empty is checked, "" should be treated as empty.'); + + // Test zero as an integer. + $view->result[0]->{$column_map_reversed['name']} = 0; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, '0', 'If hide_empty is checked, but not empty_zero, 0 should not be treated as empty.'); + + // Test zero as a string. + $view->result[0]->{$column_map_reversed['name']} = "0"; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "0", 'If hide_empty is checked, but not empty_zero, "0" should not be treated as empty.'); + + // Test when results are not rewritten and all empty values are hidden. + $view->field['name']->options['hide_alter_empty'] = TRUE; + $view->field['name']->options['hide_empty'] = TRUE; + $view->field['name']->options['empty_zero'] = TRUE; + + // Test zero as an integer. + $view->result[0]->{$column_map_reversed['name']} = 0; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "", 'If hide_empty and empty_zero are checked, 0 should be treated as empty.'); + + // Test zero as a string. + $view->result[0]->{$column_map_reversed['name']} = "0"; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "", 'If hide_empty and empty_zero are checked, "0" should be treated as empty.'); + + // Test when results are rewritten to a valid string and non-zero empty + // results are hidden. + $view->field['name']->options['hide_alter_empty'] = FALSE; + $view->field['name']->options['hide_empty'] = TRUE; + $view->field['name']->options['empty_zero'] = FALSE; + $view->field['name']->options['alter']['alter_text'] = TRUE; + $view->field['name']->options['alter']['text'] = $random_name; + + // Test a valid string. + $view->result[0]->{$column_map_reversed['name']} = $random_value; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, $random_name, 'If the rewritten string is not empty, it should not be treated as empty.'); + + // Test an empty string. + $view->result[0]->{$column_map_reversed['name']} = ""; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, $random_name, 'If the rewritten string is not empty, "" should not be treated as empty.'); + + // Test zero as an integer. + $view->result[0]->{$column_map_reversed['name']} = 0; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, $random_name, 'If the rewritten string is not empty, 0 should not be treated as empty.'); + + // Test zero as a string. + $view->result[0]->{$column_map_reversed['name']} = "0"; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, $random_name, 'If the rewritten string is not empty, "0" should not be treated as empty.'); + + // Test when results are rewritten to an empty string and non-zero empty results are hidden. + $view->field['name']->options['hide_alter_empty'] = TRUE; + $view->field['name']->options['hide_empty'] = TRUE; + $view->field['name']->options['empty_zero'] = FALSE; + $view->field['name']->options['alter']['alter_text'] = TRUE; + $view->field['name']->options['alter']['text'] = ""; + + // Test a valid string. + $view->result[0]->{$column_map_reversed['name']} = $random_name; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, $random_name, 'If the rewritten string is empty, it should not be treated as empty.'); + + // Test an empty string. + $view->result[0]->{$column_map_reversed['name']} = ""; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "", 'If the rewritten string is empty, "" should be treated as empty.'); + + // Test zero as an integer. + $view->result[0]->{$column_map_reversed['name']} = 0; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, '0', 'If the rewritten string is empty, 0 should not be treated as empty.'); + + // Test zero as a string. + $view->result[0]->{$column_map_reversed['name']} = "0"; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "0", 'If the rewritten string is empty, "0" should not be treated as empty.'); + + // Test when results are rewritten to zero as a string and non-zero empty + // results are hidden. + $view->field['name']->options['hide_alter_empty'] = FALSE; + $view->field['name']->options['hide_empty'] = TRUE; + $view->field['name']->options['empty_zero'] = FALSE; + $view->field['name']->options['alter']['alter_text'] = TRUE; + $view->field['name']->options['alter']['text'] = "0"; + + // Test a valid string. + $view->result[0]->{$column_map_reversed['name']} = $random_name; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "0", 'If the rewritten string is zero and empty_zero is not checked, the string rewritten as 0 should not be treated as empty.'); + + // Test an empty string. + $view->result[0]->{$column_map_reversed['name']} = ""; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "0", 'If the rewritten string is zero and empty_zero is not checked, "" rewritten as 0 should not be treated as empty.'); + + // Test zero as an integer. + $view->result[0]->{$column_map_reversed['name']} = 0; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "0", 'If the rewritten string is zero and empty_zero is not checked, 0 should not be treated as empty.'); + + // Test zero as a string. + $view->result[0]->{$column_map_reversed['name']} = "0"; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "0", 'If the rewritten string is zero and empty_zero is not checked, "0" should not be treated as empty.'); + + // Test when results are rewritten to a valid string and non-zero empty + // results are hidden. + $view->field['name']->options['hide_alter_empty'] = TRUE; + $view->field['name']->options['hide_empty'] = TRUE; + $view->field['name']->options['empty_zero'] = FALSE; + $view->field['name']->options['alter']['alter_text'] = TRUE; + $view->field['name']->options['alter']['text'] = $random_value; + + // Test a valid string. + $view->result[0]->{$column_map_reversed['name']} = $random_name; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, $random_value, 'If the original and rewritten strings are valid, it should not be treated as empty.'); + + // Test an empty string. + $view->result[0]->{$column_map_reversed['name']} = ""; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "", 'If either the original or rewritten string is invalid, "" should be treated as empty.'); + + // Test zero as an integer. + $view->result[0]->{$column_map_reversed['name']} = 0; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, $random_value, 'If the original and rewritten strings are valid, 0 should not be treated as empty.'); + + // Test zero as a string. + $view->result[0]->{$column_map_reversed['name']} = "0"; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, $random_value, 'If the original and rewritten strings are valid, "0" should not be treated as empty.'); + + // Test when results are rewritten to zero as a string and all empty + // original values and results are hidden. + $view->field['name']->options['hide_alter_empty'] = TRUE; + $view->field['name']->options['hide_empty'] = TRUE; + $view->field['name']->options['empty_zero'] = TRUE; + $view->field['name']->options['alter']['alter_text'] = TRUE; + $view->field['name']->options['alter']['text'] = "0"; + + // Test a valid string. + $view->result[0]->{$column_map_reversed['name']} = $random_name; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "", 'If the rewritten string is zero, it should be treated as empty.'); + + // Test an empty string. + $view->result[0]->{$column_map_reversed['name']} = ""; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "", 'If the rewritten string is zero, "" should be treated as empty.'); + + // Test zero as an integer. + $view->result[0]->{$column_map_reversed['name']} = 0; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "", 'If the rewritten string is zero, 0 should not be treated as empty.'); + + // Test zero as a string. + $view->result[0]->{$column_map_reversed['name']} = "0"; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "", 'If the rewritten string is zero, "0" should not be treated as empty.'); + } + + /** + * Tests the usage of the empty text. + */ + function _testEmptyText() { + $view = views_get_view('test_view'); + $view->initDisplay(); + $this->executeView($view); + + $column_map_reversed = array_flip($this->column_map); + $view->row_index = 0; + + $empty_text = $view->field['name']->options['empty'] = $this->randomName(); + $view->result[0]->{$column_map_reversed['name']} = ""; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, $empty_text, 'If a field is empty, the empty text should be used for the output.'); + + $view->result[0]->{$column_map_reversed['name']} = "0"; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, "0", 'If a field is 0 and empty_zero is not checked, the empty text should not be used for the output.'); + + $view->result[0]->{$column_map_reversed['name']} = "0"; + $view->field['name']->options['empty_zero'] = TRUE; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, $empty_text, 'If a field is 0 and empty_zero is checked, the empty text should be used for the output.'); + + $view->result[0]->{$column_map_reversed['name']} = ""; + $view->field['name']->options['alter']['alter_text'] = TRUE; + $alter_text = $view->field['name']->options['alter']['text'] = $this->randomName(); + $view->field['name']->options['hide_alter_empty'] = FALSE; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, $alter_text, 'If a field is empty, some rewrite text exists, but hide_alter_empty is not checked, render the rewrite text.'); + + $view->field['name']->options['hide_alter_empty'] = TRUE; + $render = $view->field['name']->advanced_render($view->result[0]); + $this->assertIdentical($render, $empty_text, 'If a field is empty, some rewrite text exists, and hide_alter_empty is checked, use the empty text.'); + } + + /** + * Tests views_handler_field::is_value_empty(). + */ + function testIsValueEmpty() { + $view = views_get_view('test_view'); + $view->initHandlers(); + $field = $view->field['name']; + + $this->assertFalse($field->is_value_empty("not empty", TRUE), 'A normal string is not empty.'); + $this->assertTrue($field->is_value_empty("not empty", TRUE, FALSE), 'A normal string which skips empty() can be seen as empty.'); + + $this->assertTrue($field->is_value_empty("", TRUE), '"" is considered as empty.'); + + $this->assertTrue($field->is_value_empty('0', TRUE), '"0" is considered as empty if empty_zero is TRUE.'); + $this->assertTrue($field->is_value_empty(0, TRUE), '0 is considered as empty if empty_zero is TRUE.'); + $this->assertFalse($field->is_value_empty('0', FALSE), '"0" is considered not as empty if empty_zero is FALSE.'); + $this->assertFalse($field->is_value_empty(0, FALSE), '0 is considered not as empty if empty_zero is FALSE.'); + + $this->assertTrue($field->is_value_empty(NULL, TRUE, TRUE), 'Null should be always seen as empty, regardless of no_skip_empty.'); + $this->assertTrue($field->is_value_empty(NULL, TRUE, FALSE), 'Null should be always seen as empty, regardless of no_skip_empty.'); + } + +} diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUrlTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUrlTest.php index 0ffbed0..8239ab9 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUrlTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldUrlTest.php @@ -7,10 +7,12 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests the core Drupal\views\Plugin\views\field\Url handler. */ -class FieldUrlTest extends HandlerTestBase { +class FieldUrlTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -20,12 +22,6 @@ public static function getInfo() { ); } - protected function setUp() { - parent::setUp(); - - $this->enableViewsTestModule(); - } - function viewsData() { $data = parent::viewsData(); $data['views_test_data']['name']['field']['id'] = 'url'; @@ -33,7 +29,8 @@ function viewsData() { } public function testFieldUrl() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); $view->displayHandlers['default']->overrideOption('fields', array( 'name' => array( @@ -51,7 +48,7 @@ public function testFieldUrl() { // Make the url a link. $view->destroy(); - $view = $this->getView(); + $view->setDisplay(); $view->displayHandlers['default']->overrideOption('fields', array( 'name' => array( diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldWebTest.php similarity index 53% rename from core/modules/views/lib/Drupal/views/Tests/Handler/FieldTest.php rename to core/modules/views/lib/Drupal/views/Tests/Handler/FieldWebTest.php index 967eae8..f1b919a 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldWebTest.php @@ -2,23 +2,26 @@ /** * @file - * Definition of Drupal\views\Tests\Handler\FieldTest. + * Contains \Drupal\views\Tests\Handler\FieldWebTest. */ namespace Drupal\views\Tests\Handler; /** - * Tests the generic field handler. + * Tests fields from within a UI. * - * @see Drupal\views\Plugin\views\field\FieldPluginBase + * @see \Drupal\views\Plugin\views\field\FieldPluginBase */ +class FieldWebTest extends HandlerTestBase { -class FieldTest extends HandlerTestBase { + protected $column_map = array( + 'views_test_data_name' => 'name', + ); public static function getInfo() { return array( - 'name' => 'Field: Base', - 'description' => 'Tests the generic field handler.', + 'name' => 'Field: Web Test', + 'description' => 'Tests fields from within a UI.', 'group' => 'Views Handlers', ); } @@ -27,64 +30,18 @@ protected function setUp() { parent::setUp(); $this->enableViewsTestModule(); - - $this->column_map = array( - 'views_test_data_name' => 'name', - ); } /** - * Overrides Drupal\views\Tests\ViewTestBase::viewsData(). + * Overrides \Drupal\views\Tests\ViewTestBase::viewsData(). */ protected function viewsData() { $data = parent::viewsData(); $data['views_test_data']['job']['field']['id'] = 'test_field'; - return $data; } /** - * Tests that the render function is called. - */ - public function testRender() { - $view = views_get_view('test_field_tokens'); - $this->executeView($view); - - $random_text = $this->randomName(); - $view->field['job']->setTestValue($random_text); - $this->assertEqual($view->field['job']->theme($view->result[0]), $random_text, 'Make sure the render method rendered the manual set value.'); - } - - /** - * Tests all things related to the query. - */ - public function testQuery() { - // Tests adding additional fields to the query. - $view = $this->getBasicView(); - $view->initHandlers(); - - $id_field = $view->field['id']; - $id_field->additional_fields['job'] = 'job'; - // Choose also a field alias key which doesn't match to the table field. - $id_field->additional_fields['created_test'] = array('table' => 'views_test_data', 'field' => 'created'); - $view->build(); - - // Make sure the field aliases have the expected value. - $this->assertEqual($id_field->aliases['job'], 'views_test_data_job'); - $this->assertEqual($id_field->aliases['created_test'], 'views_test_data_created'); - - $this->executeView($view); - // Tests the get_value method with and without a field aliases. - foreach ($this->dataSet() as $key => $row) { - $id = $key + 1; - $result = $view->result[$key]; - $this->assertEqual($id_field->get_value($result), $id); - $this->assertEqual($id_field->get_value($result, 'job'), $row['job']); - $this->assertEqual($id_field->get_value($result, 'created_test'), $row['created']); - } - } - - /** * Tests the click sorting functionality. */ public function testClickSorting() { @@ -211,7 +168,8 @@ protected function xpathContent($content, $xpath, array $arguments = array()) { * Tests rewriting the output to a link. */ public function testAlterUrl() { - $view = $this->getBasicView(); + $view = views_get_view('test_view'); + $view->setDisplay(); $view->initHandlers(); $this->executeView($view); $row = $view->result[0]; @@ -355,26 +313,6 @@ public function testAlterUrl() { } /** - * Tests general rewriting of the output. - */ - public function testRewrite() { - $view = $this->getBasicView(); - $view->initHandlers(); - $this->executeView($view); - $row = $view->result[0]; - $id_field = $view->field['id']; - - // Don't check the rewrite checkbox, so the text shouldn't appear. - $id_field->options['alter']['text'] = $random_text = $this->randomName(); - $output = $id_field->theme($row); - $this->assertNotSubString($output, $random_text); - - $id_field->options['alter']['alter_text'] = TRUE; - $output = $id_field->theme($row); - $this->assertSubString($output, $random_text); - } - - /** * Tests the field/label/wrapper classes. */ public function testFieldClasses() { @@ -474,74 +412,6 @@ public function testFieldClasses() { } /** - * Tests the field tokens, row level and field level. - */ - public function testFieldTokens() { - $view = views_get_view('test_field_tokens'); - $this->executeView($view); - $name_field_0 = $view->field['name']; - $name_field_1 = $view->field['name_1']; - $name_field_2 = $view->field['name_2']; - $row = $view->result[0]; - - $name_field_0->options['alter']['alter_text'] = TRUE; - $name_field_0->options['alter']['text'] = '[name]'; - - $name_field_1->options['alter']['alter_text'] = TRUE; - $name_field_1->options['alter']['text'] = '[name_1] [name]'; - - $name_field_2->options['alter']['alter_text'] = TRUE; - $name_field_2->options['alter']['text'] = '[name_2] [name_1]'; - - foreach ($view->result as $row) { - $expected_output_0 = $row->views_test_data_name; - $expected_output_1 = "$row->views_test_data_name $row->views_test_data_name"; - $expected_output_2 = "$row->views_test_data_name $row->views_test_data_name $row->views_test_data_name"; - - $output = $name_field_0->advanced_render($row); - $this->assertEqual($output, $expected_output_0); - - $output = $name_field_1->advanced_render($row); - $this->assertEqual($output, $expected_output_1); - - $output = $name_field_2->advanced_render($row); - $this->assertEqual($output, $expected_output_2); - } - - $job_field = $view->field['job']; - $job_field->options['alter']['alter_text'] = TRUE; - $job_field->options['alter']['text'] = '[test-token]'; - - $random_text = $this->randomName(); - $job_field->setTestValue($random_text); - $output = $job_field->advanced_render($row); - $this->assertSubString($output, $random_text, format_string('Make sure the self token (!value) appears in the output (!output)'. array('!value' => $random_text, '!output' => $output))); - } - - /** - * Tests the exclude setting. - */ - public function testExclude() { - $view = views_get_view('test_field_output'); - $view->initHandlers(); - // Hide the field and see whether it's rendered. - $view->field['name']->options['exclude'] = TRUE; - - $output = $view->preview(); - foreach ($this->dataSet() as $entry) { - $this->assertNotSubString($output, $entry['name']); - } - - // Show and check the field. - $view->field['name']->options['exclude'] = FALSE; - - $output = $view->preview(); - foreach ($this->dataSet() as $entry) { - $this->assertSubString($output, $entry['name']); - } - } - - /** * Tests trimming/read-more/ellipses. */ public function testTextRendering() { @@ -677,291 +547,4 @@ public function testTextRendering() { $this->assertNotSubString($output, '...', 'No ellipsis should appear if the output is not trimmed'); } - /** - * Tests everything related to empty output of a field. - */ - function testEmpty() { - $this->_testHideIfEmpty(); - $this->_testEmptyText(); - } - - /** - * Tests the hide if empty functionality. - * - * This tests alters the result to get easier and less coupled results. - */ - function _testHideIfEmpty() { - $view = $this->getView(); - $view->initDisplay(); - $this->executeView($view); - - $column_map_reversed = array_flip($this->column_map); - $view->row_index = 0; - $random_name = $this->randomName(); - $random_value = $this->randomName(); - - // Test when results are not rewritten and empty values are not hidden. - $view->field['name']->options['hide_alter_empty'] = FALSE; - $view->field['name']->options['hide_empty'] = FALSE; - $view->field['name']->options['empty_zero'] = FALSE; - - // Test a valid string. - $view->result[0]->{$column_map_reversed['name']} = $random_name; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, $random_name, 'By default, a string should not be treated as empty.'); - - // Test an empty string. - $view->result[0]->{$column_map_reversed['name']} = ""; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "", 'By default, "" should not be treated as empty.'); - - // Test zero as an integer. - $view->result[0]->{$column_map_reversed['name']} = 0; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, '0', 'By default, 0 should not be treated as empty.'); - - // Test zero as a string. - $view->result[0]->{$column_map_reversed['name']} = "0"; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "0", 'By default, "0" should not be treated as empty.'); - - // Test when results are not rewritten and non-zero empty values are hidden. - $view->field['name']->options['hide_alter_empty'] = TRUE; - $view->field['name']->options['hide_empty'] = TRUE; - $view->field['name']->options['empty_zero'] = FALSE; - - // Test a valid string. - $view->result[0]->{$column_map_reversed['name']} = $random_name; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, $random_name, 'If hide_empty is checked, a string should not be treated as empty.'); - - // Test an empty string. - $view->result[0]->{$column_map_reversed['name']} = ""; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "", 'If hide_empty is checked, "" should be treated as empty.'); - - // Test zero as an integer. - $view->result[0]->{$column_map_reversed['name']} = 0; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, '0', 'If hide_empty is checked, but not empty_zero, 0 should not be treated as empty.'); - - // Test zero as a string. - $view->result[0]->{$column_map_reversed['name']} = "0"; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "0", 'If hide_empty is checked, but not empty_zero, "0" should not be treated as empty.'); - - // Test when results are not rewritten and all empty values are hidden. - $view->field['name']->options['hide_alter_empty'] = TRUE; - $view->field['name']->options['hide_empty'] = TRUE; - $view->field['name']->options['empty_zero'] = TRUE; - - // Test zero as an integer. - $view->result[0]->{$column_map_reversed['name']} = 0; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "", 'If hide_empty and empty_zero are checked, 0 should be treated as empty.'); - - // Test zero as a string. - $view->result[0]->{$column_map_reversed['name']} = "0"; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "", 'If hide_empty and empty_zero are checked, "0" should be treated as empty.'); - - // Test when results are rewritten to a valid string and non-zero empty - // results are hidden. - $view->field['name']->options['hide_alter_empty'] = FALSE; - $view->field['name']->options['hide_empty'] = TRUE; - $view->field['name']->options['empty_zero'] = FALSE; - $view->field['name']->options['alter']['alter_text'] = TRUE; - $view->field['name']->options['alter']['text'] = $random_name; - - // Test a valid string. - $view->result[0]->{$column_map_reversed['name']} = $random_value; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, $random_name, 'If the rewritten string is not empty, it should not be treated as empty.'); - - // Test an empty string. - $view->result[0]->{$column_map_reversed['name']} = ""; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, $random_name, 'If the rewritten string is not empty, "" should not be treated as empty.'); - - // Test zero as an integer. - $view->result[0]->{$column_map_reversed['name']} = 0; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, $random_name, 'If the rewritten string is not empty, 0 should not be treated as empty.'); - - // Test zero as a string. - $view->result[0]->{$column_map_reversed['name']} = "0"; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, $random_name, 'If the rewritten string is not empty, "0" should not be treated as empty.'); - - // Test when results are rewritten to an empty string and non-zero empty results are hidden. - $view->field['name']->options['hide_alter_empty'] = TRUE; - $view->field['name']->options['hide_empty'] = TRUE; - $view->field['name']->options['empty_zero'] = FALSE; - $view->field['name']->options['alter']['alter_text'] = TRUE; - $view->field['name']->options['alter']['text'] = ""; - - // Test a valid string. - $view->result[0]->{$column_map_reversed['name']} = $random_name; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, $random_name, 'If the rewritten string is empty, it should not be treated as empty.'); - - // Test an empty string. - $view->result[0]->{$column_map_reversed['name']} = ""; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "", 'If the rewritten string is empty, "" should be treated as empty.'); - - // Test zero as an integer. - $view->result[0]->{$column_map_reversed['name']} = 0; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, '0', 'If the rewritten string is empty, 0 should not be treated as empty.'); - - // Test zero as a string. - $view->result[0]->{$column_map_reversed['name']} = "0"; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "0", 'If the rewritten string is empty, "0" should not be treated as empty.'); - - // Test when results are rewritten to zero as a string and non-zero empty - // results are hidden. - $view->field['name']->options['hide_alter_empty'] = FALSE; - $view->field['name']->options['hide_empty'] = TRUE; - $view->field['name']->options['empty_zero'] = FALSE; - $view->field['name']->options['alter']['alter_text'] = TRUE; - $view->field['name']->options['alter']['text'] = "0"; - - // Test a valid string. - $view->result[0]->{$column_map_reversed['name']} = $random_name; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "0", 'If the rewritten string is zero and empty_zero is not checked, the string rewritten as 0 should not be treated as empty.'); - - // Test an empty string. - $view->result[0]->{$column_map_reversed['name']} = ""; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "0", 'If the rewritten string is zero and empty_zero is not checked, "" rewritten as 0 should not be treated as empty.'); - - // Test zero as an integer. - $view->result[0]->{$column_map_reversed['name']} = 0; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "0", 'If the rewritten string is zero and empty_zero is not checked, 0 should not be treated as empty.'); - - // Test zero as a string. - $view->result[0]->{$column_map_reversed['name']} = "0"; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "0", 'If the rewritten string is zero and empty_zero is not checked, "0" should not be treated as empty.'); - - // Test when results are rewritten to a valid string and non-zero empty - // results are hidden. - $view->field['name']->options['hide_alter_empty'] = TRUE; - $view->field['name']->options['hide_empty'] = TRUE; - $view->field['name']->options['empty_zero'] = FALSE; - $view->field['name']->options['alter']['alter_text'] = TRUE; - $view->field['name']->options['alter']['text'] = $random_value; - - // Test a valid string. - $view->result[0]->{$column_map_reversed['name']} = $random_name; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, $random_value, 'If the original and rewritten strings are valid, it should not be treated as empty.'); - - // Test an empty string. - $view->result[0]->{$column_map_reversed['name']} = ""; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "", 'If either the original or rewritten string is invalid, "" should be treated as empty.'); - - // Test zero as an integer. - $view->result[0]->{$column_map_reversed['name']} = 0; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, $random_value, 'If the original and rewritten strings are valid, 0 should not be treated as empty.'); - - // Test zero as a string. - $view->result[0]->{$column_map_reversed['name']} = "0"; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, $random_value, 'If the original and rewritten strings are valid, "0" should not be treated as empty.'); - - // Test when results are rewritten to zero as a string and all empty - // original values and results are hidden. - $view->field['name']->options['hide_alter_empty'] = TRUE; - $view->field['name']->options['hide_empty'] = TRUE; - $view->field['name']->options['empty_zero'] = TRUE; - $view->field['name']->options['alter']['alter_text'] = TRUE; - $view->field['name']->options['alter']['text'] = "0"; - - // Test a valid string. - $view->result[0]->{$column_map_reversed['name']} = $random_name; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "", 'If the rewritten string is zero, it should be treated as empty.'); - - // Test an empty string. - $view->result[0]->{$column_map_reversed['name']} = ""; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "", 'If the rewritten string is zero, "" should be treated as empty.'); - - // Test zero as an integer. - $view->result[0]->{$column_map_reversed['name']} = 0; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "", 'If the rewritten string is zero, 0 should not be treated as empty.'); - - // Test zero as a string. - $view->result[0]->{$column_map_reversed['name']} = "0"; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "", 'If the rewritten string is zero, "0" should not be treated as empty.'); - } - - /** - * Tests the usage of the empty text. - */ - function _testEmptyText() { - $view = $this->getView(); - $view->initDisplay(); - $this->executeView($view); - - $column_map_reversed = array_flip($this->column_map); - $view->row_index = 0; - - $empty_text = $view->field['name']->options['empty'] = $this->randomName(); - $view->result[0]->{$column_map_reversed['name']} = ""; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, $empty_text, 'If a field is empty, the empty text should be used for the output.'); - - $view->result[0]->{$column_map_reversed['name']} = "0"; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, "0", 'If a field is 0 and empty_zero is not checked, the empty text should not be used for the output.'); - - $view->result[0]->{$column_map_reversed['name']} = "0"; - $view->field['name']->options['empty_zero'] = TRUE; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, $empty_text, 'If a field is 0 and empty_zero is checked, the empty text should be used for the output.'); - - $view->result[0]->{$column_map_reversed['name']} = ""; - $view->field['name']->options['alter']['alter_text'] = TRUE; - $alter_text = $view->field['name']->options['alter']['text'] = $this->randomName(); - $view->field['name']->options['hide_alter_empty'] = FALSE; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, $alter_text, 'If a field is empty, some rewrite text exists, but hide_alter_empty is not checked, render the rewrite text.'); - - $view->field['name']->options['hide_alter_empty'] = TRUE; - $render = $view->field['name']->advanced_render($view->result[0]); - $this->assertIdentical($render, $empty_text, 'If a field is empty, some rewrite text exists, and hide_alter_empty is checked, use the empty text.'); - } - - /** - * Tests views_handler_field::is_value_empty(). - */ - function testIsValueEmpty() { - $view = $this->getView(); - $view->initHandlers(); - $field = $view->field['name']; - - $this->assertFalse($field->is_value_empty("not empty", TRUE), 'A normal string is not empty.'); - $this->assertTrue($field->is_value_empty("not empty", TRUE, FALSE), 'A normal string which skips empty() can be seen as empty.'); - - $this->assertTrue($field->is_value_empty("", TRUE), '"" is considered as empty.'); - - $this->assertTrue($field->is_value_empty('0', TRUE), '"0" is considered as empty if empty_zero is TRUE.'); - $this->assertTrue($field->is_value_empty(0, TRUE), '0 is considered as empty if empty_zero is TRUE.'); - $this->assertFalse($field->is_value_empty('0', FALSE), '"0" is considered not as empty if empty_zero is FALSE.'); - $this->assertFalse($field->is_value_empty(0, FALSE), '0 is considered not as empty if empty_zero is FALSE.'); - - $this->assertTrue($field->is_value_empty(NULL, TRUE, TRUE), 'Null should be always seen as empty, regardless of no_skip_empty.'); - $this->assertTrue($field->is_value_empty(NULL, TRUE, FALSE), 'Null should be always seen as empty, regardless of no_skip_empty.'); - } - } diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldXssTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldXssTest.php index 01f95cb..d018e16 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/FieldXssTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FieldXssTest.php @@ -7,12 +7,14 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests the core Drupal\views\Plugin\views\field\Xss handler. * * @see CommonXssUnitTest */ -class FieldXssTest extends HandlerTestBase { +class FieldXssTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -22,12 +24,6 @@ public static function getInfo() { ); } - protected function setUp() { - parent::setUp(); - - $this->enableViewsTestModule(); - } - function dataHelper() { $map = array( 'John' => 'John', @@ -47,7 +43,8 @@ function viewsData() { } public function testFieldXss() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); $view->displayHandlers['default']->overrideOption('fields', array( 'name' => array( diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterCombineTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterCombineTest.php index eb487a2..d232638 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterCombineTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterCombineTest.php @@ -7,12 +7,17 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests the combine filter handler. */ -class FilterCombineTest extends HandlerTestBase { +class FilterCombineTest extends ViewUnitTestBase { - var $column_map = array(); + protected $column_map = array( + 'views_test_data_name' => 'name', + 'views_test_data_job' => 'job', + ); public static function getInfo() { return array( @@ -22,30 +27,19 @@ public static function getInfo() { ); } - function setUp() { - parent::setUp(); - - $this->enableViewsTestModule(); - - $this->column_map = array( - 'views_test_data_name' => 'name', - 'views_test_data_job' => 'job', - ); - } - - protected function getBasicView() { - $view = parent::getBasicView(); - $view->displayHandlers['default']->display['display_options']['fields']['job'] = array( - 'id' => 'job', - 'table' => 'views_test_data', - 'field' => 'job', - 'relationship' => 'none', - ); - return $view; - } - public function testFilterCombineContains() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); + + $fields = $view->displayHandlers['default']->getOption('fields'); + $view->displayHandlers['default']->overrideOption('fields', $fields + array( + 'job' => array( + 'id' => 'job', + 'table' => 'views_test_data', + 'field' => 'job', + 'relationship' => 'none', + ), + )); // Change the filtering. $view->displayHandlers['default']->overrideOption('filters', array( diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php index 986937f..7a9da1f 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php @@ -7,10 +7,16 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests the core Drupal\views\Plugin\views\filter\Equality handler. */ -class FilterEqualityTest extends HandlerTestBase { +class FilterEqualityTest extends ViewUnitTestBase { + + protected $column_map = array( + 'views_test_data_name' => 'name', + ); public static function getInfo() { return array( @@ -20,25 +26,22 @@ public static function getInfo() { ); } - function setUp() { + protected function setUp() { parent::setUp(); - $this->enableViewsTestModule(); - - $this->column_map = array( - 'views_test_data_name' => 'name', - ); + $this->enableModules(array('system')); + $this->enableModules(array('menu')); } function viewsData() { $data = parent::viewsData(); $data['views_test_data']['name']['filter']['id'] = 'equality'; - return $data; } function testEqual() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -63,7 +66,8 @@ function testEqual() { public function testEqualGroupedExposed() { $filters = $this->getGroupedExposedFilters(); - $view = $this->getBasicPageView(); + $view = views_get_view('test_view'); + $view->storage->newDisplay('page', 'Page', 'page_1'); // Filter: Name, Operator: =, Value: Ringo $filters['name']['group_info']['default_group'] = 1; @@ -80,7 +84,8 @@ public function testEqualGroupedExposed() { } function testNotEqual() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -114,7 +119,8 @@ function testNotEqual() { public function testEqualGroupedNotExposed() { $filters = $this->getGroupedExposedFilters(); - $view = $this->getBasicPageView(); + $view = views_get_view('test_view'); + $view->storage->newDisplay('page', 'Page', 'page_1'); // Filter: Name, Operator: !=, Value: Ringo $filters['name']['group_info']['default_group'] = 2; diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php index 6854592..b8c7fbc 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php @@ -7,10 +7,17 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests the core Drupal\views\Plugin\views\filter\InOperator handler. */ -class FilterInOperatorTest extends HandlerTestBase { +class FilterInOperatorTest extends ViewUnitTestBase { + + protected $column_map = array( + 'views_test_data_name' => 'name', + 'views_test_data_age' => 'age', + ); public static function getInfo() { return array( @@ -23,18 +30,19 @@ public static function getInfo() { protected function setUp() { parent::setUp(); - $this->enableViewsTestModule(); + $this->enableModules(array('system')); + $this->enableModules(array('menu')); } function viewsData() { $data = parent::viewsData(); $data['views_test_data']['age']['filter']['id'] = 'in_operator'; - return $data; } public function testFilterInOperatorSimple() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Add a in_operator ordering. $view->displayHandlers['default']->overrideOption('filters', array( @@ -61,12 +69,10 @@ public function testFilterInOperatorSimple() { ); $this->assertEqual(2, count($view->result)); - $this->assertIdenticalResultset($view, $expected_result, array( - 'views_test_data_name' => 'name', - 'views_test_data_age' => 'age', - )); + $this->assertIdenticalResultset($view, $expected_result, $this->column_map); - $view = $this->getView(); + $view->destroy(); + $view->setDisplay(); // Add a in_operator ordering. $view->displayHandlers['default']->overrideOption('filters', array( @@ -97,20 +103,17 @@ public function testFilterInOperatorSimple() { ); $this->assertEqual(3, count($view->result)); - $this->assertIdenticalResultset($view, $expected_result, array( - 'views_test_data_name' => 'name', - 'views_test_data_age' => 'age', - )); + $this->assertIdenticalResultset($view, $expected_result, $this->column_map); } public function testFilterInOperatorGroupedExposedSimple() { $filters = $this->getGroupedExposedFilters(); - $view = $this->getBasicPageView(); + $view = views_get_view('test_view'); // Filter: Age, Operator: in, Value: 26, 30 $filters['age']['group_info']['default_group'] = 1; - $view->setDisplay('page_1'); - $view->displayHandlers['page_1']->overrideOption('filters', $filters); + $view->setDisplay(); + $view->displayHandlers['default']->overrideOption('filters', $filters); $this->executeView($view); @@ -126,20 +129,17 @@ public function testFilterInOperatorGroupedExposedSimple() { ); $this->assertEqual(2, count($view->result)); - $this->assertIdenticalResultset($view, $expected_result, array( - 'views_test_data_name' => 'name', - 'views_test_data_age' => 'age', - )); + $this->assertIdenticalResultset($view, $expected_result, $this->column_map); } public function testFilterNotInOperatorGroupedExposedSimple() { $filters = $this->getGroupedExposedFilters(); - $view = $this->getBasicPageView(); + $view = views_get_view('test_view'); // Filter: Age, Operator: in, Value: 26, 30 $filters['age']['group_info']['default_group'] = 2; - $view->setDisplay('page_1'); - $view->displayHandlers['page_1']->overrideOption('filters', $filters); + $view->setDisplay(); + $view->displayHandlers['default']->overrideOption('filters', $filters); $this->executeView($view); @@ -159,10 +159,7 @@ public function testFilterNotInOperatorGroupedExposedSimple() { ); $this->assertEqual(3, count($view->result)); - $this->assertIdenticalResultset($view, $expected_result, array( - 'views_test_data_name' => 'name', - 'views_test_data_age' => 'age', - )); + $this->assertIdenticalResultset($view, $expected_result, $this->column_map); } protected function getGroupedExposedFilters() { diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterNumericTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterNumericTest.php index c43150e..0b9d379 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterNumericTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterNumericTest.php @@ -7,12 +7,17 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests the numeric filter handler. */ -class FilterNumericTest extends HandlerTestBase { +class FilterNumericTest extends ViewUnitTestBase { - var $column_map = array(); + protected $column_map = array( + 'views_test_data_name' => 'name', + 'views_test_data_age' => 'age', + ); public static function getInfo() { return array( @@ -22,15 +27,11 @@ public static function getInfo() { ); } - function setUp() { + protected function setUp() { parent::setUp(); - $this->enableViewsTestModule(); - - $this->column_map = array( - 'views_test_data_name' => 'name', - 'views_test_data_age' => 'age', - ); + $this->enableModules(array('system')); + $this->enableModules(array('menu')); } function viewsData() { @@ -42,7 +43,8 @@ function viewsData() { } public function testFilterNumericSimple() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -68,7 +70,8 @@ public function testFilterNumericSimple() { public function testFilterNumericExposedGroupedSimple() { $filters = $this->getGroupedExposedFilters(); - $view = $this->getBasicPageView(); + $view = views_get_view('test_view'); + $view->storage->newDisplay('page', 'Page', 'page_1'); // Filter: Age, Operator: =, Value: 28 $filters['age']['group_info']['default_group'] = 1; @@ -86,7 +89,8 @@ public function testFilterNumericExposedGroupedSimple() { } public function testFilterNumericBetween() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -122,7 +126,7 @@ public function testFilterNumericBetween() { // test not between $view->destroy(); - $view = $this->getView(); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -159,14 +163,14 @@ public function testFilterNumericBetween() { public function testFilterNumericExposedGroupedBetween() { $filters = $this->getGroupedExposedFilters(); - $view = $this->getBasicPageView(); + $view = views_get_view('test_view'); + $view->storage->newDisplay('page', 'Page', 'page_1'); // Filter: Age, Operator: between, Value: 26 and 29 $filters['age']['group_info']['default_group'] = 2; $view->setDisplay('page_1'); $view->displayHandlers['page_1']->overrideOption('filters', $filters); - $this->executeView($view); $resultset = array( array( @@ -187,14 +191,14 @@ public function testFilterNumericExposedGroupedBetween() { public function testFilterNumericExposedGroupedNotBetween() { $filters = $this->getGroupedExposedFilters(); - $view = $this->getBasicPageView(); + $view = views_get_view('test_view'); + $view->storage->newDisplay('page', 'Page', 'page_1'); // Filter: Age, Operator: between, Value: 26 and 29 $filters['age']['group_info']['default_group'] = 3; $view->setDisplay('page_1'); $view->displayHandlers['page_1']->overrideOption('filters', $filters); - $this->executeView($view); $resultset = array( array( @@ -213,9 +217,9 @@ public function testFilterNumericExposedGroupedNotBetween() { $this->assertIdenticalResultset($view, $resultset, $this->column_map); } - public function testFilterNumericEmpty() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -234,7 +238,7 @@ public function testFilterNumericEmpty() { $this->assertIdenticalResultset($view, $resultset, $this->column_map); $view->destroy(); - $view = $this->getView(); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -273,17 +277,16 @@ public function testFilterNumericEmpty() { $this->assertIdenticalResultset($view, $resultset, $this->column_map); } - public function testFilterNumericExposedGroupedEmpty() { $filters = $this->getGroupedExposedFilters(); - $view = $this->getBasicPageView(); + $view = views_get_view('test_view'); + $view->storage->newDisplay('page', 'Page', 'page_1'); // Filter: Age, Operator: empty, Value: $filters['age']['group_info']['default_group'] = 4; $view->setDisplay('page_1'); $view->displayHandlers['page_1']->overrideOption('filters', $filters); - $this->executeView($view); $resultset = array( ); @@ -292,14 +295,14 @@ public function testFilterNumericExposedGroupedEmpty() { public function testFilterNumericExposedGroupedNotEmpty() { $filters = $this->getGroupedExposedFilters(); - $view = $this->getBasicPageView(); + $view = views_get_view('test_view'); + $view->storage->newDisplay('page', 'Page', 'page_1'); // Filter: Age, Operator: empty, Value: $filters['age']['group_info']['default_group'] = 5; $view->setDisplay('page_1'); $view->displayHandlers['page_1']->overrideOption('filters', $filters); - $this->executeView($view); $resultset = array( array( @@ -326,9 +329,9 @@ public function testFilterNumericExposedGroupedNotEmpty() { $this->assertIdenticalResultset($view, $resultset, $this->column_map); } - public function testAllowEmpty() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); $view->displayHandlers['default']->overrideOption('filters', array( 'id' => array( diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterStringTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterStringTest.php index 1ff40e0..3704aea 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/FilterStringTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/FilterStringTest.php @@ -7,12 +7,16 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests the core Drupal\views\Plugin\views\filter\String handler. */ -class FilterStringTest extends HandlerTestBase { +class FilterStringTest extends ViewUnitTestBase { - var $column_map = array(); + protected $column_map = array( + 'views_test_data_name' => 'name', + ); public static function getInfo() { return array( @@ -22,14 +26,11 @@ public static function getInfo() { ); } - function setUp() { + protected function setUp() { parent::setUp(); - $this->enableViewsTestModule(); - - $this->column_map = array( - 'views_test_data_name' => 'name', - ); + $this->enableModules(array('system')); + $this->enableModules(array('menu')); } function viewsData() { @@ -67,19 +68,20 @@ protected function dataSet() { return $dataset; } - protected function getBasicView() { - $view = parent::getBasicView(); - $view->displayHandlers['default']->options['fields']['description'] = array( - 'id' => 'description', - 'table' => 'views_test_data', - 'field' => 'description', - 'relationship' => 'none', - ); + protected function getBasicPageView() { + $view = views_get_view('test_view'); + + // In order to test exposed filters, we have to disable + // the exposed forms cache. + drupal_static_reset('views_exposed_form_cache'); + + $view->storage->newDisplay('page', 'Page', 'page_1'); return $view; } function testFilterStringEqual() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -123,7 +125,8 @@ function testFilterStringGroupedExposedEqual() { } function testFilterStringNotEqual() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -186,7 +189,8 @@ function testFilterStringGroupedExposedNotEqual() { } function testFilterStringContains() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -232,7 +236,8 @@ function testFilterStringGroupedExposedContains() { function testFilterStringWord() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -258,7 +263,8 @@ function testFilterStringWord() { $this->assertIdenticalResultset($view, $resultset, $this->column_map); $view->destroy(); - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -323,7 +329,8 @@ function testFilterStringGroupedExposedWord() { } function testFilterStringStarts() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -366,7 +373,8 @@ function testFilterStringGroupedExposedStarts() { } function testFilterStringNotStarts() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -423,7 +431,8 @@ function testFilterStringGroupedExposedNotStarts() { } function testFilterStringEnds() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -472,7 +481,8 @@ function testFilterStringGroupedExposedEnds() { } function testFilterStringNotEnds() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -523,7 +533,8 @@ function testFilterStringGroupedExposedNotEnds() { } function testFilterStringNot() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -576,7 +587,8 @@ function testFilterStringGroupedExposedNot() { } function testFilterStringShorter() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -624,7 +636,8 @@ function testFilterStringGroupedExposedShorter() { } function testFilterStringLonger() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( @@ -667,7 +680,8 @@ function testFilterStringGroupedExposedLonger() { function testFilterStringEmpty() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the filtering $view->displayHandlers['default']->overrideOption('filters', array( diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAliasTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAliasTest.php index 6be08fa..53d073c 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAliasTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/HandlerAliasTest.php @@ -7,30 +7,21 @@ namespace Drupal\views\Tests\Handler; -use Drupal\views\Tests\ViewTestBase; +use Drupal\views\Tests\ViewUnitTestBase; /** * Tests abstract handlers of views. */ -class HandlerAliasTest extends ViewTestBase { +class HandlerAliasTest extends ViewUnitTestBase { public static function getInfo() { return array( 'name' => 'Handler alias tests', 'description' => 'Tests handler table and field aliases.', - 'group' => 'Views', + 'group' => 'Views Handlers', ); } - protected function setUp() { - parent::setUp(); - - // Create a new user for the 'real table'. - $this->user = $this->drupalCreateUser(); - - $this->enableViewsTestModule(); - } - /** * Overrides Drupal\views\Tests\ViewTestBase::viewsData(). */ diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/RelationshipTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/RelationshipTest.php index 5358eda..ab50eb7 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/RelationshipTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/RelationshipTest.php @@ -7,12 +7,14 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests the base relationship handler. * * @see Drupal\views\Plugin\views\relationship\RelationshipPluginBase */ -class RelationshipTest extends HandlerTestBase { +class RelationshipTest extends ViewUnitTestBase { /** * Maps between the key in the expected result and the query result. @@ -35,10 +37,11 @@ public static function getInfo() { protected function setUp() { parent::setUp(); - $this->enableViewsTestModule(); + $this->installSchema('field', 'field_config'); + $this->installSchema('field', 'field_config_instance'); + $this->enableModules(array('user')); } - /** * Overrides Drupal\views\Tests\ViewTestBase::schemaDefinition(). * @@ -91,7 +94,8 @@ public function testRelationshipQuery() { db_query("UPDATE {views_test_data} SET uid = 1 WHERE id = 1"); db_query("UPDATE {views_test_data} SET uid = 2 WHERE id <> 1"); - $view = $this->getBasicView(); + $view = views_get_view('test_view'); + $view->setDisplay(); $view->displayHandlers['default']->overrideOption('relationships', array( 'uid' => array( diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/SortDateTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/SortDateTest.php index 2861be3..1070f50 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/SortDateTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/SortDateTest.php @@ -7,10 +7,12 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests for core Drupal\views\Plugin\views\sort\Date handler. */ -class SortDateTest extends HandlerTestBase { +class SortDateTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -20,12 +22,6 @@ public static function getInfo() { ); } - protected function setUp() { - parent::setUp(); - - $this->enableViewsTestModule(); - } - protected function expectedResultSet($granularity, $reverse = TRUE) { $expected = array(); if (!$reverse) { @@ -154,7 +150,8 @@ protected function expectedResultSet($granularity, $reverse = TRUE) { public function testDateOrdering() { foreach (array('second', 'minute', 'hour', 'day', 'month', 'year') as $granularity) { foreach (array(FALSE, TRUE) as $reverse) { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the fields. $view->displayHandlers['default']->overrideOption('fields', array( diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/SortRandomTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/SortRandomTest.php index a6d2a2f..9e82185 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/SortRandomTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/SortRandomTest.php @@ -7,10 +7,12 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests for core Drupal\views\Plugin\views\sort\Random handler. */ -class SortRandomTest extends HandlerTestBase { +class SortRandomTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -20,12 +22,6 @@ public static function getInfo() { ); } - protected function setUp() { - parent::setUp(); - - $this->enableViewsTestModule(); - } - /** * Add more items to the test set, to make the order tests more robust. */ @@ -46,7 +42,8 @@ protected function dataSet() { * Return a basic view with random ordering. */ protected function getBasicRandomView() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Add a random ordering. $view->displayHandlers['default']->overrideOption('sorts', array( @@ -67,7 +64,7 @@ protected function getBasicRandomView() { */ public function testRandomOrdering() { // Execute a basic view first. - $view = $this->getView(); + $view = views_get_view('test_view'); $this->executeView($view); // Verify the result. diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/SortTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/SortTest.php index 351f769..dd40d0f 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Handler/SortTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Handler/SortTest.php @@ -7,10 +7,12 @@ namespace Drupal\views\Tests\Handler; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests for core Drupal\views\Plugin\views\sort\SortPluginBase handler. */ -class SortTest extends HandlerTestBase { +class SortTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -20,17 +22,12 @@ public static function getInfo() { ); } - protected function setUp() { - parent::setUp(); - - $this->enableViewsTestModule(); - } - /** * Tests numeric ordering of the result set. */ public function testNumericOrdering() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the ordering $view->displayHandlers['default']->overrideOption('sorts', array( @@ -53,7 +50,8 @@ public function testNumericOrdering() { 'views_test_data_age' => 'age', )); - $view = $this->getView(); + $view->destroy(); + $view->setDisplay(); // Reverse the ordering $view->displayHandlers['default']->overrideOption('sorts', array( @@ -81,7 +79,8 @@ public function testNumericOrdering() { * Tests string ordering of the result set. */ public function testStringOrdering() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Change the ordering $view->displayHandlers['default']->overrideOption('sorts', array( @@ -104,7 +103,8 @@ public function testStringOrdering() { 'views_test_data_age' => 'age', )); - $view = $this->getView(); + $view->destroy(); + $view->setDisplay(); // Reverse the ordering $view->displayHandlers['default']->overrideOption('sorts', array( diff --git a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php b/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php index 67dfac6..249e120 100644 --- a/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/ModuleTest.php @@ -7,10 +7,12 @@ namespace Drupal\views\Tests; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests basic functions from the Views module. */ -class ModuleTest extends ViewTestBase { +class ModuleTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -20,13 +22,6 @@ public static function getInfo() { ); } - public function setUp() { - parent::setUp(); - - $this->enableViewsTestModule(); - drupal_theme_rebuild(); - } - public function test_views_trim_text() { // Test unicode, @see http://drupal.org/node/513396#comment-2839416 $text = array( @@ -111,6 +106,7 @@ function testviews_get_handler() { * Tests the load wrapper/helper functions. */ public function testLoadFunctions() { + $this->enableModules(array('node'), FALSE); $controller = entity_get_controller('view'); // Test views_view_is_enabled/disabled. diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php index fa9541f..b08277f 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php @@ -7,10 +7,12 @@ namespace Drupal\views\Tests\Plugin; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests Views argument validators. */ -class ArgumentValidatorTest extends PluginTestBase { +class ArgumentValidatorTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -22,10 +24,10 @@ public static function getInfo() { function testArgumentValidatePhp() { $string = $this->randomName(); - $view = $this->createViewFromConfig('test_view_argument_validate_php'); + $view = views_get_view('test_view_argument_validate_php'); + $view->setDisplay(); $view->displayHandlers['default']->options['arguments']['null']['validate_options']['code'] = 'return $argument == \''. $string .'\';'; - $view->preExecute(); $view->initHandlers(); $this->assertTrue($view->argument['null']->validateArgument($string)); // Reset safed argument validation. @@ -34,8 +36,7 @@ function testArgumentValidatePhp() { } function testArgumentValidateNumeric() { - $view = $this->createViewFromConfig('test_view_argument_validate_numeric'); - $view->preExecute(); + $view = views_get_view('test_view_argument_validate_numeric'); $view->initHandlers(); $this->assertFalse($view->argument['null']->validateArgument($this->randomString())); // Reset safed argument validation. diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleMappingTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleMappingTest.php index d68857a..832dbb2 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleMappingTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleMappingTest.php @@ -20,22 +20,22 @@ public static function getInfo() { ); } - /** - * Overrides Drupal\views\Tests\ViewTestBase::getBasicView(). - */ - protected function getBasicView() { - return $this->createViewFromConfig('test_style_mapping'); + public function setUp() { + parent::setUp(); + + $this->enableModules(array('system')); } /** * Verifies that the fields were mapped correctly. */ public function testMappedOutput() { - $view = $this->getView(); + $view = views_get_view('test_style_mapping'); $output = $this->mappedOutputHelper($view); $this->assertTrue(strpos($output, 'job') === FALSE, 'The job field is added to the view but not in the mapping.'); - $view = $this->getView(); + $view = views_get_view('test_style_mapping'); + $view->setDisplay(); $view->displayHandlers['default']->options['style']['options']['mapping']['name_field'] = 'job'; $output = $this->mappedOutputHelper($view); $this->assertTrue(strpos($output, 'job') !== FALSE, 'The job field is added to the view and is in the mapping.'); diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php index 108e683..ce72eea 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTest.php @@ -26,7 +26,8 @@ public static function getInfo() { * Tests the general renderering of styles. */ public function testStyle() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); $style = $view->display_handler->getOption('style'); $style['type'] = 'test_style'; $view->display_handler->setOption('style', $style); @@ -42,7 +43,8 @@ public function testStyle() { $this->assertTrue(strpos($output, $random_text) !== FALSE, 'Take sure that the rendering of the style plugin appears in the output of the view.'); // This run use the test row plugin and render with it. - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); $style = $view->display_handler->getOption('style'); $style['type'] = 'test_style'; $view->display_handler->setOption('style', $style); @@ -67,9 +69,9 @@ public function testStyle() { * Tests the grouping legacy features of styles. */ function testGroupingLegacy() { - $view = $this->view->cloneView(); + $view = views_get_view('test_view'); // Setup grouping by the job. - $view->initDisplay(); + $view->setDisplay(); $view->initStyle(); $view->style_plugin->options['grouping'] = 'job'; @@ -163,9 +165,9 @@ function testGrouping() { * Tests the grouping features of styles. */ function _testGrouping($stripped = FALSE) { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Setup grouping by the job and the age field. - $view->initDisplay(); $view->initStyle(); $view->style_plugin->options['grouping'] = array( array('field' => 'job'), @@ -282,10 +284,10 @@ function _testGrouping($stripped = FALSE) { * Tests custom css classes. */ function testCustomRowClasses() { - $view = $this->view->cloneView(); + $view = views_get_view('test_view'); + $view->setDisplay(); // Setup some random css class. - $view->initDisplay(); $view->initStyle(); $random_name = $this->randomName(); $view->style_plugin->options['row_class'] = $random_name . " test-token-[name]"; diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTestBase.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTestBase.php index e60c217..8bc328c 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTestBase.php +++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleTestBase.php @@ -7,10 +7,12 @@ namespace Drupal\views\Tests\Plugin; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests some general style plugin related functionality. */ -abstract class StyleTestBase extends PluginTestBase { +abstract class StyleTestBase extends ViewUnitTestBase { /** * Stores the SimpleXML representation of the output. @@ -19,12 +21,6 @@ */ protected $elements; - protected function setUp() { - parent::setUp(); - - $this->enableViewsTestModule(); - } - /** * Stores a view output in the elements. */ diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleUnformattedTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleUnformattedTest.php index bcc2e8c..6a1645c 100644 --- a/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleUnformattedTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/StyleUnformattedTest.php @@ -24,7 +24,8 @@ public static function getInfo() { * Take sure that the default css classes works as expected. */ function testDefaultRowClasses() { - $view = $this->getView(); + $view = views_get_view('test_view'); + $view->setDisplay(); $rendered_output = $view->preview(); $this->storeViewPreview($rendered_output); diff --git a/core/modules/views/lib/Drupal/views/Tests/PluginInstanceTest.php b/core/modules/views/lib/Drupal/views/Tests/PluginInstanceTest.php index 5880136..f36e8f2 100644 --- a/core/modules/views/lib/Drupal/views/Tests/PluginInstanceTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/PluginInstanceTest.php @@ -7,10 +7,12 @@ namespace Drupal\views\Tests; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Checks general plugin data and instances for all plugin types. */ -class PluginInstanceTest extends ViewTestBase { +class PluginInstanceTest extends ViewUnitTestBase { /** * All views plugin types. diff --git a/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php b/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php index f4561ac..7f92356 100644 --- a/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/TokenReplaceTest.php @@ -7,10 +7,12 @@ namespace Drupal\views\Tests; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests core view token replacement. */ -class TokenReplaceTest extends ViewTestBase { +class TokenReplaceTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -21,9 +23,9 @@ public static function getInfo() { } public function setUp() { - parent::SetUp(); + parent::setUp(); - $this->enableViewsTestModule(); + $this->enableModules(array('system')); } /** diff --git a/core/modules/views/lib/Drupal/views/Tests/UI/TagTest.php b/core/modules/views/lib/Drupal/views/Tests/UI/TagTest.php index 957f890..06f668b 100644 --- a/core/modules/views/lib/Drupal/views/Tests/UI/TagTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/UI/TagTest.php @@ -7,10 +7,12 @@ namespace Drupal\views\Tests\UI; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests the views ui tagging functionality. */ -class TagTest extends UITestBase { +class TagTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -45,7 +47,7 @@ public function testViewsUiAutocompleteTag() { $matches = (array) json_decode($result->getContent()); $this->assertEqual(count($matches), 8, 'Make sure that only a subset is returned.'); foreach ($matches as $tag) { - $this->assertTrue(array_search($tag, $tags) !== FALSE, format_string('Make sure the returned tag @tag actually exists.'. array('@tag' => $tag))); + $this->assertTrue(array_search($tag, $tags) !== FALSE, format_string('Make sure the returned tag @tag actually exists.', array('@tag' => $tag))); } // Make sure an invalid result doesn't return anything. diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php b/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php index 751d62b..392256b 100644 --- a/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php +++ b/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php @@ -133,27 +133,16 @@ protected function assertIdenticalResultsetHelper($view, $expected_result, $colu * 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')); + $order = $reverse ? -1 : 1; + usort($result_set, function ($a, $b) use ($column, $order) { + if ($a[$column] == $b[$column]) { + return 0; + } + return $order * (($a[$column] < $b[$column]) ? -1 : 1); + }); 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. */ diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php b/core/modules/views/lib/Drupal/views/Tests/ViewUnitTestBase.php similarity index 71% copy from core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php copy to core/modules/views/lib/Drupal/views/Tests/ViewUnitTestBase.php index 751d62b..2e90bff 100644 --- a/core/modules/views/lib/Drupal/views/Tests/ViewTestBase.php +++ b/core/modules/views/lib/Drupal/views/Tests/ViewUnitTestBase.php @@ -1,51 +1,52 @@ view = $this->getBasicView(); - } + // Mock an empty request. + $this->container->register('request', new Request()); - /** - * Sets up the views_test_data.module. - * - * Because the schema of views_test_data.module is dependent on the test using it, - * it cannot be enabled normally. - */ - protected function enableViewsTestModule() { // Define the schema and views data variable before enabling the test module. state()->set('views_test_data_schema', $this->schemaDefinition()); state()->set('views_test_data_views_data', $this->viewsData()); - module_enable(array('views_test_data')); - $this->resetAll(); + $this->enableModules(array('views', 'views_test_config', 'views_test_data')); + + foreach (ViewExecutable::getPluginTypes() as $type) { + if ($type == 'join') { + $this->container->register('plugin.manager.views.join', 'Drupal\views\Plugin\Type\JoinManager'); + } + elseif ($type == 'wizard') { + $this->container->register('plugin.manager.views.wizard', 'Drupal\views\Plugin\Type\WizardManager'); + } + else { + $this->container->register("plugin.manager.views.$type", 'Drupal\views\Plugin\Type\PluginManager') + ->addArgument($type); + } + } // Load the test dataset. $data_set = $this->dataSet(); @@ -55,10 +56,6 @@ protected function enableViewsTestModule() { $query->values($record); } $query->execute(); - $this->checkPermissions(array(), TRUE); - - // Reset the test view, in case it was dependent on the test data module. - $this->view = $this->getBasicView(); } /** @@ -133,34 +130,16 @@ protected function assertIdenticalResultsetHelper($view, $expected_result, $colu * 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')); + $order = $reverse ? -1 : 1; + usort($result_set, function ($a, $b) use ($column, $order) { + if ($a[$column] == $b[$column]) { + return 0; + } + return $order * (($a[$column] < $b[$column]) ? -1 : 1); + }); 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. * @@ -175,22 +154,6 @@ protected function executeView($view, $args = array()) { } /** - * Build and return a Page view of the views_test_data table. - * - * @return view - */ - protected function getBasicPageView() { - $view = $this->getView(); - - // In order to test exposed filters, we have to disable - // the exposed forms cache. - drupal_static_reset('views_exposed_form_cache'); - - $display = $view->storage->newDisplay('page', 'Page', 'page_1'); - return $view; - } - - /** * The schema definition. */ protected function schemaDefinition() { @@ -382,57 +345,4 @@ protected function dataSet() { ); } - /** - * Build and return a basic view of the views_test_data table. - * - * @return Drupal\views\ViewExecutable - */ - protected function getBasicView() { - return $this->createViewFromConfig('test_view'); - } - - /** - * Creates a new View instance by creating directly from config data. - * - * @param string $view_name - * The name of the test view to create. - * - * @return Drupal\views\ViewExecutable - * A View instance. - */ - protected function createViewFromConfig($view_name) { - if (!module_exists('views_test_config')) { - module_enable(array('views_test_config')); - } - - $data = config("views.view.$view_name")->get(); - - $view = entity_create('view', $data); - $view = $view->get('executable'); - $view->setDisplay(); - - return $view; - } - - /** - * Clones the view used in this test and sets the default display. - * - * @param Drupal\views\Plugin\Core\Entity\View $original_view - * (optional) The view to clone. If not specified, the default view for the - * test will be used. - * - * @return Drupal\views\ViewExecutable - * A clone of the view. - */ - protected function getView($original_view = NULL) { - if (isset($original_view)) { - $view = $original_view->cloneView(); - } - else { - $view = $this->view->cloneView(); - } - $view->setDisplay(); - return $view; - } - } diff --git a/core/modules/views/lib/Drupal/views/Tests/ViewsDataTest.php b/core/modules/views/lib/Drupal/views/Tests/ViewsDataTest.php index d1ab4ae..65b5dee 100644 --- a/core/modules/views/lib/Drupal/views/Tests/ViewsDataTest.php +++ b/core/modules/views/lib/Drupal/views/Tests/ViewsDataTest.php @@ -7,12 +7,14 @@ namespace Drupal\views\Tests; +use Drupal\views\Tests\ViewUnitTestBase; + /** * Tests the fetching of views data. * * @see hook_views_data */ -class ViewsDataTest extends ViewTestBase { +class ViewsDataTest extends ViewUnitTestBase { public static function getInfo() { return array( @@ -22,12 +24,6 @@ public static function getInfo() { ); } - protected function setUp() { - parent::setUp(); - - $this->enableViewsTestModule(); - } - /** * Tests the views_fetch_data function. * diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_access_none.yml b/core/modules/views/tests/views_test_config/config/views.view.test_access_none.yml index 79019ef..4dfd054 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_access_none.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_access_none.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_access_perm.yml b/core/modules/views/tests/views_test_config/config/views.view.test_access_perm.yml index f509323..78111eb 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_access_perm.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_access_perm.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_access_role.yml b/core/modules/views/tests/views_test_config/config/views.view.test_access_role.yml index 3d2b4d9..f17bf5a 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_access_role.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_access_role.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_aggregate_count.yml b/core/modules/views/tests/views_test_config/config/views.view.test_aggregate_count.yml index 7a42247..0c13f9b 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_aggregate_count.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_aggregate_count.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_alias.yml b/core/modules/views/tests/views_test_config/config/views.view.test_alias.yml index 3755f24..9cc29f7 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_alias.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_alias.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: users core: 8.0-dev description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_argument_default_fixed.yml b/core/modules/views/tests/views_test_config/config/views.view.test_argument_default_fixed.yml index 061b209..249b2bd 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_argument_default_fixed.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_argument_default_fixed.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_comment_user_uid.yml b/core/modules/views/tests/views_test_config/config/views.view.test_comment_user_uid.yml index 4dca1cd..6c028d4 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_comment_user_uid.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_comment_user_uid.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_executable_displays.yml b/core/modules/views/tests/views_test_config/config/views.view.test_executable_displays.yml index 8feb580..108bfe0 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_executable_displays.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_executable_displays.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: views_test_data core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_plugin: default diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_exposed_form.yml b/core/modules/views/tests/views_test_config/config/views.view.test_exposed_form.yml index 736ba03..ab0c8c2 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_exposed_form.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_exposed_form.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_feed_display.yml b/core/modules/views/tests/views_test_config/config/views.view.test_feed_display.yml index 6ba9d11..b4e4b60 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_feed_display.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_feed_display.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: 8.0-dev description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_field_get_entity.yml b/core/modules/views/tests/views_test_config/config/views.view.test_field_get_entity.yml index 5ba2fc9..e6bd5ea 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_field_get_entity.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_field_get_entity.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: comment core: 8.0-dev description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_field_tokens.yml b/core/modules/views/tests/views_test_config/config/views.view.test_field_tokens.yml index 01431a6..562c33c 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_field_tokens.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_field_tokens.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: views_test_data core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_field_type.yml b/core/modules/views/tests/views_test_config/config/views.view.test_field_type.yml index c9172bc..98e9391 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_field_type.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_field_type.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_filter_date_between.yml b/core/modules/views/tests/views_test_config/config/views.view.test_filter_date_between.yml index 71f4b2f..be954da 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_filter_date_between.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_filter_date_between.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_filter_group_override.yml b/core/modules/views/tests/views_test_config/config/views.view.test_filter_group_override.yml index 379eff6..2a87b2c 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_filter_group_override.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_filter_group_override.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_filter_groups.yml b/core/modules/views/tests/views_test_config/config/views.view.test_filter_groups.yml index d71c02e..bdb51ad 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_filter_groups.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_filter_groups.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_filter_node_uid_revision.yml b/core/modules/views/tests/views_test_config/config/views.view.test_filter_node_uid_revision.yml index 69000ec..f42f248 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_filter_node_uid_revision.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_filter_node_uid_revision.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: 8.0-dev description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_glossary.yml b/core/modules/views/tests/views_test_config/config/views.view.test_glossary.yml index 33045e5..3090b6b 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_glossary.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_glossary.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_group_by_count.yml b/core/modules/views/tests/views_test_config/config/views.view.test_group_by_count.yml index 7ea0ab8..75856a7 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_group_by_count.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_group_by_count.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_group_by_in_filters.yml b/core/modules/views/tests/views_test_config/config/views.view.test_group_by_in_filters.yml index c494b09..b473451 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_group_by_in_filters.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_group_by_in_filters.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_term.yml b/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_term.yml index 5240f0c..f130741 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_term.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_term.yml @@ -3,7 +3,7 @@ base_field: tid base_table: taxonomy_term_data core: 8.0-dev description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_user.yml b/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_user.yml index 7d79d11..089752d 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_user.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_groupwise_user.yml @@ -3,7 +3,7 @@ base_field: uid base_table: users core: 8.0-dev description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_handler_relationships.yml b/core/modules/views/tests/views_test_config/config/views.view.test_handler_relationships.yml index 409fb2c..3e308f8 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_handler_relationships.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_handler_relationships.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_pager_full.yml b/core/modules/views/tests/views_test_config/config/views.view.test_pager_full.yml index 08be354..6b6195b 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_pager_full.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_pager_full.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_pager_none.yml b/core/modules/views/tests/views_test_config/config/views.view.test_pager_none.yml index 7b20316..51e0349 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_pager_none.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_pager_none.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_pager_some.yml b/core/modules/views/tests/views_test_config/config/views.view.test_pager_some.yml index d9ecda5..3645451 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_pager_some.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_pager_some.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml b/core/modules/views/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml index 54180b6..5065963 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_redirect_view.yml b/core/modules/views/tests/views_test_config/config/views.view.test_redirect_view.yml index 1217693..e48752d 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_redirect_view.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_redirect_view.yml @@ -74,6 +74,6 @@ display: display_options: path: test-redirect-view base_field: nid -disabled: '0' +disabled: '1' module: views langcode: und diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_store_pager_settings.yml b/core/modules/views/tests/views_test_config/config/views.view.test_store_pager_settings.yml index 0c4acfe..af856f6 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_store_pager_settings.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_store_pager_settings.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_taxonomy_node_term_data.yml b/core/modules/views/tests/views_test_config/config/views.view.test_taxonomy_node_term_data.yml index 383766a..d7cdaf1 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_taxonomy_node_term_data.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_taxonomy_node_term_data.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_tokens.yml b/core/modules/views/tests/views_test_config/config/views.view.test_tokens.yml index f6e640c..efd5f75 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_tokens.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_tokens.yml @@ -53,5 +53,5 @@ display: options: { } path: test_tokens base_field: id -disabled: '0' +disabled: '1' module: views diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_user_relationship.yml b/core/modules/views/tests/views_test_config/config/views.view.test_user_relationship.yml index 096fa16..2c48918 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_user_relationship.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_user_relationship.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_user_uid_argument.yml b/core/modules/views/tests/views_test_config/config/views.view.test_user_uid_argument.yml index 7dfce3e..57d445a 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_user_uid_argument.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_user_uid_argument.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: users core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view.yml index 57dd103..6e671f9 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_view.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_view.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: views_test_data core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml index 446aa63..45e33fe 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_php.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_php.yml index 1b4dc28..04fca29 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_php.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_php.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml index 2750f43..c2ee430 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_delete.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_delete.yml index ca28db8..02f4f9c 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_view_delete.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_delete.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_fieldapi.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_fieldapi.yml index fe2ecc0..fd1cbe7 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_view_fieldapi.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_fieldapi.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_handler_weight.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_handler_weight.yml index cf47d54..95051b7 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_view_handler_weight.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_handler_weight.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: views_test_data core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml b/core/modules/views/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml index 5b909ea..66b54be 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml b/core/modules/views/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml index 48522e0..8791e23 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: users core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_field.yml b/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_field.yml index 22642b5..14747b8 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_field.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_field.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: views_test_data core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_handler.yml b/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_handler.yml index d66c95d..6ce526a 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_handler.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_handler.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: views_test_data core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_table.yml b/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_table.yml index 956a7f0..a54bdee 100644 --- a/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_table.yml +++ b/core/modules/views/tests/views_test_config/config/views.view.test_views_move_to_table.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: views_old_table core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_access_dynamic.yml b/core/modules/views/tests/views_test_data/config/views.view.test_access_dynamic.yml index a78537d..9d9ae55 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_access_dynamic.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_access_dynamic.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_access_static.yml b/core/modules/views/tests/views_test_data/config/views.view.test_access_static.yml index cd3a94c..1721839 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_access_static.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_access_static.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_argument_default_current_user.yml b/core/modules/views/tests/views_test_data/config/views.view.test_argument_default_current_user.yml index 3cf754d..88a24eb 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_argument_default_current_user.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_argument_default_current_user.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_click_sort.yml b/core/modules/views/tests/views_test_data/config/views.view.test_click_sort.yml index 8aa2eb2..ff88aff 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_click_sort.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_click_sort.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: views_test_data core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_example_area.yml b/core/modules/views/tests/views_test_data/config/views.view.test_example_area.yml index 2a8fb0b..3333772 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_example_area.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_example_area.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_exposed_admin_ui.yml b/core/modules/views/tests/views_test_data/config/views.view.test_exposed_admin_ui.yml index d73dfb8..21eefff 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_exposed_admin_ui.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_exposed_admin_ui.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_field_classes.yml b/core/modules/views/tests/views_test_data/config/views.view.test_field_classes.yml index d2fe5b2..0f0234c 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_field_classes.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_field_classes.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: views_test_data core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_field_output.yml b/core/modules/views/tests/views_test_data/config/views.view.test_field_output.yml index 6d0d73f..f33e96b 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_field_output.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_field_output.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: views_test_data core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_filter_in_operator_ui.yml b/core/modules/views/tests/views_test_data/config/views.view.test_filter_in_operator_ui.yml index a68c790..e66037a 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_filter_in_operator_ui.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_filter_in_operator_ui.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_page_display.yml b/core/modules/views/tests/views_test_data/config/views.view.test_page_display.yml index 92ed6c7..831d92e 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_page_display.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_page_display.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_rename_reset_button.yml b/core/modules/views/tests/views_test_data/config/views.view.test_rename_reset_button.yml index e03d666..e427da2 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_rename_reset_button.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_rename_reset_button.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_style_mapping.yml b/core/modules/views/tests/views_test_data/config/views.view.test_style_mapping.yml index 30d4dd9..cb4e2c9 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_style_mapping.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_style_mapping.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: views_test_data core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_user_name.yml b/core/modules/views/tests/views_test_data/config/views.view.test_user_name.yml index ab243bc..30dd77c 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_user_name.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_user_name.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: users core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: diff --git a/core/modules/views/tests/views_test_data/config/views.view.test_views_groupby_save.yml b/core/modules/views/tests/views_test_data/config/views.view.test_views_groupby_save.yml index 05f9b5c..43dabba 100644 --- a/core/modules/views/tests/views_test_data/config/views.view.test_views_groupby_save.yml +++ b/core/modules/views/tests/views_test_data/config/views.view.test_views_groupby_save.yml @@ -2,7 +2,7 @@ api_version: '3.0' base_table: node core: '8' description: '' -disabled: '0' +disabled: '1' display: default: display_options: