From acd6c6abd5d77cc71a4e3468ec3782bc30d272e7 Mon Sep 17 00:00:00 2001 From: eileen Date: Fri, 31 May 2019 09:56:03 +1200 Subject: [PATCH] Add unit test to check generation of fields data --- CRM/Core/BAO/CustomQuery.php | 7 +++++++ tests/phpunit/CRM/Core/BAO/CustomQueryTest.php | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/CRM/Core/BAO/CustomQuery.php b/CRM/Core/BAO/CustomQuery.php index 610478c603..59584661a4 100644 --- a/CRM/Core/BAO/CustomQuery.php +++ b/CRM/Core/BAO/CustomQuery.php @@ -93,6 +93,13 @@ class CRM_Core_BAO_CustomQuery { */ public $_fields; + /** + * @return array + */ + public function getFields() { + return $this->_fields; + } + /** * Searching for contacts? * diff --git a/tests/phpunit/CRM/Core/BAO/CustomQueryTest.php b/tests/phpunit/CRM/Core/BAO/CustomQueryTest.php index 2336be65b6..02a3b60203 100644 --- a/tests/phpunit/CRM/Core/BAO/CustomQueryTest.php +++ b/tests/phpunit/CRM/Core/BAO/CustomQueryTest.php @@ -50,6 +50,18 @@ class CRM_Core_BAO_CustomQueryTest extends CiviUnitTestCase { $queryObj->_where[0][0] ); $this->assertEquals($queryObj->_qill[0][0], "date field BETWEEN 'January 1st, " . date('Y') . " 12:00 AM AND December 31st, " . date('Y') . " 11:59 PM'"); + $this->assertEquals([ + 'id' => $dateCustomField['id'], + 'label' => 'date field', + 'extends' => 'civicrm_contact', + 'data_type' => 'Date', + 'html_type' => 'Select Date', + 'is_search_range' => '0', + 'column_name' => 'date_field_' . $dateCustomField['id'], + 'table_name' => 'civicrm_value_testsearchcus_' . $ids['custom_group_id'], + 'option_group_id' => NULL, + ], $queryObj->getFields()[$dateCustomField['id']]); + } /** -- 2.25.1