diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php index bdcc2c96bbcbc7f45e4ffb3d29c5e4963d5f3ae8..44eeef48abbb22d4544f0da04ea5412e58521fd4 100644 --- a/tests/phpunit/CiviTest/CiviUnitTestCase.php +++ b/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']; diff --git a/tests/phpunit/api/v3/ContactTest.php b/tests/phpunit/api/v3/ContactTest.php index 8627e23fede610e9022d11ad172285f2f03a5f15..7c1ef06a8fb4f4570ef82f6719e79ff77e8970cf 100644 --- a/tests/phpunit/api/v3/ContactTest.php +++ b/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( diff --git a/tests/phpunit/api/v3/GroupContactTest.php b/tests/phpunit/api/v3/GroupContactTest.php index 64966bb08ead07dec726023c16b1b0eeacb18daa..9e69cb3c0db4e2a6d3dcd12e24db8a9a8baba7e6 100644 --- a/tests/phpunit/api/v3/GroupContactTest.php +++ b/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, diff --git a/tests/phpunit/api/v3/GroupOrganizationTest.php b/tests/phpunit/api/v3/GroupOrganizationTest.php index 1379e289d9502e84ab22909843afad2ebd15b765..2efe9a9a89cd0434334ef39a3c21f6b5716ccfd8 100644 --- a/tests/phpunit/api/v3/GroupOrganizationTest.php +++ b/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); } diff --git a/tests/phpunit/api/v3/GroupTest.php b/tests/phpunit/api/v3/GroupTest.php index eb28cb11ac0da02081b050f9d17421b1e490348c..f9961405da834561ba5c1cfca5a7680fbad491e0 100644 --- a/tests/phpunit/api/v3/GroupTest.php +++ b/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() { diff --git a/tests/phpunit/api/v3/MailingGroupTest.php b/tests/phpunit/api/v3/MailingGroupTest.php index 5fc25f0099c41b820c74b4931f500db796168781..0f007479ab059baa22d0d26cca0f5690e3d47c3a 100644 --- a/tests/phpunit/api/v3/MailingGroupTest.php +++ b/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'; } diff --git a/tests/phpunit/api/v3/MailingTest.php b/tests/phpunit/api/v3/MailingTest.php index a40847fc7b7693d1741f7c78979307ff88aa0005..c09069d629be1a293390d21ebfed55f02fb29429 100644 --- a/tests/phpunit/api/v3/MailingTest.php +++ b/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',