Test improvements

[eileenmcnaughton]

Overview

Sub-commit of #15719 as relates to test cleanup & improvements

Before

Tests customQueryTest

After

tests the search via BAO_Contact_Query

Technical Details

Convert customQueryTest to test the BAO_Contact_Query

While I understand the theory of unit tests is to test low level chunks of code that relates in many
ways to WELL-DESIGNED chunks. In the case of the query object it is more important to
ensure the results experienced by the user are correct - this converts the existing test
to a more end-to-end test on the CRM_Contact_BAO_Query object acting correctly.

Comments

@seamuslee001 sub-commit

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[seamuslee001]

So i did a grep for CRM_Core_BAO_CustomQuery

api/v3/utils.php:  if (!array_key_exists($entity, CRM_Core_BAO_CustomQuery::$extendsMap)) {
api/v3/utils.php:    if (isset($params['custom']) && empty(CRM_Core_BAO_CustomQuery::$extendsMap[$entity])) {
CRM/Core/BAO/CustomField.php:          $fields[$dao->id]['extends_table'] = array_key_exists($dao->extends, CRM_Core_BAO_CustomQuery::$extendsMap) ? CRM_Core_BAO_CustomQuery::$extendsMap[$dao->extends] : '';
CRM/Core/BAO/CustomQuery.php:class CRM_Core_BAO_CustomQuery {
CRM/Contact/BAO/Query.php:      $this->_customQuery = new CRM_Core_BAO_CustomQuery($this->_cfIDs, TRUE, $this->_locationSpecificCustomFields);
CRM/Contact/BAO/Query.php:      $customQuery = new CRM_Core_BAO_CustomQuery($addressCustomFieldIds);
CRM/Contact/BAO/Query.php:        $this->_customQuery = new CRM_Core_BAO_CustomQuery($this->_cfIDs, TRUE, $this->_locationSpecificCustomFields);
CRM/Report/Form.php:    $mapper = CRM_Core_BAO_CustomQuery::$extendsMap;
tests/phpunit/api/v3/SyntaxConformanceTest.php:    $entities = CRM_Core_BAO_CustomQuery::$extendsMap;
tests/phpunit/api/v3/SyntaxConformanceTest.php:    if (!isset(CRM_Core_BAO_CustomQuery::$extendsMap[$entityName])) {
tests/phpunit/CRM/Core/BAO/CustomQueryTest.php:class CRM_Core_BAO_CustomQueryTest extends CiviUnitTestCase {
tests/phpunit/CRM/Core/BAO/CustomQueryTest.php:    $queryObj = new CRM_Core_BAO_CustomQuery($params);
tests/phpunit/CRM/Core/BAO/CustomQueryTest.php:    $queryObj = new CRM_Core_BAO_CustomQuery($params);
tests/phpunit/CRM/Core/BAO/CustomQueryTest.php:      $queryObj = new CRM_Core_BAO_CustomQuery($params);
tests/phpunit/CRM/Core/BAO/CustomQueryTest.php:      $queryObj = new CRM_Core_BAO_CustomQuery($params);
tests/phpunit/CRM/Core/BAO/CustomQueryTest.php:      $queryObj = new CRM_Core_BAO_CustomQuery($params);
tests/phpunit/CRM/Core/BAO/CustomQueryTest.php:    $queryObj = new CRM_Core_BAO_CustomQuery($params);

So the only time we are going to be passing in any parameters to that object outside of the current test set up is when we are going via the CRM_Contact_BAO_Query class so it makes sense to change that in the test set up because that is testing more actual code paths as this is only test only adding merge on pass if Jenkins is ok with it