return new CRM_Contact_BAO_QueryTestDataProvider;
}
- function setUp() {
+ public function setUp() {
parent::setUp();
}
- function tearDown() {
+ public function tearDown() {
$tablesToTruncate = array(
'civicrm_group_contact',
'civicrm_group',
/**
* Test CRM_Contact_BAO_Query::searchQuery()
- * @dataProvider dataProvider
+ * @dataProvider dataProvider
*/
- function testSearch($fv, $count, $ids, $full) {
+ public function testSearch($fv, $count, $ids, $full) {
$op = new PHPUnit_Extensions_Database_Operation_Insert();
$op->execute($this->_dbconn,
$this->createFlatXMLDataSet(
* Check that we get a successful result querying for home address
* CRM-14263 search builder failure with search profile & address in criteria
*/
- function testSearchProfileHomeCityCRM14263() {
+ public function testSearchProfileHomeCityCRM14263() {
$contactID = $this->individualCreate();
CRM_Core_Config::singleton()->defaultSearchProfileID = 1;
- $this->callAPISuccess('address', 'create', array('contact_id' => $contactID, 'city' => 'Cool City', 'location_type_id' => 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,
* Check that we get a successful result querying for home address
* CRM-14263 search builder failure with search profile & address in criteria
*/
- function testSearchProfileHomeCityNoResultsCRM14263() {
+ public function testSearchProfileHomeCityNoResultsCRM14263() {
$contactID = $this->individualCreate();
CRM_Core_Config::singleton()->defaultSearchProfileID = 1;
- $this->callAPISuccess('address', 'create', array('contact_id' => $contactID, 'city' => 'Cool City', 'location_type_id' => 1,));
+ $this->callAPISuccess('address', 'create', array('contact_id' => $contactID, 'city' => 'Cool City', 'location_type_id' => 1));
$params = array(
0 => array(
0 => 'city-1',
2 => 'Dumb City',
3 => 1,
4 => 0,
- )
+ ),
);
$returnProperties = array(
'contact_type' => 1,
}
}
- /**
- * 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(
+ /**
+ * 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 :-)
+ */
+ public 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(
+ $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,
+ $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);
+ }
+ catch (PEAR_Exception $e) {
+ $err = $e->getCause();
+ $this->fail('invalid SQL created' . $e->getMessage() . " " . $err->userinfo);
- }
}
+ }
}
-