Coding standards cleanup sprint.

[civicrm-core.git] / tests / phpunit / api / v3 / ActivityContactTest.php

diff --git a/tests/phpunit/api/v3/ActivityContactTest.php b/tests/phpunit/api/v3/ActivityContactTest.php
index 776c3ceb415749e9c9bb9d965ee421343127b9eb..8e77611cc517bfb6799b5f41f4743dfb398342d8 100644 (file)
--- a/tests/phpunit/api/v3/ActivityContactTest.php
+++ b/tests/phpunit/api/v3/ActivityContactTest.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -32,8 +32,8 @@ require_once 'CiviTest/CiviUnitTestCase.php';
 /**
  *  Test APIv3 civicrm_activity_contact* functions
  *
- *  @package CiviCRM_APIv3
- *  @subpackage API_Activity
+ * @package CiviCRM_APIv3
+ * @subpackage API_Activity
  */
 class api_v3_ActivityContactTest extends CiviUnitTestCase {
   protected $_apiversion;
@@ -42,15 +42,15 @@ class api_v3_ActivityContactTest extends CiviUnitTestCase {
   protected $_params;
 
 
-  function setUp() {
+  public function setUp() {
     $this->_apiversion = 3;
     parent::setUp();
+    $this->useTransaction(TRUE);
 
-    $this->_contactID    = $this->organizationCreate();
-    $activity            = $this->activityCreate();
-    $this->_activityID   = $activity['id'];
+    $this->_contactID = $this->organizationCreate();
+    $activity = $this->activityCreate();
+    $this->_activityID = $activity['id'];
     CRM_Core_PseudoConstant::flush();
-    $this->quickCleanup(array('civicrm_activity_contact'));
     $this->_params = array(
       'contact_id' => $this->_contactID,
       'activity_id' => $this->_activityID,
@@ -58,12 +58,6 @@ class api_v3_ActivityContactTest extends CiviUnitTestCase {
     );
   }
 
-  function tearDown() {
-    $params['activity_id'] = $this->_activityID;
-    $this->callAPISuccess('activity', 'delete', $params);
-    $this->contactDelete($this->_contactID);
-  }
-
   public function testCreateActivityContact() {
 
     $result = $this->callAPIAndDocument('activity_contact', 'create', $this->_params, __FUNCTION__, __FILE__);
@@ -77,7 +71,7 @@ class api_v3_ActivityContactTest extends CiviUnitTestCase {
     //create one
     $create = $this->callAPISuccess('activity_contact', 'create', $this->_params);
 
-    $result = $this->callAPIAndDocument('activity_contact', 'delete', array('id' => $create['id'],), __FUNCTION__, __FILE__);
+    $result = $this->callAPIAndDocument('activity_contact', 'delete', array('id' => $create['id']), __FUNCTION__, __FILE__);
     $this->assertEquals(1, $result['count']);
     $get = $this->callAPISuccess('activity_contact', 'get', array(
       'id' => $create['id'],
@@ -85,12 +79,15 @@ class api_v3_ActivityContactTest extends CiviUnitTestCase {
     $this->assertEquals(0, $get['count'], 'ActivityContact not successfully deleted');
   }
 
+  /**
+   *
+   */
   public function testGetActivitiesByContact() {
-    $result = $this->callAPISuccess('ActivityContact', 'Get', array('contact_id' => $this->_contactID));
+    $this->callAPISuccess('ActivityContact', 'Get', array('contact_id' => $this->_contactID));
   }
 
-  public function testGetPartitipantsByActivity() {
-    $result = $this->callAPISuccess('ActivityContact', 'Get', array('activity_id' => $this->_activityID));
+  public function testGetParticipantsByActivity() {
+    $this->callAPISuccess('ActivityContact', 'Get', array('activity_id' => $this->_activityID));
   }
 
   /**
@@ -109,4 +106,3 @@ class api_v3_ActivityContactTest extends CiviUnitTestCase {
     $this->callAPIFailure('ActivityContact', 'Get', array('record_type_id' => 'abc'));
   }
 }
-