diff --git a/plugins/views_data_export_plugin_display_export.inc b/plugins/views_data_export_plugin_display_export.inc index a1cb9e3..4ccb09c 100644 --- a/plugins/views_data_export_plugin_display_export.inc +++ b/plugins/views_data_export_plugin_display_export.inc @@ -181,7 +181,11 @@ class views_data_export_plugin_display_export extends views_plugin_display_feed */ function execute() { if (!$this->is_batched()) { - return parent::execute(); + $output = $this->view->render(); + if (empty($output)) { + return drupal_not_found(); + } + return $output; } // Try and get a batch context if possible. diff --git a/tests/base.test b/tests/base.test new file mode 100644 index 0000000..8de5fe7 --- /dev/null +++ b/tests/base.test @@ -0,0 +1,321 @@ +schemaDefinition()); + variable_set('views_test_views_data', $this->viewsData()); + variable_set('views_test_views_plugins', $this->viewsPlugins()); + + module_enable(array('views_test')); + $this->resetAll(); + + // Load the test dataset. + $data_set = $this->dataSet(); + $query = db_insert('views_test') + ->fields(array_keys($data_set[0])); + foreach ($data_set as $record) { + $query->values($record); + } + $query->execute(); + $this->checkPermissions(array(), TRUE); + } + + /** + * This function allows to enable views ui from a higher class which can't change the setup function anymore. + * + * @TODO + * Convert existing setUp functions. + */ + function enableViewsUi() { + module_enable(array('views_ui')); + // @TODO Figure out why it's required to clear the cache here. + views_module_include('views_default', TRUE); + views_get_all_views(TRUE); + menu_rebuild(); + } + + /** + * The schema definition. + */ + protected function schemaDefinition() { + $schema['views_test'] = array( + 'description' => 'Basic test table for Views tests.', + 'fields' => array( + 'id' => array( + 'type' => 'serial', + 'unsigned' => TRUE, + 'not null' => TRUE, + ), + 'name' => array( + 'description' => "A person's name", + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => '', + ), + 'age' => array( + 'description' => "The person's age", + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0), + 'job' => array( + 'description' => "The person's job", + 'type' => 'varchar', + 'length' => 255, + 'not null' => TRUE, + 'default' => 'Undefined', + ), + 'created' => array( + 'description' => "The creation date of this record", + 'type' => 'int', + 'unsigned' => TRUE, + 'not null' => TRUE, + 'default' => 0, + ), + ), + 'primary key' => array('id'), + 'unique keys' => array( + 'name' => array('name') + ), + 'indexes' => array( + 'ages' => array('age'), + ), + ); + return $schema; + } + + /** + * The views data definition. + */ + protected function viewsData() { + // Declaration of the base table. + $data['views_test']['table'] = array( + 'group' => t('Views test'), + 'base' => array( + 'field' => 'id', + 'title' => t('Views test'), + 'help' => t('Users who have created accounts on your site.'), + ), + ); + + // Declaration of fields. + $data['views_test']['id'] = array( + 'title' => t('ID'), + 'help' => t('The test data ID'), + 'field' => array( + 'handler' => 'views_handler_field_numeric', + 'click sortable' => TRUE, + ), + 'argument' => array( + 'handler' => 'views_handler_argument_numeric', + ), + 'filter' => array( + 'handler' => 'views_handler_filter_numeric', + ), + 'sort' => array( + 'handler' => 'views_handler_sort', + ), + ); + $data['views_test']['name'] = array( + 'title' => t('Name'), + 'help' => t('The name of the person'), + 'field' => array( + 'handler' => 'views_handler_field', + 'click sortable' => TRUE, + ), + 'argument' => array( + 'handler' => 'views_handler_argument_string', + ), + 'filter' => array( + 'handler' => 'views_handler_filter_string', + ), + 'sort' => array( + 'handler' => 'views_handler_sort', + ), + ); + $data['views_test']['age'] = array( + 'title' => t('Age'), + 'help' => t('The age of the person'), + 'field' => array( + 'handler' => 'views_handler_field_numeric', + 'click sortable' => TRUE, + ), + 'argument' => array( + 'handler' => 'views_handler_argument_numeric', + ), + 'filter' => array( + 'handler' => 'views_handler_filter_numeric', + ), + 'sort' => array( + 'handler' => 'views_handler_sort', + ), + ); + $data['views_test']['job'] = array( + 'title' => t('Job'), + 'help' => t('The job of the person'), + 'field' => array( + 'handler' => 'views_handler_field', + 'click sortable' => TRUE, + ), + 'argument' => array( + 'handler' => 'views_handler_argument_string', + ), + 'filter' => array( + 'handler' => 'views_handler_filter_string', + ), + 'sort' => array( + 'handler' => 'views_handler_sort', + ), + ); + $data['views_test']['created'] = array( + 'title' => t('Created'), + 'help' => t('The creation date of this record'), + 'field' => array( + 'handler' => 'views_handler_field_date', + 'click sortable' => TRUE, + ), + 'argument' => array( + 'handler' => 'views_handler_argument_date', + ), + 'filter' => array( + 'handler' => 'views_handler_filter_date', + ), + 'sort' => array( + 'handler' => 'views_handler_sort_date', + ), + ); + return $data; + } + + protected function viewsPlugins() { + return array(); + } + + /** + * A very simple test dataset. + */ + protected function dataSet() { + return array( + array( + 'name' => 'John', + 'age' => 25, + 'job' => 'Singer', + 'created' => gmmktime(0, 0, 0, 1, 1, 2000), + ), + array( + 'name' => 'George', + 'age' => 27, + 'job' => 'Singer', + 'created' => gmmktime(0, 0, 0, 1, 2, 2000), + ), + array( + 'name' => 'Ringo', + 'age' => 28, + 'job' => 'Drummer', + 'created' => gmmktime(6, 30, 30, 1, 1, 2000), + ), + array( + 'name' => 'Paul', + 'age' => 26, + 'job' => 'Songwriter', + 'created' => gmmktime(6, 0, 0, 1, 1, 2000), + ), + array( + 'name' => 'Meredith', + 'age' => 30, + 'job' => 'Speaker', + 'created' => gmmktime(6, 30, 10, 1, 1, 2000), + ), + ); + } + + /** + * Build and return a basic view of the views_test table. + * + * @return view + */ + protected function getBasicView() { + views_include('view'); + + // Create the basic view. + $view = new view(); + $view->vid = 'test_view'; + $view->add_display('default'); + $view->base_table = 'views_test'; + + // Set up the fields we need. + $display = $view->new_display('default', 'Master', 'default'); + $display->override_option('fields', array( + 'id' => array( + 'id' => 'id', + 'table' => 'views_test', + 'field' => 'id', + 'relationship' => 'none', + ), + 'name' => array( + 'id' => 'name', + 'table' => 'views_test', + 'field' => 'name', + 'relationship' => 'none', + ), + 'age' => array( + 'id' => 'age', + 'table' => 'views_test', + 'field' => 'age', + 'relationship' => 'none', + ), + )); + + // Set up the sort order. + $display->override_option('sorts', array( + 'id' => array( + 'order' => 'ASC', + 'id' => 'id', + 'table' => 'views_test', + 'field' => 'id', + 'relationship' => 'none', + ), + )); + + // Set up the pager. + $display->override_option('pager', array( + 'type' => 'none', + 'options' => array('offset' => 0), + )); + + return $view; + } + + public function logViewResult($result) { + $this->verbose('View result:
' . check_plain($result) .'
'); + } + + public function assertExportEqual($a, $b, $message) { + $this->logViewResult($a); + $this->logViewResult($b); + $this->assertEqual($this->normaliseString($a), $this->normaliseString($b), 'Non batched CSV export matched expected output.'); + } + + protected function normaliseString($s) { + // Normalize line endings + // Convert all line-endings to UNIX format + $s = str_replace("\r\n", "\n", $s); + $s = str_replace("\r", "\n", $s); + $s = trim($s); + return $s; + } + +} \ No newline at end of file diff --git a/tests/csv_export.test b/tests/csv_export.test new file mode 100644 index 0000000..d6e66fe --- /dev/null +++ b/tests/csv_export.test @@ -0,0 +1,91 @@ + 'CSV Export', + 'description' => 'Various tests for exporting to CSV.', + 'group' => 'Views Data Export', + ); + } + + public function testNonBatchedExport() { + $view = $this->getCSVExportView(); + + $result = $view->execute_display('vde_test'); + $expected = '"ID","Name","Age" +"1","John","25" +"2","George","27" +"3","Ringo","28" +"4","Paul","26" +"5","Meredith","30"'; + + $this->assertExportEqual($result, $expected, 'Non batched CSV export matched expected output.'); + } + + /** + * Build and return a basic view of the views_test table. + * + * @return view + */ + protected function getCSVExportView() { + views_include('view'); + + // Create the basic view. + $view = new view(); + $view->vid = 'test_view'; + $view->base_table = 'views_test'; + + // Set up the fields we need. + $display = $view->new_display('default', 'Master', 'default'); + + $display->override_option('fields', array( + 'id' => array( + 'id' => 'id', + 'table' => 'views_test', + 'field' => 'id', + 'relationship' => 'none', + ), + 'name' => array( + 'id' => 'name', + 'table' => 'views_test', + 'field' => 'name', + 'relationship' => 'none', + ), + 'age' => array( + 'id' => 'age', + 'table' => 'views_test', + 'field' => 'age', + 'relationship' => 'none', + ), + )); + + // Set up the sort order. + $display->override_option('sorts', array( + 'id' => array( + 'order' => 'ASC', + 'id' => 'id', + 'table' => 'views_test', + 'field' => 'id', + 'relationship' => 'none', + ), + )); + + // Set up the pager. + $display->override_option('pager', array( + 'type' => 'none', + 'options' => array('offset' => 0), + )); + + $display = $view->new_display('views_data_export', 'Data export', 'vde_test'); + $display->override_option('style_plugin', 'views_data_export_csv'); + $display->override_option('path', 'vde_test'); + + + return $view; + } + +} \ No newline at end of file diff --git a/tests/doc_export.test b/tests/doc_export.test new file mode 100644 index 0000000..675fff5 --- /dev/null +++ b/tests/doc_export.test @@ -0,0 +1,100 @@ + 'DOC Export', + 'description' => 'Various tests for exporting to DOC.', + 'group' => 'Views Data Export', + ); + } + + public function testNonBatchedExport() { + $view = $this->getDocExportView(); + + $result = $view->execute_display('vde_test'); + $expected = ' + + + + + + + + + + + +
IDNameAge
1John25
2George27
3Ringo28
4Paul26
5Meredith30
+ +'; + + $this->assertExportEqual($result, $expected, 'Non batched DOC export matched expected output.'); + } + + /** + * Build and return a basic view of the views_test table. + * + * @return view + */ + protected function getDOCExportView() { + views_include('view'); + + // Create the basic view. + $view = new view(); + $view->vid = 'test_view'; + $view->base_table = 'views_test'; + + // Set up the fields we need. + $display = $view->new_display('default', 'Master', 'default'); + + $display->override_option('fields', array( + 'id' => array( + 'id' => 'id', + 'table' => 'views_test', + 'field' => 'id', + 'relationship' => 'none', + ), + 'name' => array( + 'id' => 'name', + 'table' => 'views_test', + 'field' => 'name', + 'relationship' => 'none', + ), + 'age' => array( + 'id' => 'age', + 'table' => 'views_test', + 'field' => 'age', + 'relationship' => 'none', + ), + )); + + // Set up the sort order. + $display->override_option('sorts', array( + 'id' => array( + 'order' => 'ASC', + 'id' => 'id', + 'table' => 'views_test', + 'field' => 'id', + 'relationship' => 'none', + ), + )); + + // Set up the pager. + $display->override_option('pager', array( + 'type' => 'none', + 'options' => array('offset' => 0), + )); + + $display = $view->new_display('views_data_export', 'Data export', 'vde_test'); + $display->override_option('style_plugin', 'views_data_export_doc'); + $display->override_option('path', 'vde_test'); + + + return $view; + } + +} \ No newline at end of file diff --git a/tests/module/views_data_export_test.info b/tests/module/views_data_export_test.info new file mode 100644 index 0000000..e3bf3b5 --- /dev/null +++ b/tests/module/views_data_export_test.info @@ -0,0 +1,5 @@ +name = "Views data export testing" +version = VERSION +core = 7.x +dependencies[] = views_data_export +hidden = TRUE \ No newline at end of file diff --git a/tests/module/views_data_export_test.module b/tests/module/views_data_export_test.module new file mode 100644 index 0000000..b3d9bbc --- /dev/null +++ b/tests/module/views_data_export_test.module @@ -0,0 +1 @@ + 'TXT Export', + 'description' => 'Various tests for exporting to TXT.', + 'group' => 'Views Data Export', + ); + } + + public function testNonBatchedExport() { + $view = $this->getTXTExportView(); + + $result = $view->execute_display('vde_test'); + $expected = '[ID] + +1 +[Name] + +John +[Age] + +25 +---------------------------------------- + +[ID] + +2 +[Name] + +George +[Age] + +27 +---------------------------------------- + +[ID] + +3 +[Name] + +Ringo +[Age] + +28 +---------------------------------------- + +[ID] + +4 +[Name] + +Paul +[Age] + +26 +---------------------------------------- + +[ID] + +5 +[Name] + +Meredith +[Age] + +30 +----------------------------------------'; + + $this->assertExportEqual($result, $expected, 'Non batched TXT export matched expected output.'); + } + + /** + * Build and return a basic view of the views_test table. + * + * @return view + */ + protected function getTXTExportView() { + views_include('view'); + + // Create the basic view. + $view = new view(); + $view->vid = 'test_view'; + $view->base_table = 'views_test'; + + // Set up the fields we need. + $display = $view->new_display('default', 'Master', 'default'); + + $display->override_option('fields', array( + 'id' => array( + 'id' => 'id', + 'table' => 'views_test', + 'field' => 'id', + 'relationship' => 'none', + ), + 'name' => array( + 'id' => 'name', + 'table' => 'views_test', + 'field' => 'name', + 'relationship' => 'none', + ), + 'age' => array( + 'id' => 'age', + 'table' => 'views_test', + 'field' => 'age', + 'relationship' => 'none', + ), + )); + + // Set up the sort order. + $display->override_option('sorts', array( + 'id' => array( + 'order' => 'ASC', + 'id' => 'id', + 'table' => 'views_test', + 'field' => 'id', + 'relationship' => 'none', + ), + )); + + // Set up the pager. + $display->override_option('pager', array( + 'type' => 'none', + 'options' => array('offset' => 0), + )); + + $display = $view->new_display('views_data_export', 'Data export', 'vde_test'); + $display->override_option('style_plugin', 'views_data_export_txt'); + $display->override_option('path', 'vde_test'); + + + return $view; + } + +} \ No newline at end of file diff --git a/tests/xls_export.test b/tests/xls_export.test new file mode 100644 index 0000000..9d74667 --- /dev/null +++ b/tests/xls_export.test @@ -0,0 +1,100 @@ + 'XLS Export', + 'description' => 'Various tests for exporting to XLS.', + 'group' => 'Views Data Export', + ); + } + + public function testNonBatchedExport() { + $view = $this->getXLSExportView(); + + $result = $view->execute_display('vde_test'); + $expected = ' + + + + + + + + + + + +
IDNameAge
1John25
2George27
3Ringo28
4Paul26
5Meredith30
+ +'; + + $this->assertExportEqual($result, $expected, 'Non batched XLS export matched expected output.'); + } + + /** + * Build and return a basic view of the views_test table. + * + * @return view + */ + protected function getXLSExportView() { + views_include('view'); + + // Create the basic view. + $view = new view(); + $view->vid = 'test_view'; + $view->base_table = 'views_test'; + + // Set up the fields we need. + $display = $view->new_display('default', 'Master', 'default'); + + $display->override_option('fields', array( + 'id' => array( + 'id' => 'id', + 'table' => 'views_test', + 'field' => 'id', + 'relationship' => 'none', + ), + 'name' => array( + 'id' => 'name', + 'table' => 'views_test', + 'field' => 'name', + 'relationship' => 'none', + ), + 'age' => array( + 'id' => 'age', + 'table' => 'views_test', + 'field' => 'age', + 'relationship' => 'none', + ), + )); + + // Set up the sort order. + $display->override_option('sorts', array( + 'id' => array( + 'order' => 'ASC', + 'id' => 'id', + 'table' => 'views_test', + 'field' => 'id', + 'relationship' => 'none', + ), + )); + + // Set up the pager. + $display->override_option('pager', array( + 'type' => 'none', + 'options' => array('offset' => 0), + )); + + $display = $view->new_display('views_data_export', 'Data export', 'vde_test'); + $display->override_option('style_plugin', 'views_data_export_xls'); + $display->override_option('path', 'vde_test'); + + + return $view; + } + +} \ No newline at end of file diff --git a/tests/xml_export.test b/tests/xml_export.test new file mode 100644 index 0000000..d269930 --- /dev/null +++ b/tests/xml_export.test @@ -0,0 +1,113 @@ + 'XML Export', + 'description' => 'Various tests for exporting to XML.', + 'group' => 'Views Data Export', + ); + } + + public function testNonBatchedExport() { + $view = $this->getXMLExportView(); + + $result = $view->execute_display('vde_test'); + $expected = ' + + + 1 + John + 25 + + + 2 + George + 27 + + + 3 + Ringo + 28 + + + 4 + Paul + 26 + + + 5 + Meredith + 30 + +'; + + $this->assertExportEqual($result, $expected, 'Non batched XML export matched expected output.'); + } + + /** + * Build and return a basic view of the views_test table. + * + * @return view + */ + protected function getXMLExportView() { + views_include('view'); + + // Create the basic view. + $view = new view(); + $view->vid = 'test_view'; + $view->base_table = 'views_test'; + + // Set up the fields we need. + $display = $view->new_display('default', 'Master', 'default'); + + $display->override_option('fields', array( + 'id' => array( + 'id' => 'id', + 'table' => 'views_test', + 'field' => 'id', + 'relationship' => 'none', + ), + 'name' => array( + 'id' => 'name', + 'table' => 'views_test', + 'field' => 'name', + 'relationship' => 'none', + ), + 'age' => array( + 'id' => 'age', + 'table' => 'views_test', + 'field' => 'age', + 'relationship' => 'none', + ), + )); + + // Set up the sort order. + $display->override_option('sorts', array( + 'id' => array( + 'order' => 'ASC', + 'id' => 'id', + 'table' => 'views_test', + 'field' => 'id', + 'relationship' => 'none', + ), + )); + + // Set up the pager. + $display->override_option('pager', array( + 'type' => 'none', + 'options' => array('offset' => 0), + )); + + $display = $view->new_display('views_data_export', 'Data export', 'vde_test'); + $display->override_option('style_plugin', 'views_data_export_xml'); + $display->override_option('path', 'vde_test'); + + + return $view; + } + +} \ No newline at end of file diff --git a/views_data_export.info b/views_data_export.info index daa048a..39fd87c 100644 --- a/views_data_export.info +++ b/views_data_export.info @@ -34,3 +34,11 @@ files[] = theme/views-data-export-xml-body.tpl.php files[] = theme/views-data-export-xml-footer.tpl.php files[] = theme/views-data-export-xml-header.tpl.php files[] = theme/views-data-export.tpl.php + +; Tests +files[] = "tests/base.test" +files[] = "tests/csv_export.test" +files[] = "tests/doc_export.test" +files[] = "tests/txt_export.test" +files[] = "tests/xls_export.test" +files[] = "tests/xml_export.test" \ No newline at end of file