Merge pull request #2424 from eileenmcnaughton/test-fixes

test suite - fix signature on GroupCreate call

tests/phpunit/CiviTest/CiviUnitTestCase.php

@@ -1462,9 +1462,8 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase {
    * @return int groupId of created group
    *
    */
-  function groupCreate($params = NULL) {
-    if ($params === NULL) {
-      $params = array(
+  function groupCreate($params = array()) {
+    $params = array_merge(array(
         'name' => 'Test Group 1',
         'domain_id' => 1,
         'title' => 'New Test Group Created',
@@ -1475,8 +1474,7 @@ class CiviUnitTestCase extends PHPUnit_Extensions_Database_TestCase {
           '1' => 1,
           '2' => 1,
         ),
-      );
-    }
+      ), $params);
 
     $result = $this->callAPISuccess('Group', 'create', $params);
     return $result['id'];

tests/phpunit/api/v3/ContactTest.php

@@ -596,7 +596,7 @@ class api_v3_ContactTest extends CiviUnitTestCase {
   }
 
   function testGetGroupIDFromContact() {
-    $groupId     = $this->groupCreate(NULL);
+    $groupId     = $this->groupCreate();
     $description = "Get all from group and display contacts";
     $subfile     = "GroupFilterUsingContactAPI";
     $params      = array(

tests/phpunit/api/v3/GroupContactTest.php

@@ -70,7 +70,7 @@ class api_v3_GroupContactTest extends CiviUnitTestCase {
       'visibility' => 'User and User Admin Only',
     );
 
-    $this->_groupId2 = $this->groupCreate($group, 3);
+    $this->_groupId2 = $this->groupCreate();
     $params = array(
       'contact_id.1' => $this->_contactId,
       'group_id' => $this->_groupId2,

tests/phpunit/api/v3/GroupOrganizationTest.php

@@ -53,7 +53,7 @@ class api_v3_GroupOrganizationTest extends CiviUnitTestCase {
   protected function setUp() {
     $this->_apiversion = 3;
     parent::setUp();
-    $this->_groupID = $this->groupCreate(NULL);
+    $this->_groupID = $this->groupCreate();
 
     $this->_orgID = $this->organizationCreate(NULL);
   }

tests/phpunit/api/v3/GroupTest.php

@@ -49,7 +49,7 @@ class api_v3_GroupTest extends CiviUnitTestCase {
     $this->_apiversion = 3;
 
     parent::setUp();
-    $this->_groupID = $this->groupCreate(NULL, 3);
+    $this->_groupID = $this->groupCreate();
   }
 
   function tearDown() {

tests/phpunit/api/v3/MailingGroupTest.php

@@ -49,7 +49,7 @@ class api_v3_MailingGroupTest extends CiviUnitTestCase {
   function setUp() {
     parent::setUp();
     $this->_apiversion = 3;
-    $this->_groupID = $this->groupCreate(NULL);
+    $this->_groupID = $this->groupCreate();
     $this->_email = 'test@test.test';
   }
 

tests/phpunit/api/v3/MailingTest.php

@@ -49,7 +49,7 @@ class api_v3_MailingTest extends CiviUnitTestCase {
 
   function setUp() {
     parent::setUp();
-    $this->_groupID = $this->groupCreate(NULL);
+    $this->_groupID = $this->groupCreate();
     $this->_email = 'test@test.test';
     $this->_params = array(
       'subject' => 'maild',