CRM-13072 upgrade group test

diff --git a/tests/phpunit/api/v3/GroupTest.php b/tests/phpunit/api/v3/GroupTest.php
index 83f199a2936708d2a59ec4dc78189f943b2ada75..0c74e17228693d771e4070fd7f90a64a73b18b26 100644 (file)
--- a/tests/phpunit/api/v3/GroupTest.php
+++ b/tests/phpunit/api/v3/GroupTest.php
@@ -71,21 +71,12 @@ class api_v3_GroupTest extends CiviUnitTestCase {
       ),
     );
 
-    $group = $this->callAPIFailure('group', 'create', $params);
-    $this->assertEquals($group['error_message'], 'Mandatory key(s) missing from params array: title');
+    $group = $this->callAPIFailure('group', 'create', $params, 'Mandatory key(s) missing from params array: title');
   }
 
-  function testGetGroupEmptyParams() {
-    $params = '';
-    $group = civicrm_api('group', 'get', $params);
-
-    $this->assertEquals($group['error_message'], 'Input variable `params` is not an array');
-  }
 
   function testGetGroupWithEmptyParams() {
-    $params = array('version' => $this->_apiversion);
-
-    $group = civicrm_api('group', 'get', $params);
+    $group = $this->callAPISuccess('group', 'get', $params = array());
 
     $group = $group["values"];
     $this->assertNotNull(count($group));
@@ -95,9 +86,8 @@ class api_v3_GroupTest extends CiviUnitTestCase {
   }
 
   function testGetGroupParamsWithGroupId() {
-    $params       = array('version' => $this->_apiversion);
-    $params['id'] = $this->_groupID;
-    $group        = civicrm_api('group', 'get', $params);
+    $params = array('id' => $this->_groupID);
+    $group = $this->callAPISuccess('group', 'get', $params);
 
     foreach ($group['values'] as $v) {
       $this->assertEquals($v['name'], "Test Group 1_{$this->_groupID}");
@@ -109,10 +99,10 @@ class api_v3_GroupTest extends CiviUnitTestCase {
   }
 
   function testGetGroupParamsWithGroupName() {
-    $params         = array('version' => $this->_apiversion);
-    $params['name'] = "Test Group 1_{$this->_groupID}";
-    $group          = civicrm_api('group', 'get', $params);
-    $this->documentMe($params, $group, __FUNCTION__, __FILE__);
+    $params = array(
+      'name' => "Test Group 1_{$this->_groupID}",
+    );
+    $group = $this->callAPIAndDocument('group', 'get', $params, __FUNCTION__, __FILE__);
     $group = $group['values'];
 
     foreach ($group as $v) {
@@ -125,19 +115,19 @@ class api_v3_GroupTest extends CiviUnitTestCase {
   }
 
   function testGetGroupParamsWithReturnName() {
-    $params = array('version' => $this->_apiversion);
+    $params = array();
     $params['id'] = $this->_groupID;
     $params['return.name'] = 1;
-    $group = civicrm_api('group', 'get', $params);
+    $group = $this->callAPISuccess('group', 'get', $params);
     $this->assertEquals($group['values'][$this->_groupID]['name'],
       "Test Group 1_{$this->_groupID}"
     );
   }
 
   function testGetGroupParamsWithGroupTitle() {
-    $params          = array('version' => $this->_apiversion);
+    $params          = array();
     $params['title'] = 'New Test Group Created';
-    $group           = civicrm_api('group', 'get', $params);
+    $group           = $this->callAPISuccess('group', 'get', $params);
 
     foreach ($group['values'] as $v) {
       $this->assertEquals($v['id'], $this->_groupID);
@@ -149,22 +139,20 @@ class api_v3_GroupTest extends CiviUnitTestCase {
   }
 
   function testGetNonExistingGroup() {
-    $params          = array('version' => $this->_apiversion);
+    $params          = array();
     $params['title'] = 'No such group Exist';
-    $group           = civicrm_api('group', 'get', $params);
+    $group           = $this->callAPISuccess('group', 'get', $params);
     $this->assertEquals(0, $group['count']);
   }
 
   function testgroupdeleteParamsnoId() {
-    $group = $this->callAPIFailure('group', 'delete', array());
-    $this->assertEquals($group['error_message'], 'Mandatory key(s) missing from params array: id');
+    $group = $this->callAPIFailure('group', 'delete', array(), 'Mandatory key(s) missing from params array: id');
   }
 
   function testgetfields() {
     $description = "demonstrate use of getfields to interogate api";
-    $params      = array('version' => 3, 'action' => 'create');
-    $result      = civicrm_api('group', 'getfields', $params);
-    $this->documentMe($params, $result, __FUNCTION__, __FILE__, $description, 'getfields', 'getfields');
+    $params      = array('action' => 'create');
+    $result = $this->callAPIAndDocument('group', 'getfields', $params, __FUNCTION__, __FILE__, $description, 'getfields', 'getfields');
     $this->assertEquals(1, $result['values']['is_active']['api.default']);
   }
 }