Skip to content

GitLab

D
drupal
Commit 712b4b90 authored by ACF's avatar ACF Committed by tim.plunkett
Browse files
Options

Issue #1774278 by ACF: Update views_test_data schema and variables.

parent 19011f11
Hide whitespace changes
Inline Side-by-side
Showing with 275 additions and 275 deletions
lib/Drupal/views/Tests/BasicTest.php
View file @ 712b4b90
......@@ -38,8 +38,8 @@ public function testSimpleResultSet() {
// Verify the result.
$this->assertEqual(5, count($view->result), t('The number of returned rows match.'));
$this->assertIdenticalResultset($view, $this->dataSet(), array(
'views_test_name' => 'name',
'views_test_age' => 'age',
'views_test_data_name' => 'name',
'views_test_data_age' => 'age',
));
}
......@@ -65,7 +65,7 @@ public function testSimpleFiltering() {
'label' => '',
),
'id' => 'age',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'age',
'relationship' => 'none',
),
......@@ -96,8 +96,8 @@ public function testSimpleFiltering() {
// Verify the result.
$this->assertEqual(3, count($view->result), t('The number of returned rows match.'));
$this->assertIdenticalResultSet($view, $dataset, array(
'views_test_name' => 'name',
'views_test_age' => 'age',
'views_test_data_name' => 'name',
'views_test_data_age' => 'age',
));
}
......@@ -126,7 +126,7 @@ public function testSimpleArgument() {
'break_phrase' => 0,
'not' => 0,
'id' => 'age',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'age',
'validate_user_argument_type' => 'uid',
'validate_user_roles' => array(
......@@ -169,8 +169,8 @@ public function testSimpleArgument() {
// Verify the result.
$this->assertEqual(1, count($view->result), t('The number of returned rows match.'));
$this->assertIdenticalResultSet($view, $dataset, array(
'views_test_name' => 'name',
'views_test_age' => 'age',
'views_test_data_name' => 'name',
'views_test_data_age' => 'age',
));
// Test "show all" if no argument is present.
......@@ -182,8 +182,8 @@ public function testSimpleArgument() {
$this->assertEqual(5, count($view->result), t('The number of returned rows match.'));
$this->assertIdenticalResultSet($view, $dataset, array(
'views_test_name' => 'name',
'views_test_age' => 'age',
'views_test_data_name' => 'name',
'views_test_data_age' => 'age',
));
}
......
lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
View file @ 712b4b90
......@@ -28,7 +28,7 @@ protected function setUp() {
function viewsData() {
$data = parent::viewsData();
$data['views_test']['id']['argument']['id'] = 'null';
$data['views_test_data']['id']['argument']['id'] = 'null';
return $data;
}
......@@ -67,7 +67,7 @@ public function testAreaText() {
$view->display['default']->handler->overrideOption('arguments', array(
'id' => array(
'id' => 'id',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'id',
),
));
......
lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
View file @ 712b4b90
......@@ -36,7 +36,7 @@ function dataSet() {
function viewsData() {
$data = parent::viewsData();
$data['views_test']['age']['field']['id'] = 'boolean';
$data['views_test_data']['age']['field']['id'] = 'boolean';
return $data;
}
......@@ -46,7 +46,7 @@ public function testFieldBoolean() {
$view->display['default']->handler->overrideOption('fields', array(
'age' => array(
'id' => 'age',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'age',
'relationship' => 'none',
),
......
lib/Drupal/views/Tests/Handler/FieldCounterTest.php
View file @ 712b4b90
......@@ -37,7 +37,7 @@ function testSimple() {
),
'name' => array(
'id' => 'name',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
),
......@@ -61,7 +61,7 @@ function testSimple() {
),
'name' => array(
'id' => 'name',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
),
......
lib/Drupal/views/Tests/Handler/FieldCustomTest.php
View file @ 712b4b90
......@@ -28,7 +28,7 @@ protected function setUp() {
function viewsData() {
$data = parent::viewsData();
$data['views_test']['name']['field']['id'] = 'custom';
$data['views_test_data']['name']['field']['id'] = 'custom';
return $data;
}
......@@ -40,7 +40,7 @@ public function testFieldCustom() {
$view->display['default']->handler->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
'alter' => array(
......
lib/Drupal/views/Tests/Handler/FieldDateTest.php
View file @ 712b4b90
......@@ -28,7 +28,7 @@ protected function setUp() {
function viewsData() {
$data = parent::viewsData();
$data['views_test']['created']['field']['id'] = 'date';
$data['views_test_data']['created']['field']['id'] = 'date';
return $data;
}
......@@ -38,7 +38,7 @@ public function testFieldDate() {
$view->display['default']->handler->overrideOption('fields', array(
'created' => array(
'id' => 'created',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'created',
'relationship' => 'none',
// c is iso 8601 date format @see http://php.net/manual/en/function.date.php
......
lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
View file @ 712b4b90
......@@ -40,7 +40,7 @@ function dataSet() {
function viewsData() {
$data = parent::viewsData();
$data['views_test']['age']['field']['id'] = 'file_size';
$data['views_test_data']['age']['field']['id'] = 'file_size';
return $data;
}
......@@ -51,7 +51,7 @@ public function testFieldFileSize() {
$view->display['default']->handler->overrideOption('fields', array(
'age' => array(
'id' => 'age',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'age',
),
));
......
lib/Drupal/views/Tests/Handler/FieldTest.php
View file @ 712b4b90
......@@ -30,7 +30,7 @@ protected function setUp() {
$this->enableViewsTestModule();
$this->column_map = array(
'views_test_name' => 'name',
'views_test_data_name' => 'name',
);
}
......@@ -39,7 +39,7 @@ protected function setUp() {
*/
protected function viewsData() {
$data = parent::viewsData();
$data['views_test']['job']['field']['id'] = 'test_field';
$data['views_test_data']['job']['field']['id'] = 'test_field';
return $data;
}
......@@ -68,12 +68,12 @@ public function testQuery() {
$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', 'field' => 'created');
$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_job');
$this->assertEqual($id_field->aliases['created_test'], 'views_test_created');
$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.
......@@ -499,9 +499,9 @@ public function testFieldTokens() {
$name_field_2->options['alter']['text'] = '[name_2] [name_1]';
foreach ($view->result as $row) {
$expected_output_0 = $row->views_test_name;
$expected_output_1 = "$row->views_test_name $row->views_test_name";
$expected_output_2 = "$row->views_test_name $row->views_test_name $row->views_test_name";
$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);
......@@ -581,18 +581,18 @@ public function testTextRendering() {
// Tests for removing whitespace and the beginning and the end.
$name_field->options['alter']['alter_text'] = FALSE;
$views_test_name = $row->views_test_name;
$row->views_test_name = ' ' . $views_test_name . ' ';
$views_test_data_name = $row->views_test_data_name;
$row->views_test_data_name = ' ' . $views_test_data_name . ' ';
$name_field->options['alter']['trim_whitespace'] = TRUE;
$output = $name_field->advanced_render($row);
$this->assertSubString($output, $views_test_name, 'Make sure the trimmed text can be found if trimming is enabled.');
$this->assertNotSubString($output, $row->views_test_name, 'Make sure the untrimmed text can be found if trimming is enabled.');
$this->assertSubString($output, $views_test_data_name, 'Make sure the trimmed text can be found if trimming is enabled.');
$this->assertNotSubString($output, $row->views_test_data_name, 'Make sure the untrimmed text can be found if trimming is enabled.');
$name_field->options['alter']['trim_whitespace'] = FALSE;
$output = $name_field->advanced_render($row);
$this->assertSubString($output, $views_test_name, 'Make sure the trimmed text can be found if trimming is disabled.');
$this->assertSubString($output, $row->views_test_name, 'Make sure the untrimmed text can be found if trimming is disabled.');
$this->assertSubString($output, $views_test_data_name, 'Make sure the trimmed text can be found if trimming is disabled.');
$this->assertSubString($output, $row->views_test_data_name, 'Make sure the untrimmed text can be found if trimming is disabled.');
// Tests for trimming to a maximum length.
......@@ -600,13 +600,13 @@ public function testTextRendering() {
$name_field->options['alter']['word_boundary'] = FALSE;
// Tests for simple trimming by string length.
$row->views_test_name = $this->randomName(8);
$row->views_test_data_name = $this->randomName(8);
$name_field->options['alter']['max_length'] = 5;
$trimmed_name = drupal_substr($row->views_test_name, 0, 5);
$trimmed_name = drupal_substr($row->views_test_data_name, 0, 5);
$output = $name_field->advanced_render($row);
$this->assertSubString($output, $trimmed_name, format_string('Make sure the trimmed output (!trimmed) appears in the rendered output (!output).', array('!trimmed' => $trimmed_name, '!output' => $output)));
$this->assertNotSubString($output, $row->views_test_name, format_string("Make sure the untrimmed value (!untrimmed) shouldn't appear in the rendered output (!output).", array('!untrimmed' => $row->views_test_name, '!output' => $output)));
$this->assertNotSubString($output, $row->views_test_data_name, format_string("Make sure the untrimmed value (!untrimmed) shouldn't appear in the rendered output (!output).", array('!untrimmed' => $row->views_test_data_name, '!output' => $output)));
$name_field->options['alter']['max_length'] = 9;
$output = $name_field->advanced_render($row);
......@@ -648,7 +648,7 @@ public function testTextRendering() {
);
foreach ($touples as $touple) {
$row->views_test_name = $touple['value'];
$row->views_test_data_name = $touple['value'];
$output = $name_field->advanced_render($row);
if ($touple['trimmed']) {
......@@ -660,7 +660,7 @@ public function testTextRendering() {
}
// Tests for displaying a readmore link when the output got trimmed.
$row->views_test_name = $this->randomName(8);
$row->views_test_data_name = $this->randomName(8);
$name_field->options['alter']['max_length'] = 5;
$name_field->options['alter']['more_link'] = TRUE;
$name_field->options['alter']['more_link_text'] = $more_text = $this->randomName();
......@@ -676,7 +676,7 @@ public function testTextRendering() {
$this->assertFalse($this->xpathContent($output, '//a[contains(@href, :path)]', array(':path' => $more_path)), 'Make sure no read more link appears.');
// Check for the ellipses.
$row->views_test_name = $this->randomName(8);
$row->views_test_data_name = $this->randomName(8);
$name_field->options['alter']['max_length'] = 5;
$output = $name_field->advanced_render($row);
$this->assertSubString($output, '...', 'An ellipsis should appear if the output is trimmed');
......
lib/Drupal/views/Tests/Handler/FieldUrlTest.php
View file @ 712b4b90
......@@ -28,7 +28,7 @@ protected function setUp() {
function viewsData() {
$data = parent::viewsData();
$data['views_test']['name']['field']['id'] = 'url';
$data['views_test_data']['name']['field']['id'] = 'url';
return $data;
}
......@@ -38,7 +38,7 @@ public function testFieldUrl() {
$view->display['default']->handler->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
'display_as_link' => FALSE,
......@@ -56,7 +56,7 @@ public function testFieldUrl() {
$view->display['default']->handler->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
),
......
lib/Drupal/views/Tests/Handler/FieldXssTest.php
View file @ 712b4b90
......@@ -41,7 +41,7 @@ function dataHelper() {
function viewsData() {
$data = parent::viewsData();
$data['views_test']['name']['field']['id'] = 'xss';
$data['views_test_data']['name']['field']['id'] = 'xss';
return $data;
}
......@@ -52,7 +52,7 @@ public function testFieldXss() {
$view->display['default']->handler->overrideOption('fields', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'name',
),
));
......@@ -61,7 +61,7 @@ public function testFieldXss() {
$counter = 0;
foreach ($this->dataHelper() as $input => $expected_result) {
$view->result[$counter]->views_test_name = $input;
$view->result[$counter]->views_test_data_name = $input;
$this->assertEqual($view->field['name']->advanced_render($view->result[$counter]), $expected_result);
$counter++;
}
......
lib/Drupal/views/Tests/Handler/FilterCombineTest.php
View file @ 712b4b90
......@@ -28,8 +28,8 @@ function setUp() {
$this->enableViewsTestModule();
$this->column_map = array(
'views_test_name' => 'name',
'views_test_job' => 'job',
'views_test_data_name' => 'name',
'views_test_data_job' => 'job',
);
}
......@@ -37,7 +37,7 @@ protected function getBasicView() {
$view = parent::getBasicView();
$view->display['default']->display_options['fields']['job'] = array(
'id' => 'job',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'job',
'relationship' => 'none',
);
......@@ -100,11 +100,11 @@ protected function dataSet() {
}
/**
* Allow {views_test}.job to be NULL.
* Allow {views_test_data}.job to be NULL.
*/
protected function schemaDefinition() {
$schema = parent::schemaDefinition();
unset($schema['views_test']['fields']['job']['not null']);
unset($schema['views_test_data']['fields']['job']['not null']);
return $schema;
}
......
lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
View file @ 712b4b90
......@@ -26,13 +26,13 @@ function setUp() {
$this->enableViewsTestModule();
$this->column_map = array(
'views_test_name' => 'name',
'views_test_data_name' => 'name',
);
}
function viewsData() {
$data = parent::viewsData();
$data['views_test']['name']['filter']['id'] = 'equality';
$data['views_test_data']['name']['filter']['id'] = 'equality';
return $data;
}
......@@ -44,7 +44,7 @@ function testEqual() {
$view->display['default']->handler->overrideOption('filters', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
'operator' => '=',
......@@ -86,7 +86,7 @@ function testNotEqual() {
$view->display['default']->handler->overrideOption('filters', array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
'operator' => '!=',
......@@ -144,7 +144,7 @@ protected function getGroupedExposedFilters() {
$filters = array(
'name' => array(
'id' => 'name',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
'group' => 1,
......
lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
View file @ 712b4b90
......@@ -28,7 +28,7 @@ protected function setUp() {
function viewsData() {
$data = parent::viewsData();
$data['views_test']['age']['filter']['id'] = 'in_operator';
$data['views_test_data']['age']['filter']['id'] = 'in_operator';
return $data;
}
......@@ -41,7 +41,7 @@ public function testFilterInOperatorSimple() {
'age' => array(
'id' => 'age',
'field' => 'age',
'table' => 'views_test',
'table' => 'views_test_data',
'value' => array(26, 30),
'operator' => 'in',
),
......@@ -62,8 +62,8 @@ public function testFilterInOperatorSimple() {
$this->assertEqual(2, count($view->result));
$this->assertIdenticalResultset($view, $expected_result, array(
'views_test_name' => 'name',
'views_test_age' => 'age',
'views_test_data_name' => 'name',
'views_test_data_age' => 'age',
));
$view = $this->getView();
......@@ -73,7 +73,7 @@ public function testFilterInOperatorSimple() {
'age' => array(
'id' => 'age',
'field' => 'age',
'table' => 'views_test',
'table' => 'views_test_data',
'value' => array(26, 30),
'operator' => 'not in',
),
......@@ -98,8 +98,8 @@ public function testFilterInOperatorSimple() {
$this->assertEqual(3, count($view->result));
$this->assertIdenticalResultset($view, $expected_result, array(
'views_test_name' => 'name',
'views_test_age' => 'age',
'views_test_data_name' => 'name',
'views_test_data_age' => 'age',
));
}
......@@ -127,8 +127,8 @@ public function testFilterInOperatorGroupedExposedSimple() {
$this->assertEqual(2, count($view->result));
$this->assertIdenticalResultset($view, $expected_result, array(
'views_test_name' => 'name',
'views_test_age' => 'age',
'views_test_data_name' => 'name',
'views_test_data_age' => 'age',
));
}
......@@ -160,8 +160,8 @@ public function testFilterNotInOperatorGroupedExposedSimple() {
$this->assertEqual(3, count($view->result));
$this->assertIdenticalResultset($view, $expected_result, array(
'views_test_name' => 'name',
'views_test_age' => 'age',
'views_test_data_name' => 'name',
'views_test_data_age' => 'age',
));
}
......@@ -169,7 +169,7 @@ protected function getGroupedExposedFilters() {
$filters = array(
'age' => array(
'id' => 'age',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'age',
'relationship' => 'none',
'exposed' => TRUE,
......
lib/Drupal/views/Tests/Handler/FilterNumericTest.php
View file @ 712b4b90
......@@ -28,15 +28,15 @@ function setUp() {
$this->enableViewsTestModule();
$this->column_map = array(
'views_test_name' => 'name',
'views_test_age' => 'age',
'views_test_data_name' => 'name',
'views_test_data_age' => 'age',
);
}
function viewsData() {
$data = parent::viewsData();
$data['views_test']['age']['filter']['allow empty'] = TRUE;
$data['views_test']['id']['filter']['allow empty'] = FALSE;
$data['views_test_data']['age']['filter']['allow empty'] = TRUE;
$data['views_test_data']['id']['filter']['allow empty'] = FALSE;
return $data;
}
......@@ -48,7 +48,7 @@ public function testFilterNumericSimple() {
$view->display['default']->handler->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'age',
'relationship' => 'none',
'operator' => '=',
......@@ -92,7 +92,7 @@ public function testFilterNumericBetween() {
$view->display['default']->handler->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'age',
'relationship' => 'none',
'operator' => 'between',
......@@ -128,7 +128,7 @@ public function testFilterNumericBetween() {
$view->display['default']->handler->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'age',
'relationship' => 'none',
'operator' => 'not between',
......@@ -221,7 +221,7 @@ public function testFilterNumericEmpty() {
$view->display['default']->handler->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'age',
'relationship' => 'none',
'operator' => 'empty',
......@@ -240,7 +240,7 @@ public function testFilterNumericEmpty() {
$view->display['default']->handler->overrideOption('filters', array(
'age' => array(
'id' => 'age',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'age',
'relationship' => 'none',
'operator' => 'not empty',
......@@ -333,13 +333,13 @@ public function testAllowEmpty() {
$view->display['default']->handler->overrideOption('filters', array(
'id' => array(
'id' => 'id',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'id',
'relationship' => 'none',
),
'age' => array(
'id' => 'age',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'age',
'relationship' => 'none',
),
......@@ -360,7 +360,7 @@ protected function getGroupedExposedFilters() {
$filters = array(
'age' => array(
'id' => 'age',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'age',
'relationship' => 'none',
'exposed' => TRUE,
......
lib/Drupal/views/Tests/Handler/FilterStringTest.php
View file @ 712b4b90
......@@ -28,22 +28,22 @@ function setUp() {
$this->enableViewsTestModule();
$this->column_map = array(
'views_test_name' => 'name',
'views_test_data_name' => 'name',
);
}
function viewsData() {
$data = parent::viewsData();
$data['views_test']['name']['filter']['allow empty'] = TRUE;
$data['views_test']['job']['filter']['allow empty'] = FALSE;
$data['views_test']['description'] = $data['views_test']['name'];
$data['views_test_data']['name']['filter']['allow empty'] = TRUE;
$data['views_test_data']['job']['filter']['allow empty'] = FALSE;
$data['views_test_data']['description'] = $data['views_test_data']['name'];
return $data;
}
protected function schemaDefinition() {
$schema = parent::schemaDefinition();
$schema['views_test']['fields']['description'] = array(
$schema['views_test_data']['fields']['description'] = array(
'description' => "A person's description",
'type' => 'text',
'not null' => FALSE,
......@@ -71,7 +71,7 @@ protected function getBasicView() {
$view = parent::getBasicView();
$view->display['default']->options['fields']['description'] = array(
'id' => 'description',
'table' => 'views_test',
'table' => 'views_test_data',
'field' => 'description',
'relationship' => 'none',