diff --git a/lib/Drupal/views/Tests/BasicTest.php b/lib/Drupal/views/Tests/BasicTest.php
index 9a0080acfe9fa01f9d7f4cb1bcbcf48aeb781f22..b951e206f6412b0c2faaad24f126222e1ab8fb3d 100644
--- a/lib/Drupal/views/Tests/BasicTest.php
+++ b/lib/Drupal/views/Tests/BasicTest.php
@@ -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',
));
}
diff --git a/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php b/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
index 6225b7bd196d95c62eb08b2b0014ca95fae56f34..b884648403de1cb99a7640c14e21bf5a37366217 100644
--- a/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
+++ b/lib/Drupal/views/Tests/Handler/ArgumentNullTest.php
@@ -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',
),
));
diff --git a/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php b/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
index 5d0b2f99d7bcda587c1b0ff9b946f5cf028e4d02..45a6b3b2b77cb3f74b9142204ee0f36372406d68 100644
--- a/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldBooleanTest.php
@@ -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',
),
diff --git a/lib/Drupal/views/Tests/Handler/FieldCounterTest.php b/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
index a400752c4ad26b66d233371802303701373e380b..d19850d7b2179647f1cad1cf34aaab28b547ca59 100644
--- a/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldCounterTest.php
@@ -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',
),
diff --git a/lib/Drupal/views/Tests/Handler/FieldCustomTest.php b/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
index e3e51e5a49fdfc89c18d15efc7713fee0a7f37fd..a751fa790696dcc0daedb453e54921e7d786a683 100644
--- a/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldCustomTest.php
@@ -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(
diff --git a/lib/Drupal/views/Tests/Handler/FieldDateTest.php b/lib/Drupal/views/Tests/Handler/FieldDateTest.php
index e18e91a461af5c756ca3dd9ba457bd1db75600c8..6df8450f0463e3580ca2ab36f08b6eab805b7a0f 100644
--- a/lib/Drupal/views/Tests/Handler/FieldDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldDateTest.php
@@ -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
diff --git a/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php b/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
index 0f7cfcc90429d5c79eab1c462b0ab4a142db000f..d9826f09d02d384b13ade803c4d89764dd6c925f 100644
--- a/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldFileSizeTest.php
@@ -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',
),
));
diff --git a/lib/Drupal/views/Tests/Handler/FieldTest.php b/lib/Drupal/views/Tests/Handler/FieldTest.php
index 1d85fd4e906ad1cd3bab9ca64775a9b5f85d7b41..38d6adc8922c9f885cd0fa57ba48ef94004c1af8 100644
--- a/lib/Drupal/views/Tests/Handler/FieldTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldTest.php
@@ -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');
diff --git a/lib/Drupal/views/Tests/Handler/FieldUrlTest.php b/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
index e8a7320603af7de686aa1ad4db37bcd61ef1cbbc..acab241c6f805f3ad360180010a91af375947fdf 100644
--- a/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldUrlTest.php
@@ -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',
),
diff --git a/lib/Drupal/views/Tests/Handler/FieldXssTest.php b/lib/Drupal/views/Tests/Handler/FieldXssTest.php
index dc3ab27aa0ba61c2b7d8658ec37f22638c84003c..753d9196ac8a8f9ce05dae21f6a1291bbb8366cf 100644
--- a/lib/Drupal/views/Tests/Handler/FieldXssTest.php
+++ b/lib/Drupal/views/Tests/Handler/FieldXssTest.php
@@ -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++;
}
diff --git a/lib/Drupal/views/Tests/Handler/FilterCombineTest.php b/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
index 0c122a74cc141ef11409581559498fc916812261..af9d612348c727ae4993cba9d95fc576520ae3d7 100644
--- a/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterCombineTest.php
@@ -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;
}
diff --git a/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php b/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
index ef3556a65b8f29d514ce9db19060d45cfbc728c3..250e19a5ac8c64de8df8f3d81f4e12297766b02a 100644
--- a/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterEqualityTest.php
@@ -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,
diff --git a/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php b/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
index a8ea19c7c2bdf7353085eaaef3de64a0907bac1d..f4e84ccbf91b7979eb7281e0724967125eb2b2a2 100644
--- a/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterInOperatorTest.php
@@ -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,
diff --git a/lib/Drupal/views/Tests/Handler/FilterNumericTest.php b/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
index 6a50fb4dacb6ffe8504f65069bf606a177a9c724..2f95a2a57a637233edb43ce4ee50f0f30deceff0 100644
--- a/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterNumericTest.php
@@ -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,
diff --git a/lib/Drupal/views/Tests/Handler/FilterStringTest.php b/lib/Drupal/views/Tests/Handler/FilterStringTest.php
index 6099a8c41573a7b3e9f427113cd22f2b4e889a63..db5e77aa74cc370503a8606e3612246f9d6a4ea7 100644
--- a/lib/Drupal/views/Tests/Handler/FilterStringTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterStringTest.php
@@ -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',
);
@@ -85,7 +85,7 @@ function testFilterStringEqual() {
$view->display['default']->handler->overrideOption('filters', array(
'name' => array(
'id' => 'name',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
'operator' => '=',
@@ -129,7 +129,7 @@ function testFilterStringNotEqual() {
$view->display['default']->handler->overrideOption('filters', array(
'name' => array(
'id' => 'name',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
'operator' => '!=',
@@ -192,7 +192,7 @@ function testFilterStringContains() {
$view->display['default']->handler->overrideOption('filters', array(
'name' => array(
'id' => 'name',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
'operator' => 'contains',
@@ -238,7 +238,7 @@ function testFilterStringWord() {
$view->display['default']->handler->overrideOption('filters', array(
'description' => array(
'id' => 'description',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'description',
'relationship' => 'none',
'operator' => 'word',
@@ -264,7 +264,7 @@ function testFilterStringWord() {
$view->display['default']->handler->overrideOption('filters', array(
'description' => array(
'id' => 'description',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'description',
'relationship' => 'none',
'operator' => 'allwords',
@@ -329,7 +329,7 @@ function testFilterStringStarts() {
$view->display['default']->handler->overrideOption('filters', array(
'description' => array(
'id' => 'description',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'description',
'relationship' => 'none',
'operator' => 'starts',
@@ -372,7 +372,7 @@ function testFilterStringNotStarts() {
$view->display['default']->handler->overrideOption('filters', array(
'description' => array(
'id' => 'description',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'description',
'relationship' => 'none',
'operator' => 'not_starts',
@@ -429,7 +429,7 @@ function testFilterStringEnds() {
$view->display['default']->handler->overrideOption('filters', array(
'description' => array(
'id' => 'description',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'description',
'relationship' => 'none',
'operator' => 'ends',
@@ -478,7 +478,7 @@ function testFilterStringNotEnds() {
$view->display['default']->handler->overrideOption('filters', array(
'description' => array(
'id' => 'description',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'description',
'relationship' => 'none',
'operator' => 'not_ends',
@@ -529,7 +529,7 @@ function testFilterStringNot() {
$view->display['default']->handler->overrideOption('filters', array(
'description' => array(
'id' => 'description',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'description',
'relationship' => 'none',
'operator' => 'not',
@@ -582,7 +582,7 @@ function testFilterStringShorter() {
$view->display['default']->handler->overrideOption('filters', array(
'name' => array(
'id' => 'name',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
'operator' => 'shorterthan',
@@ -630,7 +630,7 @@ function testFilterStringLonger() {
$view->display['default']->handler->overrideOption('filters', array(
'name' => array(
'id' => 'name',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
'operator' => 'longerthan',
@@ -673,7 +673,7 @@ function testFilterStringEmpty() {
$view->display['default']->handler->overrideOption('filters', array(
'description' => array(
'id' => 'description',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'description',
'relationship' => 'none',
'operator' => 'empty',
@@ -711,7 +711,7 @@ protected function getGroupedExposedFilters() {
$filters = array(
'name' => array(
'id' => 'name',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
'exposed' => TRUE,
@@ -756,7 +756,7 @@ protected function getGroupedExposedFilters() {
),
'description' => array(
'id' => 'description',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'description',
'relationship' => 'none',
'exposed' => TRUE,
diff --git a/lib/Drupal/views/Tests/Handler/SortDateTest.php b/lib/Drupal/views/Tests/Handler/SortDateTest.php
index 1a6e6a7633779c19784ed57b2d00377747b2c6ab..dc2fb6edc51228161b83ae8062d21fcbbf0b960b 100644
--- a/lib/Drupal/views/Tests/Handler/SortDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortDateTest.php
@@ -160,13 +160,13 @@ public function testDateOrdering() {
$view->display['default']->handler->overrideOption('fields', array(
'name' => array(
'id' => 'name',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
),
'created' => array(
'id' => 'created',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'created',
'relationship' => 'none',
),
@@ -176,7 +176,7 @@ public function testDateOrdering() {
$view->display['default']->handler->overrideOption('sorts', array(
'created' => array(
'id' => 'created',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'created',
'relationship' => 'none',
'granularity' => $granularity,
@@ -184,7 +184,7 @@ public function testDateOrdering() {
),
'id' => array(
'id' => 'id',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'id',
'relationship' => 'none',
'order' => 'ASC',
@@ -197,7 +197,7 @@ public function testDateOrdering() {
// Verify the result.
$this->assertEqual(count($this->dataSet()), count($view->result), t('The number of returned rows match.'));
$this->assertIdenticalResultset($view, $this->expectedResultSet($granularity, $reverse), array(
- 'views_test_name' => 'name',
+ 'views_test_data_name' => 'name',
), t('Result is returned correctly when ordering by granularity @granularity, @reverse.', array('@granularity' => $granularity, '@reverse' => $reverse ? t('reverse') : t('forward'))));
$view->destroy();
unset($view);
diff --git a/lib/Drupal/views/Tests/Handler/SortRandomTest.php b/lib/Drupal/views/Tests/Handler/SortRandomTest.php
index 3cf670c32f0b23bf6f28fd95c24d5aed5aed4743..fb3984e20e5dd4166502f0c80099c589992a8190 100644
--- a/lib/Drupal/views/Tests/Handler/SortRandomTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortRandomTest.php
@@ -73,8 +73,8 @@ public function testRandomOrdering() {
// Verify the result.
$this->assertEqual(count($this->dataSet()), 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',
));
// Execute a random view, we expect the result set to be different.
@@ -82,8 +82,8 @@ public function testRandomOrdering() {
$this->executeView($view_random);
$this->assertEqual(count($this->dataSet()), count($view_random->result), t('The number of returned rows match.'));
$this->assertNotIdenticalResultset($view_random, $view->result, array(
- 'views_test_name' => 'views_test_name',
- 'views_test_age' => 'views_test_name',
+ 'views_test_data_name' => 'views_test_data_name',
+ 'views_test_data_age' => 'views_test_data_name',
));
// Execute a second random view, we expect the result set to be different again.
@@ -91,8 +91,8 @@ public function testRandomOrdering() {
$this->executeView($view_random_2);
$this->assertEqual(count($this->dataSet()), count($view_random_2->result), t('The number of returned rows match.'));
$this->assertNotIdenticalResultset($view_random, $view->result, array(
- 'views_test_name' => 'views_test_name',
- 'views_test_age' => 'views_test_name',
+ 'views_test_data_name' => 'views_test_data_name',
+ 'views_test_data_age' => 'views_test_data_name',
));
}
diff --git a/lib/Drupal/views/Tests/Handler/SortTest.php b/lib/Drupal/views/Tests/Handler/SortTest.php
index 5f47a0d55543e06dbe4fce54867a0e4cb5049e75..d30e38b2e7a19da3b5d24d63bff256586e6e98b8 100644
--- a/lib/Drupal/views/Tests/Handler/SortTest.php
+++ b/lib/Drupal/views/Tests/Handler/SortTest.php
@@ -37,7 +37,7 @@ public function testNumericOrdering() {
'age' => array(
'order' => 'ASC',
'id' => 'age',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'age',
'relationship' => 'none',
),
@@ -49,8 +49,8 @@ public function testNumericOrdering() {
// Verify the result.
$this->assertEqual(count($this->dataSet()), count($view->result), t('The number of returned rows match.'));
$this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'age'), array(
- 'views_test_name' => 'name',
- 'views_test_age' => 'age',
+ 'views_test_data_name' => 'name',
+ 'views_test_data_age' => 'age',
));
$view = $this->getView();
@@ -60,7 +60,7 @@ public function testNumericOrdering() {
'age' => array(
'order' => 'DESC',
'id' => 'age',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'age',
'relationship' => 'none',
),
@@ -72,8 +72,8 @@ public function testNumericOrdering() {
// Verify the result.
$this->assertEqual(count($this->dataSet()), count($view->result), t('The number of returned rows match.'));
$this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'age', TRUE), array(
- 'views_test_name' => 'name',
- 'views_test_age' => 'age',
+ 'views_test_data_name' => 'name',
+ 'views_test_data_age' => 'age',
));
}
@@ -88,7 +88,7 @@ public function testStringOrdering() {
'name' => array(
'order' => 'ASC',
'id' => 'name',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
),
@@ -100,8 +100,8 @@ public function testStringOrdering() {
// Verify the result.
$this->assertEqual(count($this->dataSet()), count($view->result), t('The number of returned rows match.'));
$this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'name'), array(
- 'views_test_name' => 'name',
- 'views_test_age' => 'age',
+ 'views_test_data_name' => 'name',
+ 'views_test_data_age' => 'age',
));
$view = $this->getView();
@@ -111,7 +111,7 @@ public function testStringOrdering() {
'name' => array(
'order' => 'DESC',
'id' => 'name',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
),
@@ -123,8 +123,8 @@ public function testStringOrdering() {
// Verify the result.
$this->assertEqual(count($this->dataSet()), count($view->result), t('The number of returned rows match.'));
$this->assertIdenticalResultset($view, $this->orderResultSet($this->dataSet(), 'name', TRUE), array(
- 'views_test_name' => 'name',
- 'views_test_age' => 'age',
+ 'views_test_data_name' => 'name',
+ 'views_test_data_age' => 'age',
));
}
diff --git a/lib/Drupal/views/Tests/Language/ArgumentLanguage.php b/lib/Drupal/views/Tests/Language/ArgumentLanguage.php
index a5abb7b56cdedb4cd0d5e799796113ae769c779b..bc5b75a562e7f17edea995f4683ac0be9fe97fcf 100644
--- a/lib/Drupal/views/Tests/Language/ArgumentLanguage.php
+++ b/lib/Drupal/views/Tests/Language/ArgumentLanguage.php
@@ -30,7 +30,7 @@ public function testFilter() {
$view->display['default']->handler->overrideOption('arguments', array(
'langcode' => array(
'id' => 'langcode',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'langcode',
),
));
@@ -39,7 +39,7 @@ public function testFilter() {
$expected = array(array(
'name' => $name,
));
- $this->assertIdenticalResultset($view, $expected, array('views_test_name' => 'name'));
+ $this->assertIdenticalResultset($view, $expected, array('views_test_data_name' => 'name'));
$view->destroy();
}
}
diff --git a/lib/Drupal/views/Tests/Language/FieldLanguage.php b/lib/Drupal/views/Tests/Language/FieldLanguage.php
index 52f862419e9d04b9fcf61c13369545d4dc2cc5f3..d530cf5384764cd3e98422a0a31bcb21cb2b2ebd 100644
--- a/lib/Drupal/views/Tests/Language/FieldLanguage.php
+++ b/lib/Drupal/views/Tests/Language/FieldLanguage.php
@@ -29,7 +29,7 @@ public function testField() {
$view->display['default']->handler->overrideOption('fields', array(
'langcode' => array(
'id' => 'langcode',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'langcode',
),
));
diff --git a/lib/Drupal/views/Tests/Language/FilterLanguage.php b/lib/Drupal/views/Tests/Language/FilterLanguage.php
index f019ffec932dfbdd9463d18fc56274c63075673e..f9fb360b1026976a9bd4da7a6b82f3e07fd424ff 100644
--- a/lib/Drupal/views/Tests/Language/FilterLanguage.php
+++ b/lib/Drupal/views/Tests/Language/FilterLanguage.php
@@ -30,7 +30,7 @@ public function testFilter() {
$view->display['default']->handler->overrideOption('filters', array(
'langcode' => array(
'id' => 'langcode',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'langcode',
'value' => array($langcode),
),
@@ -40,7 +40,7 @@ public function testFilter() {
$expected = array(array(
'name' => $name,
));
- $this->assertIdenticalResultset($view, $expected, array('views_test_name' => 'name'));
+ $this->assertIdenticalResultset($view, $expected, array('views_test_data_name' => 'name'));
$view->destroy();
}
}
diff --git a/lib/Drupal/views/Tests/Language/LanguageTestBase.php b/lib/Drupal/views/Tests/Language/LanguageTestBase.php
index a6e5294f0d58f8a83227542e4b8ae5d3d5fa1115..5cd0bfdfd61b5e70d1116d2b9e344ec0ae1726c8 100644
--- a/lib/Drupal/views/Tests/Language/LanguageTestBase.php
+++ b/lib/Drupal/views/Tests/Language/LanguageTestBase.php
@@ -35,7 +35,7 @@ protected function setUp() {
protected function schemaDefinition() {
$schema = parent::schemaDefinition();
- $schema['views_test']['fields']['langcode'] = array(
+ $schema['views_test_data']['fields']['langcode'] = array(
'description' => 'The {language}.langcode of this beatle.',
'type' => 'varchar',
'length' => 12,
@@ -47,7 +47,7 @@ protected function schemaDefinition() {
protected function viewsData() {
$data = parent::viewsData();
- $data['views_test']['langcode'] = array(
+ $data['views_test_data']['langcode'] = array(
'title' => t('Langcode'),
'help' => t('Langcode'),
'field' => array(
diff --git a/lib/Drupal/views/Tests/ModuleTest.php b/lib/Drupal/views/Tests/ModuleTest.php
index 42b368b157490c8f95fe6871ee1b95db86f073f1..80047abb9fda14032b8ff9f3ca26f4cca1d33d5f 100644
--- a/lib/Drupal/views/Tests/ModuleTest.php
+++ b/lib/Drupal/views/Tests/ModuleTest.php
@@ -29,13 +29,13 @@ public function setUp() {
public function viewsData() {
$data = parent::viewsData();
- $data['views_test_previous'] = array();
- $data['views_test_previous']['id']['field']['moved to'] = array('views_test', 'id');
- $data['views_test_previous']['id']['filter']['moved to'] = array('views_test', 'id');
- $data['views_test']['age_previous']['field']['moved to'] = array('views_test', 'age');
- $data['views_test']['age_previous']['sort']['moved to'] = array('views_test', 'age');
- $data['views_test_previous']['name_previous']['field']['moved to'] = array('views_test', 'name');
- $data['views_test_previous']['name_previous']['argument']['moved to'] = array('views_test', 'name');
+ $data['views_test_data_previous'] = array();
+ $data['views_test_data_previous']['id']['field']['moved to'] = array('views_test_data', 'id');
+ $data['views_test_data_previous']['id']['filter']['moved to'] = array('views_test_data', 'id');
+ $data['views_test_data']['age_previous']['field']['moved to'] = array('views_test_data', 'age');
+ $data['views_test_data']['age_previous']['sort']['moved to'] = array('views_test_data', 'age');
+ $data['views_test_data_previous']['name_previous']['field']['moved to'] = array('views_test_data', 'name');
+ $data['views_test_data_previous']['name_previous']['argument']['moved to'] = array('views_test_data', 'name');
return $data;
}
@@ -114,7 +114,7 @@ function testviews_get_handler() {
}
$views_data = $this->viewsData();
- $test_tables = array('views_test' => array('id', 'name'));
+ $test_tables = array('views_test_data' => array('id', 'name'));
foreach ($test_tables as $table => $fields) {
foreach ($fields as $field) {
$data = $views_data[$table][$field];
@@ -130,25 +130,25 @@ function testviews_get_handler() {
// Test the automatic conversion feature.
// Test the automatic table renaming.
- $handler = views_get_handler('views_test_previous', 'id', 'field');
- $this->assertInstanceHandler($handler, 'views_test', 'id', 'field');
- $handler = views_get_handler('views_test_previous', 'id', 'filter');
- $this->assertInstanceHandler($handler, 'views_test', 'id', 'filter');
+ $handler = views_get_handler('views_test_data_previous', 'id', 'field');
+ $this->assertInstanceHandler($handler, 'views_test_data', 'id', 'field');
+ $handler = views_get_handler('views_test_data_previous', 'id', 'filter');
+ $this->assertInstanceHandler($handler, 'views_test_data', 'id', 'filter');
// Test the automatic field renaming.
- $handler = views_get_handler('views_test', 'age_previous', 'field');
- $this->assertInstanceHandler($handler, 'views_test', 'age', 'field');
- $handler = views_get_handler('views_test', 'age_previous', 'sort');
- $this->assertInstanceHandler($handler, 'views_test', 'age', 'sort');
+ $handler = views_get_handler('views_test_data', 'age_previous', 'field');
+ $this->assertInstanceHandler($handler, 'views_test_data', 'age', 'field');
+ $handler = views_get_handler('views_test_data', 'age_previous', 'sort');
+ $this->assertInstanceHandler($handler, 'views_test_data', 'age', 'sort');
// Test the automatic table and field renaming.
- $handler = views_get_handler('views_test_previous', 'name_previous', 'field');
- $this->assertInstanceHandler($handler, 'views_test', 'name', 'field');
- $handler = views_get_handler('views_test_previous', 'name_previous', 'argument');
- $this->assertInstanceHandler($handler, 'views_test', 'name', 'argument');
+ $handler = views_get_handler('views_test_data_previous', 'name_previous', 'field');
+ $this->assertInstanceHandler($handler, 'views_test_data', 'name', 'field');
+ $handler = views_get_handler('views_test_data_previous', 'name_previous', 'argument');
+ $this->assertInstanceHandler($handler, 'views_test_data', 'name', 'argument');
// Test the override handler feature.
- $handler = views_get_handler('views_test', 'job', 'filter', 'string');
+ $handler = views_get_handler('views_test_data', 'job', 'filter', 'string');
$this->assertEqual('Drupal\\views\\Plugin\\views\\filter\\String', get_class($handler));
}
diff --git a/lib/Drupal/views/Tests/Plugin/AccessTest.php b/lib/Drupal/views/Tests/Plugin/AccessTest.php
index 226f8f25c8c603118becec5680720437e1d58c31..b4f3761fd2192b3fb52dd3f47d2743f6294fee26 100644
--- a/lib/Drupal/views/Tests/Plugin/AccessTest.php
+++ b/lib/Drupal/views/Tests/Plugin/AccessTest.php
@@ -30,7 +30,7 @@ protected function setUp() {
$this->web_role = current($this->web_user->roles);
$this->normal_role = $this->drupalCreateRole(array());
- $this->normal_user = $this->drupalCreateUser(array('views_test test permission'));
+ $this->normal_user = $this->drupalCreateUser(array('views_test_data test permission'));
$this->normal_user->roles[$this->normal_role] = $this->normal_role;
// @todo when all the plugin information is cached make a reset function and
// call it here.
diff --git a/lib/Drupal/views/Tests/Plugin/CacheTest.php b/lib/Drupal/views/Tests/Plugin/CacheTest.php
index 0c5a29cabcc7d9f01b08735573327d508005a97d..a16c3e02ea60f18dbedbdd8a34139c64ffa317af 100644
--- a/lib/Drupal/views/Tests/Plugin/CacheTest.php
+++ b/lib/Drupal/views/Tests/Plugin/CacheTest.php
@@ -31,7 +31,7 @@ protected function setUp() {
}
/**
- * Build and return a basic view of the views_test table.
+ * Build and return a basic view of the views_test_data table.
*
* @return Drupal\views\View
*/
@@ -40,26 +40,26 @@ protected function getBasicView() {
$view = new View(array(), 'view');
$view->name = 'test_view';
$view->addDisplay('default');
- $view->base_table = 'views_test';
+ $view->base_table = 'views_test_data';
// Set up the fields we need.
$display = $view->newDisplay('default', 'Master', 'default');
$display->overrideOption('fields', array(
'id' => array(
'id' => 'id',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'id',
'relationship' => 'none',
),
'name' => array(
'id' => 'name',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
),
'age' => array(
'id' => 'age',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'age',
'relationship' => 'none',
),
@@ -70,7 +70,7 @@ protected function getBasicView() {
'id' => array(
'order' => 'ASC',
'id' => 'id',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'id',
'relationship' => 'none',
),
@@ -103,7 +103,7 @@ function testTimeCaching() {
'age' => 29,
'job' => 'Banjo',
);
- drupal_write_record('views_test', $record);
+ drupal_write_record('views_test_data', $record);
// The Result should be the same as before, because of the caching.
$view = $this->getView();
@@ -141,7 +141,7 @@ function testNoneCaching() {
'job' => 'Banjo',
);
- drupal_write_record('views_test', $record);
+ drupal_write_record('views_test_data', $record);
// The Result changes, because the view is not cached.
$view = $this->getView();
@@ -159,7 +159,7 @@ function testNoneCaching() {
*/
function testHeaderStorage() {
// Create a view with output caching enabled.
- // Some hook_views_pre_render in views_test.module adds the test css/js file.
+ // Some hook_views_pre_render in views_test_data.module adds the test css/js file.
// so they should be added to the css/js storage.
$view = $this->getView();
$view->name = 'test_cache_header_storage';
@@ -177,8 +177,8 @@ function testHeaderStorage() {
$view->initDisplay();
$view->preview();
$css = drupal_add_css();
- $css_path = drupal_get_path('module', 'views_test') . '/views_cache.test.css';
- $js_path = drupal_get_path('module', 'views_test') . '/views_cache.test.js';
+ $css_path = drupal_get_path('module', 'views_test_data') . '/views_cache.test.css';
+ $js_path = drupal_get_path('module', 'views_test_data') . '/views_cache.test.js';
$js = drupal_add_js();
$this->assertTrue(isset($css[$css_path]), 'Make sure the css is added for cached views.');
diff --git a/lib/Drupal/views/Tests/Plugin/FilterTest.php b/lib/Drupal/views/Tests/Plugin/FilterTest.php
index 08ed20f8f59f16c8a2e8d95c0a5842a9ce82542b..ae30e8e524a6e5338a75f6b55124f7e13102d932 100644
--- a/lib/Drupal/views/Tests/Plugin/FilterTest.php
+++ b/lib/Drupal/views/Tests/Plugin/FilterTest.php
@@ -42,7 +42,7 @@ protected function setUp() {
*/
protected function viewsData() {
$data = parent::viewsData();
- $data['views_test']['name']['filter']['id'] = 'test_filter';
+ $data['views_test_data']['name']['filter']['id'] = 'test_filter';
return $data;
}
@@ -62,7 +62,7 @@ public function testFilterQuery() {
$view->display['default']->handler->overrideOption('filters', array(
'test_filter' => array(
'id' => 'test_filter',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'name',
'operator' => '=',
'value' => 'John',
@@ -77,7 +77,7 @@ public function testFilterQuery() {
// Check the data added.
$where = $view->query->where;
- $this->assertIdentical($where[0]['conditions'][0]['field'], 'views_test.name', 'Where condition field matches');
+ $this->assertIdentical($where[0]['conditions'][0]['field'], 'views_test_data.name', 'Where condition field matches');
$this->assertIdentical($where[0]['conditions'][0]['value'], 'John', 'Where condition value matches');
$this->assertIdentical($where[0]['conditions'][0]['operator'], '=', 'Where condition operator matches');
@@ -98,7 +98,7 @@ public function testFilterQuery() {
$view->display['default']->handler->overrideOption('filters', array(
'test_filter' => array(
'id' => 'test_filter',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'name',
'operator' => '<>',
'value' => 'John',
@@ -124,7 +124,7 @@ public function testFilterQuery() {
$view->display['default']->handler->overrideOption('filters', array(
'test_filter' => array(
'id' => 'test_filter',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'name',
'operator' => '<>',
'value' => 'John',
diff --git a/lib/Drupal/views/Tests/Plugin/StyleTest.php b/lib/Drupal/views/Tests/Plugin/StyleTest.php
index 8e1365072a7da77ba04841502bf001406947ca73..efada1d093a4544e2f53e7e8cec5e95660a4b443 100644
--- a/lib/Drupal/views/Tests/Plugin/StyleTest.php
+++ b/lib/Drupal/views/Tests/Plugin/StyleTest.php
@@ -43,13 +43,13 @@ function testGroupingLegacy() {
$view->display['default']->handler->overrideOption('fields', array(
'name' => array(
'id' => 'name',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
),
'job' => array(
'id' => 'job',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'job',
'relationship' => 'none',
),
@@ -65,18 +65,18 @@ function testGroupingLegacy() {
// Use Job: as label, so be sure that the label is used for groupby as well.
$expected['Job: Singer'] = array();
$expected['Job: Singer'][0] = new stdClass();
- $expected['Job: Singer'][0]->views_test_name = 'John';
- $expected['Job: Singer'][0]->views_test_job = 'Singer';
- $expected['Job: Singer'][0]->views_test_id = '1';
+ $expected['Job: Singer'][0]->views_test_data_name = 'John';
+ $expected['Job: Singer'][0]->views_test_data_job = 'Singer';
+ $expected['Job: Singer'][0]->views_test_data_id = '1';
$expected['Job: Singer'][1] = new stdClass();
- $expected['Job: Singer'][1]->views_test_name = 'George';
- $expected['Job: Singer'][1]->views_test_job = 'Singer';
- $expected['Job: Singer'][1]->views_test_id = '2';
+ $expected['Job: Singer'][1]->views_test_data_name = 'George';
+ $expected['Job: Singer'][1]->views_test_data_job = 'Singer';
+ $expected['Job: Singer'][1]->views_test_data_id = '2';
$expected['Job: Drummer'] = array();
$expected['Job: Drummer'][2] = new stdClass();
- $expected['Job: Drummer'][2]->views_test_name = 'Ringo';
- $expected['Job: Drummer'][2]->views_test_job = 'Drummer';
- $expected['Job: Drummer'][2]->views_test_id = '3';
+ $expected['Job: Drummer'][2]->views_test_data_name = 'Ringo';
+ $expected['Job: Drummer'][2]->views_test_data_job = 'Drummer';
+ $expected['Job: Drummer'][2]->views_test_data_id = '3';
$this->assertEqual($sets, $expected, t('The style plugin should proper group the results with grouping by the rendered output.'));
@@ -84,19 +84,19 @@ function testGroupingLegacy() {
$expected['Job: Singer'] = array();
$expected['Job: Singer']['group'] = 'Job: Singer';
$expected['Job: Singer']['rows'][0] = new stdClass();
- $expected['Job: Singer']['rows'][0]->views_test_name = 'John';
- $expected['Job: Singer']['rows'][0]->views_test_job = 'Singer';
- $expected['Job: Singer']['rows'][0]->views_test_id = '1';
+ $expected['Job: Singer']['rows'][0]->views_test_data_name = 'John';
+ $expected['Job: Singer']['rows'][0]->views_test_data_job = 'Singer';
+ $expected['Job: Singer']['rows'][0]->views_test_data_id = '1';
$expected['Job: Singer']['rows'][1] = new stdClass();
- $expected['Job: Singer']['rows'][1]->views_test_name = 'George';
- $expected['Job: Singer']['rows'][1]->views_test_job = 'Singer';
- $expected['Job: Singer']['rows'][1]->views_test_id = '2';
+ $expected['Job: Singer']['rows'][1]->views_test_data_name = 'George';
+ $expected['Job: Singer']['rows'][1]->views_test_data_job = 'Singer';
+ $expected['Job: Singer']['rows'][1]->views_test_data_id = '2';
$expected['Job: Drummer'] = array();
$expected['Job: Drummer']['group'] = 'Job: Drummer';
$expected['Job: Drummer']['rows'][2] = new stdClass();
- $expected['Job: Drummer']['rows'][2]->views_test_name = 'Ringo';
- $expected['Job: Drummer']['rows'][2]->views_test_job = 'Drummer';
- $expected['Job: Drummer']['rows'][2]->views_test_id = '3';
+ $expected['Job: Drummer']['rows'][2]->views_test_data_name = 'Ringo';
+ $expected['Job: Drummer']['rows'][2]->views_test_data_job = 'Drummer';
+ $expected['Job: Drummer']['rows'][2]->views_test_data_id = '3';
// The newer api passes the value of the grouping as well.
$sets_new_rendered = $view->style_plugin->render_grouping($view->result, $view->style_plugin->options['grouping'], TRUE);
@@ -142,19 +142,19 @@ function _testGrouping($stripped = FALSE) {
$view->display['default']->handler->overrideOption('fields', array(
'name' => array(
'id' => 'name',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'name',
'relationship' => 'none',
),
'job' => array(
'id' => 'job',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'job',
'relationship' => 'none',
),
'age' => array(
'id' => 'age',
- 'table' => 'views_test',
+ 'table' => 'views_test_data',
'field' => 'age',
'relationship' => 'none',
),
@@ -169,26 +169,26 @@ function _testGrouping($stripped = FALSE) {
$expected['Job: Singer']['rows']['Age: 25'] = array();
$expected['Job: Singer']['rows']['Age: 25']['group'] = 'Age: 25';
$expected['Job: Singer']['rows']['Age: 25']['rows'][0] = new stdClass();
- $expected['Job: Singer']['rows']['Age: 25']['rows'][0]->views_test_name = 'John';
- $expected['Job: Singer']['rows']['Age: 25']['rows'][0]->views_test_job = 'Singer';
- $expected['Job: Singer']['rows']['Age: 25']['rows'][0]->views_test_age = '25';
- $expected['Job: Singer']['rows']['Age: 25']['rows'][0]->views_test_id = '1';
+ $expected['Job: Singer']['rows']['Age: 25']['rows'][0]->views_test_data_name = 'John';
+ $expected['Job: Singer']['rows']['Age: 25']['rows'][0]->views_test_data_job = 'Singer';
+ $expected['Job: Singer']['rows']['Age: 25']['rows'][0]->views_test_data_age = '25';
+ $expected['Job: Singer']['rows']['Age: 25']['rows'][0]->views_test_data_id = '1';
$expected['Job: Singer']['rows']['Age: 27'] = array();
$expected['Job: Singer']['rows']['Age: 27']['group'] = 'Age: 27';
$expected['Job: Singer']['rows']['Age: 27']['rows'][1] = new stdClass();
- $expected['Job: Singer']['rows']['Age: 27']['rows'][1]->views_test_name = 'George';
- $expected['Job: Singer']['rows']['Age: 27']['rows'][1]->views_test_job = 'Singer';
- $expected['Job: Singer']['rows']['Age: 27']['rows'][1]->views_test_age = '27';
- $expected['Job: Singer']['rows']['Age: 27']['rows'][1]->views_test_id = '2';
+ $expected['Job: Singer']['rows']['Age: 27']['rows'][1]->views_test_data_name = 'George';
+ $expected['Job: Singer']['rows']['Age: 27']['rows'][1]->views_test_data_job = 'Singer';
+ $expected['Job: Singer']['rows']['Age: 27']['rows'][1]->views_test_data_age = '27';
+ $expected['Job: Singer']['rows']['Age: 27']['rows'][1]->views_test_data_id = '2';
$expected['Job: Drummer'] = array();
$expected['Job: Drummer']['group'] = 'Job: Drummer';
$expected['Job: Drummer']['rows']['Age: 28'] = array();
$expected['Job: Drummer']['rows']['Age: 28']['group'] = 'Age: 28';
$expected['Job: Drummer']['rows']['Age: 28']['rows'][2] = new stdClass();
- $expected['Job: Drummer']['rows']['Age: 28']['rows'][2]->views_test_name = 'Ringo';
- $expected['Job: Drummer']['rows']['Age: 28']['rows'][2]->views_test_job = 'Drummer';
- $expected['Job: Drummer']['rows']['Age: 28']['rows'][2]->views_test_age = '28';
- $expected['Job: Drummer']['rows']['Age: 28']['rows'][2]->views_test_id = '3';
+ $expected['Job: Drummer']['rows']['Age: 28']['rows'][2]->views_test_data_name = 'Ringo';
+ $expected['Job: Drummer']['rows']['Age: 28']['rows'][2]->views_test_data_job = 'Drummer';
+ $expected['Job: Drummer']['rows']['Age: 28']['rows'][2]->views_test_data_age = '28';
+ $expected['Job: Drummer']['rows']['Age: 28']['rows'][2]->views_test_data_id = '3';
// Alter the results to support the stripped case.
@@ -196,15 +196,15 @@ function _testGrouping($stripped = FALSE) {
// Add some html to the result and expected value.
$rand = '<a data="' . $this->randomName() . '" />';
- $view->result[0]->views_test_job .= $rand;
- $expected['Job: Singer']['rows']['Age: 25']['rows'][0]->views_test_job = 'Singer' . $rand;
+ $view->result[0]->views_test_data_job .= $rand;
+ $expected['Job: Singer']['rows']['Age: 25']['rows'][0]->views_test_data_job = 'Singer' . $rand;
$expected['Job: Singer']['group'] = 'Job: Singer';
$rand = '<a data="' . $this->randomName() . '" />';
- $view->result[1]->views_test_job .= $rand;
- $expected['Job: Singer']['rows']['Age: 27']['rows'][1]->views_test_job = 'Singer' . $rand;
+ $view->result[1]->views_test_data_job .= $rand;
+ $expected['Job: Singer']['rows']['Age: 27']['rows'][1]->views_test_data_job = 'Singer' . $rand;
$rand = '<a data="' . $this->randomName() . '" />';
- $view->result[2]->views_test_job .= $rand;
- $expected['Job: Drummer']['rows']['Age: 28']['rows'][2]->views_test_job = 'Drummer' . $rand;
+ $view->result[2]->views_test_data_job .= $rand;
+ $expected['Job: Drummer']['rows']['Age: 28']['rows'][2]->views_test_data_job = 'Drummer' . $rand;
$expected['Job: Drummer']['group'] = 'Job: Drummer';
$view->style_plugin->options['grouping'][0] = array('field' => 'job', 'rendered' => TRUE, 'rendered_strip' => TRUE);
diff --git a/lib/Drupal/views/Tests/UpgradeTestCase.php b/lib/Drupal/views/Tests/UpgradeTestCase.php
index 3316358645a8e68d659b64ac2c4d15a097ae6871..8f11b09008d8d786c1b4cf2a581bb61fbec5a1f9 100644
--- a/lib/Drupal/views/Tests/UpgradeTestCase.php
+++ b/lib/Drupal/views/Tests/UpgradeTestCase.php
@@ -40,14 +40,14 @@ protected function setUp() {
function viewsData() {
$data = parent::viewsData();
- $data['views_test']['old_field_1']['moved to'] = array('views_test', 'id');
- $data['views_test']['old_field_2']['field']['moved to'] = array('views_test', 'name');
- $data['views_test']['old_field_3']['filter']['moved to'] = array('views_test', 'age');
+ $data['views_test_data']['old_field_1']['moved to'] = array('views_test_data', 'id');
+ $data['views_test_data']['old_field_2']['field']['moved to'] = array('views_test_data', 'name');
+ $data['views_test_data']['old_field_3']['filter']['moved to'] = array('views_test_data', 'age');
// @todo Test this scenario, too.
- $data['views_old_table_2']['old_field']['moved to'] = array('views_test', 'job');
+ $data['views_old_table_2']['old_field']['moved to'] = array('views_test_data', 'job');
- $data['views_old_table']['moved to'] = 'views_test';
+ $data['views_old_table']['moved to'] = 'views_test_data';
return $data;
}
@@ -73,7 +73,7 @@ public function testMovedTo() {
// $this->assertEqual('old_field_1', $view->field['old_field_1']->options['id'], "Id shouldn't change during conversion");
// $this->assertEqual('id', $view->field['old_field_1']->field, 'The field should change during conversion');
$this->assertEqual('id', $view->field['old_field_1']->realField);
- $this->assertEqual('views_test', $view->field['old_field_1']->table);
+ $this->assertEqual('views_test_data', $view->field['old_field_1']->table);
$this->assertEqual('old_field_1', $view->field['old_field_1']->original_field, 'The field should have stored the original_field');
// Test moving on handler lavel.
@@ -83,21 +83,21 @@ public function testMovedTo() {
// $this->assertEqual('old_field_2', $view->field['old_field_2']->options['id']);
$this->assertEqual('name', $view->field['old_field_2']->realField);
- $this->assertEqual('views_test', $view->field['old_field_2']->table);
+ $this->assertEqual('views_test_data', $view->field['old_field_2']->table);
// $this->assertEqual('old_field_3', $view->filter['old_field_3']->options['id']);
$this->assertEqual('age', $view->filter['old_field_3']->realField);
- $this->assertEqual('views_test', $view->filter['old_field_3']->table);
+ $this->assertEqual('views_test_data', $view->filter['old_field_3']->table);
// Test moving on table level.
$view = $this->createViewFromConfig('test_views_move_to_table');
$view->update();
$view->build();
- $this->assertEqual('views_test', $view->base_table, 'Make sure that view->base_table gets automatically converted.');
+ $this->assertEqual('views_test_data', $view->base_table, 'Make sure that view->base_table gets automatically converted.');
// $this->assertEqual('id', $view->field['id']->field, 'If we move a whole table fields of this table should work, too.');
$this->assertEqual('id', $view->field['id']->realField, 'To run the query right the realField has to be set right.');
- $this->assertEqual('views_test', $view->field['id']->table);
+ $this->assertEqual('views_test_data', $view->field['id']->table);
}
/**
diff --git a/lib/Drupal/views/Tests/ViewTestBase.php b/lib/Drupal/views/Tests/ViewTestBase.php
index 074e67c893f92f10ce9a7054fea7df740b837451..fd4e80460add806bfe769e21387c52e7505f8fbf 100644
--- a/lib/Drupal/views/Tests/ViewTestBase.php
+++ b/lib/Drupal/views/Tests/ViewTestBase.php
@@ -39,22 +39,22 @@ protected function setUp() {
/**
- * Sets up the views_test.module.
+ * Sets up the views_test_data.module.
*
- * Because the schema of views_test.module is dependent on the test using it,
+ * 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.
- variable_set('views_test_schema', $this->schemaDefinition());
- variable_set('views_test_views_data', $this->viewsData());
+ variable_set('views_test_data_schema', $this->schemaDefinition());
+ variable_set('views_test_data_views_data', $this->viewsData());
module_enable(array('views_test_data'));
$this->resetAll();
// Load the test dataset.
$data_set = $this->dataSet();
- $query = db_insert('views_test')
+ $query = db_insert('views_test_data')
->fields(array_keys($data_set[0]));
foreach ($data_set as $record) {
$query->values($record);
@@ -180,7 +180,7 @@ protected function executeView($view, $args = array()) {
}
/**
- * Build and return a Page view of the views_test table.
+ * Build and return a Page view of the views_test_data table.
*
* @return view
*/
@@ -199,7 +199,7 @@ protected function getBasicPageView() {
* The schema definition.
*/
protected function schemaDefinition() {
- $schema['views_test'] = array(
+ $schema['views_test_data'] = array(
'description' => 'Basic test table for Views tests.',
'fields' => array(
'id' => array(
@@ -251,17 +251,17 @@ protected function schemaDefinition() {
*/
protected function viewsData() {
// Declaration of the base table.
- $data['views_test']['table'] = array(
+ $data['views_test_data']['table'] = array(
'group' => t('Views test'),
'base' => array(
'field' => 'id',
- 'title' => t('Views test'),
+ 'title' => t('Views test data'),
'help' => t('Users who have created accounts on your site.'),
),
);
// Declaration of fields.
- $data['views_test']['id'] = array(
+ $data['views_test_data']['id'] = array(
'title' => t('ID'),
'help' => t('The test data ID'),
'field' => array(
@@ -278,7 +278,7 @@ protected function viewsData() {
'id' => 'standard',
),
);
- $data['views_test']['name'] = array(
+ $data['views_test_data']['name'] = array(
'title' => t('Name'),
'help' => t('The name of the person'),
'field' => array(
@@ -295,7 +295,7 @@ protected function viewsData() {
'id' => 'standard',
),
);
- $data['views_test']['age'] = array(
+ $data['views_test_data']['age'] = array(
'title' => t('Age'),
'help' => t('The age of the person'),
'field' => array(
@@ -312,7 +312,7 @@ protected function viewsData() {
'id' => 'standard',
),
);
- $data['views_test']['job'] = array(
+ $data['views_test_data']['job'] = array(
'title' => t('Job'),
'help' => t('The job of the person'),
'field' => array(
@@ -329,7 +329,7 @@ protected function viewsData() {
'id' => 'standard',
),
);
- $data['views_test']['created'] = array(
+ $data['views_test_data']['created'] = array(
'title' => t('Created'),
'help' => t('The creation date of this record'),
'field' => array(
@@ -388,7 +388,7 @@ protected function dataSet() {
}
/**
- * Build and return a basic view of the views_test table.
+ * Build and return a basic view of the views_test_data table.
*
* @return Drupal\views\View
*/
diff --git a/tests/views_test_config/config/views.view.test_access_perm.yml b/tests/views_test_config/config/views.view.test_access_perm.yml
index acb93c98d9dd28f2daf9191a950c6175afac8dac..09064e27d5daad9fd2536ebb46793d49a6551f16 100644
--- a/tests/views_test_config/config/views.view.test_access_perm.yml
+++ b/tests/views_test_config/config/views.view.test_access_perm.yml
@@ -7,7 +7,7 @@ display:
default:
display_options:
access:
- perm: 'views_test test permission'
+ perm: 'views_test_data test permission'
type: perm
cache:
type: none
diff --git a/tests/views_test_config/config/views.view.test_field_tokens.yml b/tests/views_test_config/config/views.view.test_field_tokens.yml
index a1470b058ba2adb51910bd6446196953d77277e0..62f37e06037ab8f21ec159d644e5a9d9e20f26de 100644
--- a/tests/views_test_config/config/views.view.test_field_tokens.yml
+++ b/tests/views_test_config/config/views.view.test_field_tokens.yml
@@ -1,5 +1,5 @@
api_version: '3.0'
-base_table: views_test
+base_table: views_test_data
core: '8'
description: ''
disabled: '0'
@@ -21,19 +21,19 @@ display:
fields:
name:
id: name
- table: views_test
+ table: views_test_data
field: name
name_1:
id: name_1
- table: views_test
+ table: views_test_data
field: name
name_2:
id: name_2
- table: views_test
+ table: views_test_data
field: name
job:
id: job
- table: views_test
+ table: views_test_data
field: job
display_plugin: default
display_title: Defaults
diff --git a/tests/views_test_config/config/views.view.test_view.yml b/tests/views_test_config/config/views.view.test_view.yml
index 81035cfde8e1114ebe21605421c95b84b2770aa5..57dd103698cb826fe0aea195a1fb6b225f3717df 100644
--- a/tests/views_test_config/config/views.view.test_view.yml
+++ b/tests/views_test_config/config/views.view.test_view.yml
@@ -1,5 +1,5 @@
api_version: '3.0'
-base_table: views_test
+base_table: views_test_data
core: '8'
description: ''
disabled: '0'
@@ -16,17 +16,17 @@ display:
field: age
id: age
relationship: none
- table: views_test
+ table: views_test_data
id:
field: id
id: id
relationship: none
- table: views_test
+ table: views_test_data
name:
field: name
id: name
relationship: none
- table: views_test
+ table: views_test_data
pager:
options:
offset: '0'
@@ -38,7 +38,7 @@ display:
id: id
order: ASC
relationship: none
- table: views_test
+ table: views_test_data
display_plugin: default
display_title: Master
id: default
diff --git a/tests/views_test_config/config/views.view.test_views_move_to_field.yml b/tests/views_test_config/config/views.view.test_views_move_to_field.yml
index a84e0159841651030307f25977ffda5530fd5cc7..22642b54b85fcf76e793f43e38b496b0979a2cd6 100644
--- a/tests/views_test_config/config/views.view.test_views_move_to_field.yml
+++ b/tests/views_test_config/config/views.view.test_views_move_to_field.yml
@@ -1,5 +1,5 @@
api_version: '3.0'
-base_table: views_test
+base_table: views_test_data
core: '8'
description: ''
disabled: '0'
@@ -10,7 +10,7 @@ display:
old_field_1:
field: old_field_1
id: old_field_1
- table: views_test
+ table: views_test_data
display_plugin: default
display_title: Master
id: default
diff --git a/tests/views_test_config/config/views.view.test_views_move_to_handler.yml b/tests/views_test_config/config/views.view.test_views_move_to_handler.yml
index a7d0e76d94fcf27eeb73fb4e616fe15e5d93cc88..d66c95dd840d56788545dc24cb9f5cdddf93f099 100644
--- a/tests/views_test_config/config/views.view.test_views_move_to_handler.yml
+++ b/tests/views_test_config/config/views.view.test_views_move_to_handler.yml
@@ -1,5 +1,5 @@
api_version: '3.0'
-base_table: views_test
+base_table: views_test_data
core: '8'
description: ''
disabled: '0'
@@ -10,12 +10,12 @@ display:
old_field_2:
field: old_field_2
id: old_field_2
- table: views_test
+ table: views_test_data
filters:
old_field_3:
field: old_field_3
id: old_field_3
- table: views_test
+ table: views_test_data
display_plugin: default
display_title: Master
id: default
diff --git a/tests/views_test_data/config/views.view.test_click_sort.yml b/tests/views_test_data/config/views.view.test_click_sort.yml
index 05bcc2c9cfeea17d1816cb3e5ab5efde008fa536..0a8ff5c5f30e593f0a5644e8d140ea73a3960fb2 100644
--- a/tests/views_test_data/config/views.view.test_click_sort.yml
+++ b/tests/views_test_data/config/views.view.test_click_sort.yml
@@ -1,5 +1,5 @@
api_version: '3.0'
-base_table: views_test
+base_table: views_test_data
core: '8'
description: ''
disabled: '0'
@@ -9,15 +9,15 @@ display:
fields:
id:
id: id
- table: views_test
+ table: views_test_data
field: id
name:
id: name
- table: views_test
+ table: views_test_data
field: name
created:
id: created
- table: views_test
+ table: views_test_data
field: created
display_options:
access:
diff --git a/tests/views_test_data/config/views.view.test_field_classes.yml b/tests/views_test_data/config/views.view.test_field_classes.yml
index 4eb3931e62755d73d48d5c9ceac285872511d488..e65f920e93e0a215e9213e768f7be6c84e6cc38f 100644
--- a/tests/views_test_data/config/views.view.test_field_classes.yml
+++ b/tests/views_test_data/config/views.view.test_field_classes.yml
@@ -1,5 +1,5 @@
api_version: '3.0'
-base_table: views_test
+base_table: views_test_data
core: '8'
description: ''
disabled: '0'
@@ -13,7 +13,7 @@ display:
fields:
id:
id: id
- table: views_test
+ table: views_test_data
field: id
style_plugin: html_list
display_plugin: default
diff --git a/tests/views_test_data/config/views.view.test_field_output.yml b/tests/views_test_data/config/views.view.test_field_output.yml
index e7539d4b5973a178342c26fccbf2df780bb3e96a..f52d30f630bbf86f382eba2881412e64813392ea 100644
--- a/tests/views_test_data/config/views.view.test_field_output.yml
+++ b/tests/views_test_data/config/views.view.test_field_output.yml
@@ -1,5 +1,5 @@
api_version: '3.0'
-base_table: views_test
+base_table: views_test_data
core: '8'
description: ''
disabled: '0'
@@ -13,7 +13,7 @@ display:
fields:
name:
id: name
- table: views_test
+ table: views_test_data
field: name
style_plugin: html_list
display_plugin: default
diff --git a/tests/views_test_data/config/views.view.test_filter.yml b/tests/views_test_data/config/views.view.test_filter.yml
index 553a496d3a8d1d01b385f62ee26d0f002ff32313..99d0dad48c9e0f7723c8a4dee881f56edf2687fe 100644
--- a/tests/views_test_data/config/views.view.test_filter.yml
+++ b/tests/views_test_data/config/views.view.test_filter.yml
@@ -1,5 +1,5 @@
api_version: '3.0'
-base_table: views_test
+base_table: views_test_data
core: 8
disabled: false
display:
@@ -19,12 +19,12 @@ display:
field: name
id: name
label: ''
- table: views_test
+ table: views_test_data
filters:
type:
field: name
id: test_filter
- table: views_test
+ table: views_test_data
query:
type: views_query
row_plugin: fields
diff --git a/tests/views_test_data/config/views.view.test_style_mapping.yml b/tests/views_test_data/config/views.view.test_style_mapping.yml
index 7e22e58f91e74553f59914e80f678ff090b91bd4..62763cb3f4a2b6ff2387e4a303f77f68ec17ee22 100644
--- a/tests/views_test_data/config/views.view.test_style_mapping.yml
+++ b/tests/views_test_data/config/views.view.test_style_mapping.yml
@@ -1,5 +1,5 @@
api_version: '3.0'
-base_table: views_test
+base_table: views_test_data
core: '8'
description: ''
disabled: '0'
@@ -16,17 +16,17 @@ display:
field: age
id: age
relationship: none
- table: views_test
+ table: views_test_data
job:
field: job
id: job
relationship: none
- table: views_test
+ table: views_test_data
name:
field: name
id: name
relationship: none
- table: views_test
+ table: views_test_data
pager:
options:
offset: '0'
@@ -38,7 +38,7 @@ display:
id: id
order: ASC
relationship: none
- table: views_test
+ table: views_test_data
style_options:
mapping:
name_field: name
diff --git a/tests/views_test_data/views_test_data.install b/tests/views_test_data/views_test_data.install
index 94fc419d16e691d6f1eb6720a6caf2b3aa3825f0..9ad4cad431e553412714d129f938ce1510daa8b6 100644
--- a/tests/views_test_data/views_test_data.install
+++ b/tests/views_test_data/views_test_data.install
@@ -9,7 +9,7 @@
* Implements hook_schema().
*/
function views_test_data_schema() {
- return variable_get('views_test_schema', array());
+ return variable_get('views_test_data_schema', array());
}
/**
diff --git a/tests/views_test_data/views_test_data.module b/tests/views_test_data/views_test_data.module
index 5e7b4f5735086b740a7a4a2ca80a64d468f779c2..3daccc9ee71813d4557c956176ecd46e954e9e81 100644
--- a/tests/views_test_data/views_test_data.module
+++ b/tests/views_test_data/views_test_data.module
@@ -12,9 +12,9 @@
*/
function views_test_data_permission() {
return array(
- 'views_test test permission' => array(
+ 'views_test_data test permission' => array(
'title' => t('Test permission'),
- 'description' => t('views_test test permission'),
+ 'description' => t('views_test_data test permission'),
),
);
}
@@ -33,7 +33,7 @@ function views_test_data_views_api() {
* Implements hook_views_data().
*/
function views_test_data_views_data() {
- return variable_get('views_test_views_data', array());
+ return variable_get('views_test_data_views_data', array());
}
function views_test_data_test_static_access_callback($access) {
@@ -49,8 +49,8 @@ function views_test_data_test_dynamic_access_callback($access, $argument1, $argu
*/
function views_test_data_views_pre_render(&$view) {
if ($view->name == 'test_cache_header_storage') {
- drupal_add_js(drupal_get_path('module', 'views_test') . '/views_cache.test.js');
- drupal_add_css(drupal_get_path('module', 'views_test') . '/views_cache.test.css');
+ drupal_add_js(drupal_get_path('module', 'views_test_data') . '/views_cache.test.js');
+ drupal_add_css(drupal_get_path('module', 'views_test_data') . '/views_cache.test.css');
$view->pre_render_called = TRUE;
}
}