From 56c886f90892a8a5a04bf212f91b66d9415cc85a Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Fri, 27 Jun 2014 15:20:47 +1200 Subject: [PATCH] remove incorrectly added (duplicate) test (only just added) --- tests/phpunit/CRM/Contact/BAO/QueryTest.php | 39 --------------------- 1 file changed, 39 deletions(-) diff --git a/tests/phpunit/CRM/Contact/BAO/QueryTest.php b/tests/phpunit/CRM/Contact/BAO/QueryTest.php index af5c1e70c4..5899e68a3d 100644 --- a/tests/phpunit/CRM/Contact/BAO/QueryTest.php +++ b/tests/phpunit/CRM/Contact/BAO/QueryTest.php @@ -184,44 +184,5 @@ class CRM_Contact_BAO_QueryTest extends CiviUnitTestCase { } } - - /** - * CRM-14263 search builder failure with search profile & address in criteria - * We are retrieving primary here - checking the actual sql seems super prescriptive - but since the massive query object has - * so few tests detecting any change seems good here :-) - */ - function testSearchProfilePrimaryCityCRM14263() - { - $contactID = $this->individualCreate(); - CRM_Core_Config::singleton()->defaultSearchProfileID = 1; - $this->callAPISuccess('address', 'create', array('contact_id' => $contactID, 'city' => 'Cool City', 'location_type_id' => 1,)); - $params = array( - 0 => array( - 0 => 'city', - 1 => '=', - 2 => 'Cool City', - 3 => 1, - 4 => 0, - ) - ); - $returnProperties = array( - 'contact_type' => 1, - 'contact_sub_type' => 1, - 'sort_name' => 1, - ); - $expectedSQL = "SELECT contact_a.id as contact_id, contact_a.contact_type as `contact_type`, contact_a.contact_sub_type as `contact_sub_type`, contact_a.sort_name as `sort_name`, civicrm_address.id as address_id, civicrm_address.city as `city` FROM civicrm_contact contact_a LEFT JOIN civicrm_address ON ( contact_a.id = civicrm_address.contact_id AND civicrm_address.is_primary = 1 ) WHERE ( ( LOWER(civicrm_address.city) = 'cool city' ) ) AND (contact_a.is_deleted = 0) ORDER BY contact_a.sort_name asc, contact_a.id "; - $queryObj = new CRM_Contact_BAO_Query($params, $returnProperties); - try { - $this->assertEquals($expectedSQL ,$queryObj->searchQuery(0, 0, NULL, - FALSE, FALSE, - FALSE, FALSE, - TRUE)); - } - catch (PEAR_Exception $e) { - $err = $e->getCause(); - $this->fail('invalid SQL created' . $e->getMessage() . " " . $err->userinfo); - - } - } } -- 2.25.1