Merge pull request #8645 from eileenmcnaughton/group_query

CRM-17213 add tests for group search

diff --cc CRM/Contact/BAO/Group.php
Simple merge

diff --cc CRM/Contact/BAO/GroupContact.php
Simple merge

diff --cc CRM/Contact/BAO/Query.php
Simple merge

diff --cc tests/phpunit/CRM/Contact/BAO/GroupContactTest.php
index d0d18c14376e529a50caeb2a7fca8a0cc39cd52b,83bb495cfe3541155a1ddc12a7d941650db39fe9..5260bb53f916cacff0abf6166a24fc9cde4c1bf8
--- 1/tests/phpunit/CRM/Contact/BAO/GroupContactTest.php
--- 2/tests/phpunit/CRM/Contact/BAO/GroupContactTest.php
+++ b/tests/phpunit/CRM/Contact/BAO/GroupContactTest.php
@@@ -118,17 -119,17 +117,17 @@@ class CRM_Contact_BAO_GroupContactTest 
      $parentContactParams = array(
        'first_name' => 'Parent1 Fname',
        'last_name' => 'Parent1 Lname',
-       'group' => array($parentGroup->id => 1),
+       'group' => array($parentGroup['id'] => 1),
      );
 -    $parentContact = Contact::createIndividual($parentContactParams);
 +    $parentContact = $this->individualCreate($parentContactParams);
  
      // create a contact within child dgroup
      $childContactParams = array(
        'first_name' => 'Child1 Fname',
        'last_name' => 'Child2 Lname',
-       'group' => array($childGroup->id => 1),
+       'group' => array($childGroup['id'] => 1),
      );
 -    $childContact = Contact::createIndividual($childContactParams);
 +    $childContact = $this->individualCreate($childContactParams);
  
      // Check if searching by parent group  returns both parent and child group contacts
      $searchParams = array(

diff --cc tests/phpunit/CiviTest/CiviUnitTestCase.php
Simple merge