X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fapi%2Fv3%2FRelationshipTest.php;h=b1b857e7135d87b26d9da55525fdb766d06d047b;hb=b24027357acbcd5dc0e289e2b2c1999b1dff2b4c;hp=c8d6f08b78151b7fd0492f56699133e5fed44feb;hpb=37f3ae13667f0324b3c075e7b1c47c80f81177e8;p=civicrm-core.git

diff --git a/tests/phpunit/api/v3/RelationshipTest.php b/tests/phpunit/api/v3/RelationshipTest.php
index c8d6f08b78..b1b857e713 100644
--- a/tests/phpunit/api/v3/RelationshipTest.php
+++ b/tests/phpunit/api/v3/RelationshipTest.php
@@ -32,7 +32,7 @@ require_once 'CiviTest/CiviUnitTestCase.php';
  *
  */
 class api_v3_RelationshipTest extends CiviUnitTestCase {
-  protected $_apiversion;
+  protected $_apiversion = 3;
   protected $_cId_a;
   protected $_cId_b;
   protected $_cId_b2;// second org
@@ -41,7 +41,7 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
   protected $_customGroupId = NULL;
   protected $_customFieldId = NULL;
   protected $_params;
-  public $_eNoticeCompliant = FALSE;
+  public $_eNoticeCompliant = TRUE;
   protected $_entity;
   function get_info() {
     return array(
@@ -53,7 +53,6 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
 
   function setUp() {
     parent::setUp();
-    $this->_apiversion = 3;
     $this->_cId_a      = $this->individualCreate(NULL);
     $this->_cId_b      = $this->organizationCreate();
     $this->_cId_b2      = $this->organizationCreate(array('organization_name' => ' Org 2'));
@@ -67,8 +66,8 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'contact_type_b' => 'Organization',
       'is_reserved' => 1,
       'is_active' => 1,
-      'version' => $this->_apiversion,
     );
+
     $this->_relTypeID = $this->relationshipTypeCreate($relTypeParams);
     $this->_params = array(
       'contact_id_a' => $this->_cId_a,
@@ -76,13 +75,12 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'relationship_type_id' => $this->_relTypeID,
       'start_date' => '2008-12-20',
       'is_active' => 1,
-      'version' => $this->_apiversion,
     );
 
   }
 
   function tearDown() {
-    $this->quickCleanup(array('civicrm_relationship'));
+    $this->quickCleanup(array('civicrm_relationship'), TRUE);
     $this->relationshipTypeDelete($this->_relTypeID);
     $this->contactDelete($this->_cId_a);
     $this->contactDelete($this->_cId_b);
@@ -94,16 +92,7 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
    * check with empty array
    */
   function testRelationshipCreateEmpty() {
-    $params = array('version' => $this->_apiversion);
-    $this->callAPIFailure('relationship', 'create', $params);
-  }
-
-  /**
-   * check with No array
-   */
-  function testRelationshipCreateParamsNotArray() {
-    $params = 'relationship_type_id = 5';
-    $this->callAPIFailure('relationship', 'create', $params);
+    $this->callAPIFailure('relationship', 'create', array());
   }
 
   /**
@@ -128,7 +117,6 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'contact_id_a' => $this->_cId_a,
       'contact_id_b' => $this->_cId_b,
       'relationship_type_id' => 'Breaking Relationship',
-      'version' => 3,
     );
 
     $this->callAPIFailure('relationship', 'create', $params);
@@ -164,7 +152,6 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'relationship_type_id' => $this->_relTypeID,
       'start_date' => '2008-01-10',
       'is_active' => 1,
-      'version' => 3,
     );
 
     $this->callAPIFailure('relationship', 'create', $params);
@@ -176,7 +163,6 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'relationship_type_id' => $this->_relTypeID,
       'start_date' => '2008-01-10',
       'is_active' => 1,
-      'version' => 3,
     );
 
     $this->callAPIFailure('relationship', 'create', $params);
@@ -192,9 +178,8 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'relationship_type_id' => $this->_relTypeID,
       'start_date' => '2008-12-20', 'end_date' => NULL,
       'is_active' => 1,
-      'version' => $this->_apiversion,
     );
-    $relationship = civicrm_api('relationship', 'create', $params);
+    $relationship = $this->callAPISuccess('relationship', 'create', $params);
 
     $params = array(
       'contact_id_a' => $this->_cId_a,
@@ -203,11 +188,10 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'start_date' => '2008-12-20',
       'is_active' => 1,
     );
-    $result = $this->callAPIFailure('relationship', 'create', $params);
-    $this->assertEquals($result['error_message'], 'Relationship already exists');
+    $result = $this->callAPIFailure('relationship', 'create', $params, 'Relationship already exists');
 
     $params['id'] = $relationship['id'];
-    $result = civicrm_api('relationship', 'delete', $params);
+    $result = $this->callAPISuccess('relationship', 'delete', $params);
   }
 
   /**
@@ -221,22 +205,19 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'start_date' => '2008-12-20',
       'end_date' => NULL,
       'is_active' => 1,
-      'version' => $this->_apiversion,
-    );
-    $relationship = civicrm_api('relationship', 'create', $params);
 
+    );
+    $relationship = $this->callAPISuccess('relationship', 'create', $params);
     $params = array(
       'id' => $relationship['id'],
       'is_active' => 0,
-      'version' => $this->_apiversion,
       'debug' => 1,
     );
-    $result = civicrm_api('relationship', 'create', $params);
+    $result = $this->callAPISuccess('relationship', 'create', $params);
     $this->assertAPISuccess($result, 'in line ' . __LINE__);
-    $result = civicrm_api('relationship', 'get', $params);
-    $this->assertEquals(0, $result['values'][$result['id']]['is_active'], 'in line ' . __LINE__);
+    $result = $this->callAPISuccess('relationship', 'get', $params);
     $params['id'] = $relationship['id'];
-    $result = civicrm_api('relationship', 'delete', $params);
+    $result = $this->callAPISuccess('relationship', 'delete', $params);
   }
 
   /**
@@ -248,22 +229,18 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'contact_id_b' => $this->_cId_b,
       'relationship_type_id' => $this->_relTypeID,
       'start_date' => '2008-12-20',
-      'end_date' => NULL,
       'is_active' => 1,
       'is_permission_a_b' => 1,
       'description' => 'my desc',
-      'version' => $this->_apiversion,
     );
-    $relationship = civicrm_api('relationship', 'create', $params);
+    $relationship = $this->callAPISuccess('relationship', 'create', $params);
 
     $updateparams = array(
       'id' => $relationship['id'],
-      'version' => $this->_apiversion,
       'relationship_type_id' => $this->_relTypeID,
     );
-    $result = civicrm_api('relationship', 'create', $updateparams);
+    $result = $this->callAPISuccess('relationship', 'create', $updateparams);
 
-    $this->assertAPISuccess($result, 'in line ' . __LINE__);
     //make sure the orig params didn't get changed
     $this->getAndCheck($params, $relationship['id'], 'relationship');
 
@@ -283,12 +260,9 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'end_date' => '2010-12-30',
       'is_active' => 1,
       'note' => 'note',
-      'version' => $this->_apiversion,
     );
 
-    $result = civicrm_api('relationship', 'create', $params);
-    $this->documentMe($params, $result, __FUNCTION__, __FILE__);
-    $this->assertEquals(0, $result['is_error'], 'in line ' . __LINE__);
+    $result = $this->callAPIAndDocument('relationship', 'create', $params, __FUNCTION__, __FILE__);
     $this->assertNotNull($result['id'], 'in line ' . __LINE__);
     $relationParams = array(
       'id' => $result['id'],
@@ -296,16 +270,16 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
 
     // assertDBState compares expected values in $result to actual values in the DB
     $this->assertDBState('CRM_Contact_DAO_Relationship', $result['id'], $relationParams);
-    $result = civicrm_api('relationship', 'get', array('version' => 3, 'id' => $result['id']));
+    $result = $this->callAPISuccess('relationship', 'get', array('id' => $result['id']));
     $values = $result['values'][$result['id']];
     foreach ($params as $key => $value) {
-      if ($key == 'version' || $key == 'note') {
+      if ($key == 'note') {
         continue;
       }
       $this->assertEquals($value, $values[$key], $key . " doesn't match " . print_r($values, TRUE) . 'in line' . __LINE__);
     }
     $params['id'] = $result['id'];
-    civicrm_api('relationship', 'delete', $params);
+    $this->callAPISuccess('relationship', 'delete', $params);
   }
 
   /**
@@ -320,12 +294,9 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'end_date' => '',
       'is_active' => 1,
       'note' => 'note',
-      'version' => $this->_apiversion,
     );
 
-    $result = civicrm_api('relationship', 'create', $params);
-
-    $this->assertEquals(0, $result['is_error'], 'in line ' . __LINE__);
+    $result = $this->callAPISuccess('relationship', 'create', $params);
     $this->assertNotNull($result['id'], 'in line ' . __LINE__);
     $relationParams = array(
       'id' => $result['id'],
@@ -333,10 +304,10 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
 
     // assertDBState compares expected values in $result to actual values in the DB
     $this->assertDBState('CRM_Contact_DAO_Relationship', $result['id'], $relationParams);
-    $result = civicrm_api('relationship', 'get', array('version' => 3, 'id' => $result['id']));
+    $result = $this->callAPISuccess('relationship', 'get', array('id' => $result['id']));
     $values = $result['values'][$result['id']];
     foreach ($params as $key => $value) {
-      if ($key == 'version' || $key == 'note') {
+      if ($key == 'note') {
         continue;
       }
       if($key == 'end_date'){
@@ -346,7 +317,7 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       $this->assertEquals($value, $values[$key], $key . " doesn't match " . print_r($values, TRUE) . 'in line' . __LINE__);
     }
     $params['id'] = $result['id'];
-    civicrm_api('relationship', 'delete', $params);
+    $this->callAPISuccess('relationship', 'delete', $params);
   }
 
   /**
@@ -369,12 +340,10 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'relationship_type_id' => $this->_relTypeID,
       'start_date' => '2008-12-20',
       'is_active' => 1,
-      'version' => $this->_apiversion,
     );
     $params = array_merge($params, $custom_params);
-    $result = civicrm_api('relationship', 'create', $params);
+    $result = $this->callAPISuccess('relationship', 'create', $params);
 
-    $this->assertNotNull($result['id']);
     $relationParams = array(
       'id' => $result['id'],
     );
@@ -382,7 +351,7 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
     $this->assertDBState('CRM_Contact_DAO_Relationship', $result['id'], $relationParams);
 
     $params['id'] = $result['id'];
-    $result = civicrm_api('relationship', 'delete', $params);
+    $result = $this->callAPISuccess('relationship', 'delete', $params);
     $this->relationshipTypeDelete($this->_relTypeID);
   }
 
@@ -398,13 +367,11 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
     $params = $this->_params;
     $params['custom_' . $ids['custom_field_id']] = "custom string";
 
-    $result = civicrm_api($this->_entity, 'create', $params);
+    $result = $this->callAPISuccess($this->_entity, 'create', $params);
     $this->assertEquals($result['id'], $result['values'][$result['id']]['id']);
 
-    $this->assertAPISuccess($result, ' in line ' . __LINE__);
-    $getParams = array('version' => 3, 'id' => $result['id']);
-    $check = civicrm_api($this->_entity, 'get', $getParams);
-    $this->documentMe($getParams, $check, __FUNCTION__, __FILE__);
+    $getParams = array('id' => $result['id']);
+    $check = $this->callAPIAndDocument($this->_entity, 'get', $getParams, __FUNCTION__, __FILE__);
     $this->assertEquals("custom string", $check['values'][$check['id']]['custom_' . $ids['custom_field_id']], ' in line ' . __LINE__);
 
     $this->customFieldDelete($ids['custom_field_id']);
@@ -419,9 +386,8 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'style' => 'Inline',
       'is_active' => 1,
       'max_multiple' => 0,
-      'version' => $this->_apiversion,
     );
-    $customGroup = civicrm_api('custom_group', 'create', $params);
+    $customGroup = $this->callAPISuccess('custom_group', 'create', $params);
     $this->_customGroupId = $customGroup['id'];
     return $customGroup['id'];
   }
@@ -438,11 +404,10 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'is_required' => 1,
       'is_searchable' => 0,
       'is_active' => 1,
-      'version' => $this->_apiversion,
     );
 
 
-    $result = civicrm_api('CustomField', 'create', $params);
+    $result = $this->callAPISuccess('CustomField', 'create', $params);
 
     $customField = NULL;
     $ids[] = $customField['result']['customFieldId'];
@@ -476,10 +441,9 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'is_active' => 1,
       'option_values' => $optionValue,
       'custom_group_id' => $this->_customGroupId,
-      'version' => $this->_apiversion,
     );
 
-    $customField = civicrm_api('custom_field', 'create', $params);
+    $customField = $this->callAPISuccess('custom_field', 'create', $params);
     $ids[] = $customField['id'];
 
     $params = array(
@@ -493,10 +457,9 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'is_required' => 1,
       'is_searchable' => 0,
       'is_active' => 1,
-      'version' => $this->_apiversion,
     );
 
-    $customField = civicrm_api('custom_field', 'create', $params);
+    $customField = $this->callAPISuccess('custom_field', 'create', $params);
 
     $ids[] = $customField['id'];
     $params = array(
@@ -510,10 +473,9 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'is_required' => 1,
       'is_searchable' => 0,
       'is_active' => 1,
-      'version' => $this->_apiversion,
     );
 
-    $customField = civicrm_api('custom_field', 'create', $params);
+    $customField = $this->callAPISuccess('custom_field', 'create', $params);
     $ids[] = $customField['id'];
     return $ids;
   }
@@ -524,9 +486,8 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
    * check with empty array
    */
   function testRelationshipDeleteEmpty() {
-    $params = array('version' => $this->_apiversion);
-    $result = $this->callAPIFailure('relationship', 'delete', $params);
-    $this->assertEquals($result['error_message'], 'Mandatory key(s) missing from params array: id');
+    $params = array();
+    $result = $this->callAPIFailure('relationship', 'delete', $params, 'Mandatory key(s) missing from params array: id');
   }
 
   /**
@@ -551,15 +512,12 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'contact_id_a' => $this->_cId_a,
       'contact_id_b' => $this->_cId_b,
       'relationship_type_id' => 'Breaking Relationship',
-      'version' => $this->_apiversion,
     );
 
-    $result = $this->callAPIFailure('relationship', 'delete', $params);
-    $this->assertEquals($result['error_message'], 'Mandatory key(s) missing from params array: id', 'in line ' . __LINE__);
+    $result = $this->callAPIFailure('relationship', 'delete', $params, 'Mandatory key(s) missing from params array: id', 'in line ' . __LINE__);
 
     $params['id'] = "Invalid";
-    $result = $this->callAPIFailure('relationship', 'delete', $params);
-    $this->assertEquals($result['error_message'], 'Invalid value for relationship ID', 'in line ' . __LINE__);
+    $result = $this->callAPIFailure('relationship', 'delete', $params, 'Invalid value for relationship ID', 'in line ' . __LINE__);
   }
 
   /**
@@ -572,18 +530,15 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'relationship_type_id' => $this->_relTypeID,
       'start_date' => '2008-12-20',
       'is_active' => 1,
-      'version' => $this->_apiversion,
     );
 
-    $result = civicrm_api('relationship', 'create', $params);
-    $this->documentMe($params, $result, __FUNCTION__, __FILE__);
-    $this->assertNotNull($result['id']);
+    $result = $this->callAPISuccess('relationship', 'create', $params);
 
     //Delete relationship
     $params = array();
     $params['id'] = $result['id'];
 
-    $result = civicrm_api('relationship', 'delete', $params);
+    $result = $this->callAPIAndDocument('relationship', 'delete', $params, __FUNCTION__, __FILE__);
     $this->relationshipTypeDelete($this->_relTypeID);
   }
 
@@ -612,10 +567,9 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'start_date' => '20081214',
       'end_date' => '20091214',
       'is_active' => 1,
-      'version' => $this->_apiversion,
     );
 
-    $result = civicrm_api('relationship', 'create', $relParams);
+    $result = $this->callAPISuccess('relationship', 'create', $relParams);
 
     $this->assertNotNull($result['id'], 'In line ' . __LINE__);
     $this->_relationID = $result['id'];
@@ -625,21 +579,18 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'contact_id_b' => $this->_cId_b,
       'relationship_type_id' => $this->_relTypeID,
       'start_date' => '20081214',
-      'end_date' => '20091214', 'is_active' => 0,
-      'version' => $this->_apiversion,
+      'end_date' => '20091214',
+      'is_active' => 0,
     );
 
-    $result = $this->callAPIFailure('relationship', 'create', $params);
-    $this->assertEquals($result['error_message'], 'Relationship already exists', 'In line ' . __LINE__);
+    $result = $this->callAPIFailure('relationship', 'create', $params, 'Relationship already exists', 'In line ' . __LINE__);
 
     //delete created relationship
     $params = array(
       'id' => $this->_relationID,
-      'version' => $this->_apiversion,
     );
 
-    $result = civicrm_api('relationship', 'delete', $params);
-    $this->assertAPISuccess($result, 'in line ' . __LINE__);
+    $result = $this->callAPISuccess('relationship', 'delete', $params);
 
     //delete created relationship type
     $this->relationshipTypeDelete($this->_relTypeID);
@@ -656,34 +607,26 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'start_date' => '2011-01-01',
       'end_date' => '2013-01-01',
       'is_active' => 1,
-      'version' => $this->_apiversion,
     );
 
-    $result = civicrm_api('relationship', 'create', $relParams);
+    $result = $this->callAPISuccess('relationship', 'create', $relParams);
 
     //get relationship
     $params = array(
       'contact_id' => $this->_cId_b,
-      'version' => $this->_apiversion,
     );
-    $result = civicrm_api('relationship', 'get', $params);
-
-    $this->assertAPISuccess($result, 'in line ' . __LINE__);
+    $result = $this->callAPISuccess('relationship', 'get', $params);
     $this->assertEquals($result['count'], 1, 'in line ' . __LINE__);
     $params = array(
       'contact_id_a' => $this->_cId_a,
-      'version' => $this->_apiversion,
     );
-    $result = civicrm_api('relationship', 'get', $params);
-    $this->assertAPISuccess($result, 'in line ' . __LINE__);
+    $result = $this->callAPISuccess('relationship', 'get', $params);
     $this->assertEquals($result['count'], 1, 'in line ' . __LINE__);
     // contact_id_a is wrong so should be no matches
     $params = array(
       'contact_id_a' => $this->_cId_b,
-      'version' => $this->_apiversion,
     );
-    $result = civicrm_api('relationship', 'get', $params);
-    $this->assertAPISuccess($result, 'in line ' . __LINE__);
+    $result = $this->callAPISuccess('relationship', 'get', $params);
     $this->assertEquals($result['count'], 0, 'in line ' . __LINE__);
   }
 
@@ -699,18 +642,15 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'start_date' => '2011-01-01',
       'end_date' => '2013-01-01',
       'is_active' => 1,
-      'version' => $this->_apiversion,
     );
 
-    $result = civicrm_api('relationship', 'create', $relParams);
+    $result = $this->callAPISuccess('relationship', 'create', $relParams);
 
     //get relationship
     $params = array(
       'contact_id_b' => $this->_cId_b,
-      'version' => $this->_apiversion,
     );
-    $result = civicrm_api('relationship', 'get', $params);
-    $this->assertAPISuccess($result, 'in line ' . __LINE__);
+    $result = $this->callAPISuccess('relationship', 'get', $params);
   }
 
   function testGetIsCurrent() {
@@ -720,29 +660,25 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'relationship_type_id' => $this->_relTypeID,
       'start_date' => '2008-12-20',
       'is_active' => 0,
-      'version' => $this->_apiversion,
     );
-    $rel2 = civicrm_api('relationship', 'create', $rel2Params);
-    $this->assertAPISuccess($rel2);
-    $rel1 = civicrm_api('relationship', 'create', $this->_params);
-    $this->assertAPISuccess($rel1);
+    $rel2 = $this->callAPISuccess('relationship', 'create', $rel2Params);
+    $rel1 = $this->callAPISuccess('relationship', 'create', $this->_params);
+
     $getParams = array(
-      'version' => $this->_apiversion,
       'filters' => array('is_current' => 1)
     );
     $description = "demonstrates is_current filter";
     $subfile = 'filterIsCurrent';
     //no relationship has been created
-    $result = civicrm_api('relationship', 'get', $getParams);
-    $this->documentMe($getParams, $result, __FUNCTION__, __FILE__, $description, $subfile);
+    $result = $this->callAPIAndDocument('relationship', 'get', $getParams, __FUNCTION__, __FILE__, $description, $subfile);
     $this->assertEquals($result['count'], 1);
     $this->AssertEquals($rel1['id'], $result['id']);
 
     // now try not started
     $rel2Params['is_active'] =1;
     $rel2Params['start_date'] ='tomorrow';
-    $rel2 = civicrm_api('relationship', 'create', $rel2Params);
-    $result = civicrm_api('relationship', 'get', $getParams);
+    $rel2 = $this->callAPISuccess('relationship', 'create', $rel2Params);
+    $result = $this->callAPISuccess('relationship', 'get', $getParams);
     $this->assertEquals($result['count'], 1);
     $this->AssertEquals($rel1['id'], $result['id']);
 
@@ -750,7 +686,7 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
     $rel2Params['is_active'] =1;
     $rel2Params['start_date'] ='last week';
     $rel2Params['end_date'] ='yesterday';
-    $rel2 = civicrm_api('relationship', 'create', $rel2Params);
+    $rel2 = $this->callAPISuccess('relationship', 'create', $rel2Params);
   }
   /*
    * Test using various operators
@@ -764,7 +700,6 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
         'contact_type_b' => 'Organization',
         'is_reserved' => 1,
         'is_active' => 1,
-        'version' => $this->_apiversion,
     );
     $relationType2 = $this->relationshipTypeCreate($relTypeParams);
     $relTypeParams = array(
@@ -775,7 +710,6 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
         'contact_type_b' => 'Organization',
         'is_reserved' => 1,
         'is_active' => 1,
-        'version' => $this->_apiversion,
     );
     $relationType3 = $this->relationshipTypeCreate($relTypeParams);
 
@@ -787,65 +721,52 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
         'contact_type_b' => 'Organization',
         'is_reserved' => 1,
         'is_active' => 1,
-        'version' => $this->_apiversion,
     );
     $relationType4 = $this->relationshipTypeCreate($relTypeParams);
 
-    $rel1 = civicrm_api('relationship', 'create', $this->_params);
-    $this->assertAPISuccess($rel1);
-    $rel2 = civicrm_api('relationship', 'create', array_merge($this->_params,
+    $rel1 = $this->callAPISuccess('relationship', 'create', $this->_params);
+    $rel2 = $this->callAPISuccess('relationship', 'create', array_merge($this->_params,
       array('relationship_type_id' => $relationType2,)));
-    $this->assertAPISuccess($rel2);
-    $rel3 = civicrm_api('relationship', 'create', array_merge($this->_params,
+    $rel3 = $this->callAPISuccess('relationship', 'create', array_merge($this->_params,
         array('relationship_type_id' => $relationType3,)));
-    $this->assertAPISuccess($rel3);
-    $rel4 = civicrm_api('relationship', 'create', array_merge($this->_params,
+    $rel4 = $this->callAPISuccess('relationship', 'create', array_merge($this->_params,
         array('relationship_type_id' => $relationType4,)));
-    $this->assertAPISuccess($rel4);
 
     $getParams = array(
-        'version' => $this->_apiversion,
-        'relationship_type_id' => array('IN' => array($relationType2, $relationType3))
+      'relationship_type_id' => array('IN' => array($relationType2, $relationType3))
     );
 
     $description = "demonstrates use of IN filter";
     $subfile = 'INRelationshipType';
 
-    $result = civicrm_api('relationship', 'get', $getParams);
-    $this->documentMe($getParams, $result, __FUNCTION__, __FILE__, $description, $subfile);
+    $result = $this->callAPIAndDocument('relationship', 'get', $getParams, __FUNCTION__, __FILE__, $description, $subfile);
     $this->assertEquals($result['count'], 2);
     $this->AssertEquals(array($rel2['id'], $rel3['id']), array_keys($result['values']));
 
     $description = "demonstrates use of NOT IN filter";
     $subfile = 'NotInRelationshipType';
     $getParams = array(
-        'version' => $this->_apiversion,
         'relationship_type_id' => array('NOT IN' => array($relationType2, $relationType3))
     );
-    $result = civicrm_api('relationship', 'get', $getParams);
-    $this->documentMe($getParams, $result, __FUNCTION__, __FILE__, $description, $subfile);
+    $result = $this->callAPIAndDocument('relationship', 'get', $getParams, __FUNCTION__, __FILE__, $description, $subfile);
     $this->assertEquals($result['count'], 2);
     $this->AssertEquals(array($rel1['id'], $rel4['id']), array_keys($result['values']));
 
     $description = "demonstrates use of BETWEEN filter";
     $subfile = 'BetweenRelationshipType';
     $getParams = array(
-        'version' => $this->_apiversion,
         'relationship_type_id' => array('BETWEEN' => array($relationType2, $relationType4))
     );
-    $result = civicrm_api('relationship', 'get', $getParams);
-    $this->documentMe($getParams, $result, __FUNCTION__, __FILE__, $description, $subfile);
+    $result = $this->callAPIAndDocument('relationship', 'get', $getParams, __FUNCTION__, __FILE__, $description, $subfile);
     $this->assertEquals($result['count'], 3);
     $this->AssertEquals(array($rel2['id'], $rel3['id'], $rel4['id']), array_keys($result['values']));
 
     $description = "demonstrates use of Not BETWEEN filter";
     $subfile = 'NotBetweenRelationshipType';
     $getParams = array(
-        'version' => $this->_apiversion,
         'relationship_type_id' => array('NOT BETWEEN' => array($relationType2, $relationType4))
     );
-    $result = civicrm_api('relationship', 'get', $getParams);
-    $this->documentMe($getParams, $result, __FUNCTION__, __FILE__, $description, $subfile);
+    $result = $this->callAPIAndDocument('relationship', 'get', $getParams, __FUNCTION__, __FILE__, $description, $subfile);
     $this->assertEquals($result['count'], 1);
     $this->AssertEquals(array($rel1['id'],), array_keys($result['values']));
 
@@ -865,20 +786,6 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
     $this->assertEquals('id is not a valid integer', $result['error_message'], 'in line ' . __LINE__);
   }
 
-  ///////////////// civicrm_get_relationships
-
-  /**
-   * check with invalid data
-   */
-  function testGetRelationshipInvalidData() {
-    $contact_a = array('contact_id' => $this->_cId_a);
-    $contact_b = array('contact_id' => $this->_cId_b);
-
-    //no relationship has been created
-    $result = civicrm_api('relationship', 'get', $contact_a, $contact_b, NULL, 'asc');
-    $this->assertAPIFailure($result);
-  }
-
   /**
    * check with valid data with contact_b
    */
@@ -890,24 +797,20 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'start_date' => '2011-01-01',
       'end_date' => '2013-01-01',
       'is_active' => 1,
-      'version' => $this->_apiversion,
     );
 
-    $relationship = civicrm_api('relationship', 'create', $relParams);
+    $relationship = $this->callAPISuccess('relationship', 'create', $relParams);
 
     $contacts = array(
       'contact_id' => $this->_cId_a,
-      'version' => $this->_apiversion,
     );
 
-    $result = civicrm_api('relationship', 'get', $contacts);
-    $this->assertAPISuccess($result, 'in line ' . __LINE__);
+    $result = $this->callAPISuccess('relationship', 'get', $contacts);
     $this->assertGreaterThan(0, $result['count'], 'in line ' . __LINE__);
     $params = array(
       'id' => $relationship['id'],
-      'version' => $this->_apiversion,
     );
-    $result = civicrm_api('relationship', 'delete', $params);
+    $result = $this->callAPISuccess('relationship', 'delete', $params);
     $this->relationshipTypeDelete($this->_relTypeID);
   }
 
@@ -922,25 +825,19 @@ class api_v3_RelationshipTest extends CiviUnitTestCase {
       'start_date' => '2011-01-01',
       'end_date' => '2013-01-01',
       'is_active' => 1,
-      'version' => $this->_apiversion,
     );
 
-    $relationship = civicrm_api('relationship', 'create', $relParams);
+    $relationship = $this->callAPISuccess('relationship', 'create', $relParams);
 
     $contact_a = array(
       'contact_id' => $this->_cId_a,
-      'version' => $this->_apiversion,
     );
-
-    $result = civicrm_api('relationship', 'get', $contact_a);
-
-    $this->assertAPISuccess($result, 'in line ' . __LINE__);
+    $result = $this->callAPISuccess('relationship', 'get', $contact_a);
 
     $params = array(
       'id' => $relationship['id'],
-      'version' => $this->_apiversion,
     );
-    $result = civicrm_api('relationship', 'delete', $params);
+    $result = $this->callAPISuccess('relationship', 'delete', $params);
     $this->relationshipTypeDelete($this->_relTypeID);
   }
 }