CRM-13072 minor tweaks mail settings test

diff --git a/tests/phpunit/api/v3/MailSettingsTest.php b/tests/phpunit/api/v3/MailSettingsTest.php
index dc3882e4e905fb5130f5ef1e17ecf702a6ddb341..c7d48ed24a4acf80f8bbda53a7f44da3d28d9b5f 100644 (file)
--- a/tests/phpunit/api/v3/MailSettingsTest.php
+++ b/tests/phpunit/api/v3/MailSettingsTest.php
@@ -28,13 +28,12 @@
 
 require_once 'CiviTest/CiviUnitTestCase.php';
 class api_v3_MailSettingsTest extends CiviUnitTestCase {
-  protected $_apiversion;
+  protected $_apiversion = 3;
   protected $params;
   protected $id;
   public $DBResetRequired = FALSE;
 
   function setUp() {
-    $this->_apiversion = 3;
     $this->params = array(
       'domain_id' => 1,
       'name' => "my mail setting",
@@ -43,7 +42,6 @@ class api_v3_MailSettingsTest extends CiviUnitTestCase {
       'server' => "localhost",
       'username' => 'sue',
       'password' => 'pass',
-      'version' => $this->_apiversion,
     );
     parent::setUp();
   }
@@ -51,33 +49,24 @@ class api_v3_MailSettingsTest extends CiviUnitTestCase {
   function tearDown() {}
 
   public function testCreateMailSettings() {
-    $result = civicrm_api('MailSettings', 'create', $this->params);
-    $this->documentMe($this->params, $result, __FUNCTION__, __FILE__);
-    $this->assertAPISuccess($result, 'In line ' . __LINE__);
+    $result = $this->callAPIAndDocument('MailSettings', 'create', $this->params, __FUNCTION__, __FILE__);
     $this->assertEquals(1, $result['count'], 'In line ' . __LINE__);
     $this->assertNotNull($result['values'][$result['id']]['id'], 'In line ' . __LINE__);
   }
 
   public function testGetMailSettings() {
 
-    $result = civicrm_api('MailSettings', 'get', $this->params);
-    $this->documentMe($this->params, $result, __FUNCTION__, __FILE__);
-    $this->assertAPISuccess($result, 'In line ' . __LINE__);
+    $result = $this->callAPIAndDocument('MailSettings', 'get', $this->params, __FUNCTION__, __FILE__);
     $this->assertEquals(1, $result['count'], 'In line ' . __LINE__);
     $this->assertNotNull($result['values'][$result['id']]['id'], 'In line ' . __LINE__);
-    $this->id = $result['id'];
   }
 
   public function testDeleteMailSettings() {
-    $entity = civicrm_api('MailSettings', 'get', $this->params);
+    $entity = $this->callAPISuccess('MailSettings', 'get', $this->params);
     $this->assertEquals('setting.com', $entity['values'][$entity['id']]['domain'], 'In line ' . __LINE__);
 
-    $result = civicrm_api('MailSettings', 'delete', array('version' => 3, 'id' => $entity['id']));
-    $this->documentMe($this->params, $result, __FUNCTION__, __FILE__);
-    $this->assertAPISuccess($result, 'In line ' . __LINE__);
-    $checkDeleted = civicrm_api('MailSettings', 'get', array(
-      'version' => 3,
-      ));
+    $result = $this->callAPIAndDocument('MailSettings', 'delete', array('id' => $entity['id']), __FUNCTION__, __FILE__);
+    $checkDeleted = $this->callAPISuccess('MailSettings', 'get', array());
     $this->assertEquals('EXAMPLE.ORG', $checkDeleted['values'][$checkDeleted['id']]['domain'], 'In line ' . __LINE__);
   }
 
@@ -85,15 +74,12 @@ class api_v3_MailSettingsTest extends CiviUnitTestCase {
     $description = "demonstrates get + delete in the same call";
     $subfile     = 'ChainedGetDelete';
     $params      = array(
-      'version' => 3,
       'title' => "MailSettings title",
       'api.MailSettings.delete' => 1,
     );
-    $result = civicrm_api('MailSettings', 'create', $this->params);
-    $result = civicrm_api('MailSettings', 'get', $params);
-    $this->documentMe($params, $result, __FUNCTION__, __FILE__, $description, $subfile);
-    $this->assertAPISuccess($result, 'In line ' . __LINE__);
-    $this->assertEquals(0, civicrm_api('MailSettings', 'getcount', array('version' => 3)), 'In line ' . __LINE__);
+    $result = $this->callAPISuccess('MailSettings', 'create', $this->params);
+    $result = $this->callAPIAndDocument('MailSettings', 'get', $params, __FUNCTION__, __FILE__, $description, $subfile);
+    $this->assertEquals(0, $this->callAPISuccess('MailSettings', 'getcount', array()), 'In line ' . __LINE__);
   }
 }