CRM-14720 add test for postal smart groups

diff --git a/tests/phpunit/CRM/Contact/BAO/GroupContactTest.php b/tests/phpunit/CRM/Contact/BAO/GroupContactTest.php
index 42a83643562ce60f2248068da2bcf9bf18352353..043035fe67f72729f6f9e51c97bd338c559c1f41 100644 (file)
--- a/tests/phpunit/CRM/Contact/BAO/GroupContactTest.php
+++ b/tests/phpunit/CRM/Contact/BAO/GroupContactTest.php
@@ -46,13 +46,14 @@ class CRM_Contact_BAO_GroupContactTest extends CiviUnitTestCase {
 
   /**
    * Tears down the fixture, for example, closes a network connection.
+   *
    * This method is called after a test is executed.
    */
   protected function tearDown() {
   }
 
   /**
-   * Test case for add( )
+   * Test case for add( ).
    */
   public function testAdd() {
 

diff --git a/tests/phpunit/CRM/Contact/BAO/GroupTest.php b/tests/phpunit/CRM/Contact/BAO/GroupTest.php
index 9acdb33e520381e4ac5a221675fc697c24752f5c..3125da6f0922d669dccebcd902ba6b6725543ebd 100644 (file)
--- a/tests/phpunit/CRM/Contact/BAO/GroupTest.php
+++ b/tests/phpunit/CRM/Contact/BAO/GroupTest.php
@@ -37,6 +37,7 @@ class CRM_Contact_BAO_GroupTest extends CiviUnitTestCase {
 
   /**
    * Sets up the fixture, for example, opens a network connection.
+   *
    * This method is called before a test is executed.
    */
   protected function setUp() {
@@ -45,6 +46,7 @@ class CRM_Contact_BAO_GroupTest extends CiviUnitTestCase {
 
   /**
    * Tears down the fixture, for example, closes a network connection.
+   *
    * This method is called after a test is executed.
    */
   protected function tearDown() {
@@ -52,7 +54,7 @@ class CRM_Contact_BAO_GroupTest extends CiviUnitTestCase {
   }
 
   /**
-   * Test case for add( )
+   * Test case for add( ).
    */
   public function testAddSimple() {
 
@@ -72,6 +74,9 @@ class CRM_Contact_BAO_GroupTest extends CiviUnitTestCase {
     );
   }
 
+  /**
+   * Test adding a smart group.
+   */
   public function testAddSmart() {
 
     $checkParams = $params = array(
@@ -93,7 +98,8 @@ class CRM_Contact_BAO_GroupTest extends CiviUnitTestCase {
   }
 
   /**
-   * Load all sql data sets & return an array of saved searches
+   * Load all sql data sets & return an array of saved searches.
+   *
    * @return array
    */
   public function dataProviderSavedSearch() {
@@ -114,7 +120,9 @@ class CRM_Contact_BAO_GroupTest extends CiviUnitTestCase {
   }
 
   /**
-   * Check we can load smart groups based on config from 'real DBs' without fatal errors - note that we are only testing lack of errors at this stage
+   * Check we can load smart groups based on config from 'real DBs' without fatal errors.
+   *
+   * Note that we are only testing lack of errors at this stage
    * @todo - for some reason the data was getting truncated from the group table using dataprovider - would be preferable to get that working
    * //@notdataProvider dataProviderSavedSearch
    * //@notparam integer $groupID

diff --git a/tests/phpunit/CRM/Contact/BAO/QueryTest.php b/tests/phpunit/CRM/Contact/BAO/QueryTest.php
index 1ff3bc78a78eb9ff6b3e246277a5ae65f0001256..4daff9d8131e51d961f5e3fe30ea0673dfcf1926 100644 (file)
--- a/tests/phpunit/CRM/Contact/BAO/QueryTest.php
+++ b/tests/phpunit/CRM/Contact/BAO/QueryTest.php
@@ -26,6 +26,7 @@ class CRM_Contact_BAO_QueryTest extends CiviUnitTestCase {
       'civicrm_entity_tag',
       'civicrm_tag',
       'civicrm_contact',
+      'civicrm_address',
     );
     $this->quickCleanup($tablesToTruncate);
   }
@@ -212,4 +213,39 @@ class CRM_Contact_BAO_QueryTest extends CiviUnitTestCase {
     $this->assertEquals('SELECT contact_a.id as contact_id', $select);
   }
 
+  /**
+   * Test smart groups with non-numeric don't fail on range queries.
+   *
+   * CRM-14720
+   */
+  public function testNumericPostal() {
+    $this->individualCreate(array('api.address.create' => array('postal_code' => 5, 'location_type_id' => 'Main')));
+    $this->individualCreate(array('api.address.create' => array('postal_code' => 'EH10 4RB-889', 'location_type_id' => 'Main')));
+    $this->individualCreate(array('api.address.create' => array('postal_code' => '4', 'location_type_id' => 'Main')));
+    $this->individualCreate(array('api.address.create' => array('postal_code' => '6', 'location_type_id' => 'Main')));
+
+    $params = array(array('postal_code_low', '=', 5, 0, 0));
+    CRM_Contact_BAO_Query::convertFormValues($params);
+
+    $query = new CRM_Contact_BAO_Query(
+      $params, array('contact_id'),
+      NULL, TRUE, FALSE, 1,
+      TRUE,
+      TRUE, FALSE
+    );
+
+    $sql = $query->query(FALSE);
+    $result = CRM_Core_DAO::executeQuery(implode(' ', $sql));
+    $this->assertEquals(2, $result->N);
+
+    // We save this as a smart group and then load it. With mysql warnings on & CRM-14720 this
+    // results in mysql warnings & hence fatal errors.
+    /// I was unable to get mysql warnings to activate in the context of the unit tests - but
+    // felt this code still provided a useful bit of coverage as it runs the various queries to load
+    // the group & could generate invalid sql if a bug were introduced.
+    $groupParams = array('title' => 'postal codes', 'formValues' => $params, 'is_active' => 1);
+    $group = CRM_Contact_BAO_Group::createSmartGroup($groupParams);
+    CRM_Contact_BAO_GroupContactCache::load($group, TRUE);
+  }
+
 }