fix spelling error

diff --git a/api/v3/examples/Activity/ContactRefCustomField.php b/api/v3/examples/Activity/ContactRefCustomField.php
index 18a75b92e2926d73b3f2340870f2957267498d38..1140538e09e2494236445af82030c324361ee74c 100644 (file)
--- a/api/v3/examples/Activity/ContactRefCustomField.php
+++ b/api/v3/examples/Activity/ContactRefCustomField.php
@@ -22,7 +22,7 @@ function activity_create_example() {
     'status_id' => 2,
     'priority_id' => 1,
     'duration' => 120,
-    'location' => 'Pensulvania',
+    'location' => 'Pennsylvania',
     'details' => 'a test activity',
     'custom_2' => '1',
   );
@@ -66,7 +66,7 @@ function activity_create_expectedresult() {
         'subject' => 'test activity type id',
         'activity_date_time' => '20110602143613',
         'duration' => '120',
-        'location' => 'Pensulvania',
+        'location' => 'Pennsylvania',
         'phone_id' => '',
         'phone_number' => '',
         'details' => 'a test activity',

diff --git a/api/v3/examples/Activity/ContactRefCustomFieldGet.php b/api/v3/examples/Activity/ContactRefCustomFieldGet.php
index 18273b9bf8612a3f78a0148565d3597f081702e7..2706ac690e0cc1a81940ce5830beebbfbb591753 100644 (file)
--- a/api/v3/examples/Activity/ContactRefCustomFieldGet.php
+++ b/api/v3/examples/Activity/ContactRefCustomFieldGet.php
@@ -57,7 +57,7 @@ function activity_get_expectedresult() {
         'subject' => 'test activity type id',
         'activity_date_time' => '2011-06-02 14:36:13',
         'duration' => '120',
-        'location' => 'Pensulvania',
+        'location' => 'Pennsylvania',
         'details' => 'a test activity',
         'status_id' => '2',
         'priority_id' => '1',

diff --git a/api/v3/examples/Activity/Create.php b/api/v3/examples/Activity/Create.php
index 8fd89f938c24afa36122bfab87afc6503e4965d2..c113f60c75a3bf1786fd3a3f3d958074e3a11812 100644 (file)
--- a/api/v3/examples/Activity/Create.php
+++ b/api/v3/examples/Activity/Create.php
@@ -21,7 +21,7 @@ function activity_create_example() {
     'status_id' => 2,
     'priority_id' => 1,
     'duration' => 120,
-    'location' => 'Pensulvania',
+    'location' => 'Pennsylvania',
     'details' => 'a test activity',
     'custom_1' => 'custom string',
   );
@@ -65,7 +65,7 @@ function activity_create_expectedresult() {
         'subject' => 'test activity type id',
         'activity_date_time' => '20110602143613',
         'duration' => '120',
-        'location' => 'Pensulvania',
+        'location' => 'Pennsylvania',
         'phone_id' => '',
         'phone_number' => '',
         'details' => 'a test activity',

diff --git a/api/v3/examples/Activity/DateTimeHigh.php b/api/v3/examples/Activity/DateTimeHigh.php
index c00406e34243df3e6095a32649f4402e07bf04d4..96dcd45aa299f1522649f6a763533e9514ff370b 100644 (file)
--- a/api/v3/examples/Activity/DateTimeHigh.php
+++ b/api/v3/examples/Activity/DateTimeHigh.php
@@ -58,7 +58,7 @@ function activity_get_expectedresult() {
         'subject' => 'Make-it-Happen Meeting',
         'activity_date_time' => '2011-01-01 00:00:00',
         'duration' => '120',
-        'location' => 'Pensulvania',
+        'location' => 'Pennsylvania',
         'details' => 'a test activity',
         'status_id' => '1',
         'priority_id' => '1',

diff --git a/api/v3/examples/Activity/DateTimeLow.php b/api/v3/examples/Activity/DateTimeLow.php
index 9b5876833c0e22c72779c5ab61edbdae2fa3ad27..6ce14bc41d77bf57f2041e607dc6a16ee6b90268 100644 (file)
--- a/api/v3/examples/Activity/DateTimeLow.php
+++ b/api/v3/examples/Activity/DateTimeLow.php
@@ -57,7 +57,7 @@ function activity_get_expectedresult() {
         'subject' => 'Make-it-Happen Meeting',
         'activity_date_time' => '2012-02-16 00:00:00',
         'duration' => '120',
-        'location' => 'Pensulvania',
+        'location' => 'Pennsylvania',
         'details' => 'a test activity',
         'status_id' => '1',
         'priority_id' => '1',

diff --git a/api/v3/examples/Activity/Get.php b/api/v3/examples/Activity/Get.php
index 41dd137696d71b4254872744c48ebc189dace36a..910611a5e111d7718b54b6c802babe729a4a4f91 100644 (file)
--- a/api/v3/examples/Activity/Get.php
+++ b/api/v3/examples/Activity/Get.php
@@ -57,7 +57,7 @@ function activity_get_expectedresult() {
         'id' => '1',
         'activity_type_id' => '51',
         'subject' => 'test activity type id',
-        'location' => 'Pensulvania',
+        'location' => 'Pennsylvania',
         'activity_date_time' => '2011-06-02 14:36:13',
         'details' => 'a test activity',
         'status_id' => '2',

diff --git a/api/v3/examples/Activity/GetTargetandAssignee.php b/api/v3/examples/Activity/GetTargetandAssignee.php
index b309ada5abe7f9c6c837a5948e9b2f7f43ada351..07ca9e88ff08749603950479c3e8cb1e18cb091e 100644 (file)
--- a/api/v3/examples/Activity/GetTargetandAssignee.php
+++ b/api/v3/examples/Activity/GetTargetandAssignee.php
@@ -19,7 +19,7 @@ function activity__example() {
     'subject' => 'Make-it-Happen Meeting',
     'activity_date_time' => '20110316',
     'duration' => 120,
-    'location' => 'Pensulvania',
+    'location' => 'Pennsylvania',
     'details' => 'a test activity',
     'status_id' => 1,
     'activity_type_id' => 1,
@@ -67,7 +67,7 @@ function activity__expectedresult() {
         'subject' => 'Make-it-Happen Meeting',
         'activity_date_time' => '20110316000000',
         'duration' => '120',
-        'location' => 'Pensulvania',
+        'location' => 'Pennsylvania',
         'phone_id' => '',
         'phone_number' => '',
         'details' => 'a test activity',

diff --git a/api/v3/examples/Activity/ReturnAssigneeContact.php b/api/v3/examples/Activity/ReturnAssigneeContact.php
index e3e4cea2cc398a58a6122d3c33c2321c3fc4bf50..6428eef0241cc382bb74f448041c13c1bf48a8e0 100644 (file)
--- a/api/v3/examples/Activity/ReturnAssigneeContact.php
+++ b/api/v3/examples/Activity/ReturnAssigneeContact.php
@@ -61,7 +61,7 @@ function activity_get_expectedresult() {
         'subject' => 'test activity type id',
         'activity_date_time' => '2011-06-02 14:36:13',
         'duration' => '120',
-        'location' => 'Pensulvania',
+        'location' => 'Pennsylvania',
         'details' => 'a test activity',
         'status_id' => '2',
         'priority_id' => '1',

diff --git a/tests/phpunit/api/v3/ActivityTest.php b/tests/phpunit/api/v3/ActivityTest.php
index 03b24655d05cc29a78e55a2e058a1374ae864833..7ffdf55fcfc279b02f095fab1d4f54dc7d738d79 100644 (file)
--- a/tests/phpunit/api/v3/ActivityTest.php
+++ b/tests/phpunit/api/v3/ActivityTest.php
@@ -49,13 +49,13 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
   protected $_contactID;
 
   /**
-   *  Test setup for every test
+   *  Test setup for every test.
    *
    *  Connect to the database, truncate the tables that will be used
    *  and redirect stdin to a temporary file
    */
   public function setUp() {
-    //  Connect to the database
+    // Connect to the database
     parent::setUp();
 
     $this->_contactID = $this->individualCreate();
@@ -76,7 +76,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'status_id' => 2,
       'priority_id' => 1,
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity',
     );
     $this->_params2 = array(
@@ -95,6 +95,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
 
   /**
    * Tears down the fixture, for example, closes a network connection.
+   *
    * This method is called after a test is executed.
    */
   public function tearDown() {
@@ -108,10 +109,10 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
   }
 
   /**
-   * Check with empty array
+   * Check fails with empty array.
    */
   public function testActivityCreateEmpty() {
-    $result = $this->callAPIFailure('activity', 'create', array());
+    $this->callAPIFailure('activity', 'create', array());
   }
 
   /**
@@ -135,7 +136,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'subject' => 'Test activity',
       'activity_date_time' => date('Ymd'),
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity',
       'status_id' => 1,
       'activity_name' => 'Fubar activity type',
@@ -154,7 +155,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'subject' => 'Make-it-Happen Meeting',
       'activity_date_time' => date('Ymd'),
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity',
       'status_id' => 1,
       'activity_name' => 'Test activity type',
@@ -164,7 +165,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
   }
 
   /**
-   *  Test civicrm_activity_id() with non-numeric source_contact_id
+   *  Test civicrm_activity_id() with non-numeric source_contact_id.
    */
   public function testActivityCreateWithNonNumericContactId() {
     $params = array(
@@ -172,13 +173,13 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'subject' => 'Make-it-Happen Meeting',
       'activity_date_time' => date('Ymd'),
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity',
       'status_id' => 1,
       'activity_name' => 'Test activity type',
     );
 
-    $result = $this->callAPIFailure('activity', 'create', $params);
+    $this->callAPIFailure('activity', 'create', $params);
   }
 
   /**
@@ -192,7 +193,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'subject' => 'Make-it-Happen Meeting',
       'activity_date_time' => date('Ymd'),
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity',
       'status_id' => 1,
       'activity_type_id' => 'Invalid Test activity type',
@@ -202,7 +203,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
   }
 
   /**
-   * Check with incorrect required fields
+   * Check with incorrect required fields.
    */
   public function testActivityCreateWithUnknownActivityTypeId() {
     $params = array(
@@ -210,7 +211,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'subject' => 'Make-it-Happen Meeting',
       'activity_date_time' => date('Ymd'),
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity',
       'status_id' => 1,
       'activity_type_id' => 699,
@@ -225,7 +226,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'subject' => 'Make-it-Happen Meeting',
       'activity_date_time' => date('Ymd'),
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity',
       'status_id' => 1,
       'priority_id' => 44,
@@ -238,13 +239,16 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
   }
 
 
+  /**
+   * Test create succeeds with valid string for priority.
+   */
   public function testActivityCreateWithValidStringPriority() {
     $params = array(
       'source_contact_id' => $this->_contactID,
       'subject' => 'Make-it-Happen Meeting',
       'activity_date_time' => date('Ymd'),
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity',
       'status_id' => 1,
       'priority_id' => 'Urgent',
@@ -255,53 +259,54 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
     $this->assertEquals(1, $result['values'][$result['id']]['priority_id']);
   }
 
+  /**
+   * Test create fails with invalid priority string.
+   */
   public function testActivityCreateWithInValidStringPriority() {
     $params = array(
       'source_contact_id' => $this->_contactID,
       'subject' => 'Make-it-Happen Meeting',
       'activity_date_time' => date('Ymd'),
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity',
       'status_id' => 1,
       'priority_id' => 'ergUrgent',
       'activity_type_id' => 1,
     );
 
-    $result = $this->callAPIFailure('activity', 'create', $params,
+    $this->callAPIFailure('activity', 'create', $params,
       "'ergUrgent' is not a valid option for field priority_id");
   }
 
   /**
-   *  Test civicrm_activity_create() with valid parameters
+   * Test civicrm_activity_create() with valid parameters.
    */
   public function testActivityCreate() {
 
-    $result = $this->callAPISuccess('activity', 'create', $this->_params);
+    $this->callAPISuccess('activity', 'create', $this->_params);
     $result = $this->callAPISuccess('activity', 'get', $this->_params);
-    $this->assertEquals($result['values'][$result['id']]['duration'], 120, 'in line ' . __LINE__);
-    $this->assertEquals($result['values'][$result['id']]['subject'], 'test activity type id', 'in line ' . __LINE__);
-    $this->assertEquals($result['values'][$result['id']]['activity_date_time'], '2011-06-02 14:36:13', 'in line ' . __LINE__);
-    $this->assertEquals($result['values'][$result['id']]['location'], 'Pensulvania', 'in line ' . __LINE__);
-    $this->assertEquals($result['values'][$result['id']]['details'], 'a test activity', 'in line ' . __LINE__);
-    $this->assertEquals($result['values'][$result['id']]['status_id'], 2, 'in line ' . __LINE__);
-    $this->assertEquals($result['values'][$result['id']]['id'], $result['id'], 'in line ' . __LINE__);
+    $this->assertEquals($result['values'][$result['id']]['duration'], 120);
+    $this->assertEquals($result['values'][$result['id']]['subject'], 'test activity type id');
+    $this->assertEquals($result['values'][$result['id']]['activity_date_time'], '2011-06-02 14:36:13');
+    $this->assertEquals($result['values'][$result['id']]['location'], 'Pennsylvania');
+    $this->assertEquals($result['values'][$result['id']]['details'], 'a test activity');
+    $this->assertEquals($result['values'][$result['id']]['status_id'], 2);
+    $this->assertEquals($result['values'][$result['id']]['id'], $result['id']);
   }
 
   /**
-   *  Test civicrm_activity_create() with valid parameters - use type_id
+   *  Test civicrm_activity_create() with valid parameters - use type_id.
    */
   public function testActivityCreateCampaignTypeID() {
     $this->enableCiviCampaign();
 
-    $defaults = array();
-
     $params = array(
       'source_contact_id' => $this->_contactID,
       'subject' => 'Make-it-Happen Meeting',
       'activity_date_time' => '20110316',
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity',
       'status_id' => 1,
       'activity_type_id' => 29,
@@ -309,18 +314,19 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
     );
 
     $result = $this->callAPISuccess('activity', 'create', $params);
-    //todo test target & assignee are set
 
-    //$this->assertEquals($result['values'][$result['id']]['source_contact_id'], $this->_contactID, 'in line ' . __LINE__);
     $result = $this->callAPISuccess('activity', 'get', array('id' => $result['id']));
-    $this->assertEquals($result['values'][$result['id']]['duration'], 120, 'in line ' . __LINE__);
-    $this->assertEquals($result['values'][$result['id']]['subject'], 'Make-it-Happen Meeting', 'in line ' . __LINE__);
-    $this->assertEquals($result['values'][$result['id']]['activity_date_time'], '2011-03-16 00:00:00', 'in line ' . __LINE__);
-    $this->assertEquals($result['values'][$result['id']]['location'], 'Pensulvania', 'in line ' . __LINE__);
-    $this->assertEquals($result['values'][$result['id']]['details'], 'a test activity', 'in line ' . __LINE__);
-    $this->assertEquals($result['values'][$result['id']]['status_id'], 1, 'in line ' . __LINE__);
+    $this->assertEquals($result['values'][$result['id']]['duration'], 120);
+    $this->assertEquals($result['values'][$result['id']]['subject'], 'Make-it-Happen Meeting');
+    $this->assertEquals($result['values'][$result['id']]['activity_date_time'], '2011-03-16 00:00:00');
+    $this->assertEquals($result['values'][$result['id']]['location'], 'Pennsylvania');
+    $this->assertEquals($result['values'][$result['id']]['details'], 'a test activity');
+    $this->assertEquals($result['values'][$result['id']]['status_id'], 1);
   }
 
+  /**
+   * Test get returns target and assignee contacts.
+   */
   public function testActivityReturnTargetAssignee() {
 
     $description = "Example demonstrates setting & retrieving the target & source";
@@ -330,7 +336,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'subject' => 'Make-it-Happen Meeting',
       'activity_date_time' => '20110316',
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity',
       'status_id' => 1,
       'activity_type_id' => 1,
@@ -347,14 +353,14 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'return.target_contact_id' => 1,
     ));
 
-    $this->assertEquals($this->_contactID, $result['values'][$result['id']]['assignee_contact_id'][0], 'in line ' . __LINE__);
-    $this->assertEquals($this->_contactID, $result['values'][$result['id']]['target_contact_id'][0], 'in line ' . __LINE__);
+    $this->assertEquals($this->_contactID, $result['values'][$result['id']]['assignee_contact_id'][0]);
+    $this->assertEquals($this->_contactID, $result['values'][$result['id']]['target_contact_id'][0]);
   }
 
+  /**
+   * Test civicrm_activity_create() using example code.
+   */
   public function testActivityCreateExample() {
-    /**
-     *  Test civicrm_activity_create() using example code
-     */
     require_once 'api/v3/examples/Activity/Create.php';
     $result = activity_create_example();
     $expectedResult = activity_create_expectedresult();
@@ -362,8 +368,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
   }
 
   /**
-   *  Test civicrm_activity_create() with valid parameters
-   *  and some custom data
+   *  Test civicrm_activity_create() with valid parameters and custom data.
    */
   public function testActivityCreateCustom() {
     $ids = $this->entityCustomGroupWithSingleFieldCreate(__FUNCTION__, __FILE__);
@@ -372,7 +377,6 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
     $result = $this->callAPIAndDocument($this->_entity, 'create', $params, __FUNCTION__, __FILE__);
     $result = $this->callAPISuccess($this->_entity, 'get', array(
       'return.custom_' . $ids['custom_field_id'] => 1,
-      'version' => 3,
       'id' => $result['id'],
     ));
     $this->assertEquals("custom string", $result['values'][$result['id']]['custom_' . $ids['custom_field_id']], ' in line ' . __LINE__);
@@ -382,8 +386,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
   }
 
   /**
-   *  Test civicrm_activity_create() with valid parameters
-   *  and some custom data
+   *  Test civicrm_activity_create() with valid parameters and custom data.
    */
   public function testActivityCreateCustomContactRefField() {
 
@@ -412,7 +415,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'id' => $result['id'],
     ), __FUNCTION__, __FILE__, 'Get with Contact Ref Custom Field', 'ContactRefCustomFieldGet', 'get');
 
-    $this->assertEquals('Anderson, Anthony', $result['values'][$result['id']]['custom_' . $customField['id']], ' in line ' . __LINE__);
+    $this->assertEquals('Anderson, Anthony', $result['values'][$result['id']]['custom_' . $customField['id']]);
     $this->assertEquals($this->_contactID, $result['values'][$result['id']]['custom_' . $customField['id'] . "_id"], ' in line ' . __LINE__);
     $this->assertEquals('Anderson, Anthony', $result['values'][$result['id']]['custom_' . $customField['id'] . '_1'], ' in line ' . __LINE__);
     $this->assertEquals($this->_contactID, $result['values'][$result['id']]['custom_' . $customField['id'] . "_1_id"], ' in line ' . __LINE__);
@@ -421,7 +424,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
   }
 
   /**
-   *  Test civicrm_activity_create() with an invalid text status_id
+   * Test civicrm_activity_create() with an invalid text status_id.
    */
   public function testActivityCreateBadTextStatus() {
 
@@ -430,17 +433,17 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'subject' => 'Discussion on Apis for v3',
       'activity_date_time' => date('Ymd'),
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity',
       'status_id' => 'Invalid',
       'activity_name' => 'Test activity type',
     );
 
-    $result = $this->callAPIFailure('activity', 'create', $params);
+    $this->callAPIFailure('activity', 'create', $params);
   }
 
   /**
-   *  Test civicrm_activity_create() with an invalid text status_id
+   * Test civicrm_activity_create() with an invalid text status_id.
    */
   public function testActivityCreateSupportActivityStatus() {
 
@@ -449,7 +452,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'subject' => 'Discussion on Apis for v3',
       'activity_date_time' => date('Ymd'),
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity',
       'activity_status_id' => 'Invalid',
       'activity_name' => 'Test activity type',
@@ -461,8 +464,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
 
 
   /**
-   *  Test civicrm_activity_create() with valid parameters,
-   *  using a text status_id
+   * Test civicrm_activity_create() with using a text status_id.
    */
   public function testActivityCreateTextStatus() {
 
@@ -471,18 +473,18 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'subject' => 'Make-it-Happen Meeting',
       'activity_date_time' => date('Ymd'),
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity',
       'status_id' => 'Scheduled',
       'activity_name' => 'Test activity type',
     );
 
     $result = $this->callAPISuccess('activity', 'create', $params);
-    $this->assertEquals($result['values'][$result['id']]['duration'], 120, 'in line ' . __LINE__);
-    $this->assertEquals($result['values'][$result['id']]['subject'], 'Make-it-Happen Meeting', 'in line ' . __LINE__);
-    $this->assertEquals($result['values'][$result['id']]['activity_date_time'], date('Ymd') . '000000', 'in line ' . __LINE__);
-    $this->assertEquals($result['values'][$result['id']]['location'], 'Pensulvania', 'in line ' . __LINE__);
-    $this->assertEquals($result['values'][$result['id']]['details'], 'a test activity', 'in line ' . __LINE__);
+    $this->assertEquals($result['values'][$result['id']]['duration'], 120);
+    $this->assertEquals($result['values'][$result['id']]['subject'], 'Make-it-Happen Meeting');
+    $this->assertEquals($result['values'][$result['id']]['activity_date_time'], date('Ymd') . '000000');
+    $this->assertEquals($result['values'][$result['id']]['location'], 'Pennsylvania');
+    $this->assertEquals($result['values'][$result['id']]['details'], 'a test activity');
   }
 
   /**
@@ -496,8 +498,8 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
    *  Test civicrm_activity_get() with a good activity ID
    */
   public function testActivityGetGoodID1() {
-    //  Insert rows in civicrm_activity creating activities 4 and
-    //  13
+    // Insert rows in civicrm_activity creating activities 4 and
+    // 13
     $description = "Function demonstrates getting asignee_contact_id & using it to get the contact";
     $subfile = 'ReturnAssigneeContact';
     $activity = $this->callAPISuccess('activity', 'create', $this->_params);
@@ -543,7 +545,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'subject' => 'Make-it-Happen Meeting',
       'activity_date_time' => '20110316',
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity',
       'status_id' => 1,
       'activity_name' => 'Test activity type',
@@ -616,7 +618,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'subject' => 'Make-it-Happen Meeting',
       'activity_date_time' => '20110316',
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity',
       'status_id' => 1,
       'activity_name' => 'Test activity type',
@@ -648,7 +650,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'subject' => 'Make-it-Happen Meeting',
       'activity_date_time' => '20110101',
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity',
       'status_id' => 1,
       'activity_name' => 'Test activity type',
@@ -670,10 +672,10 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'sequential' => 1,
     );
     $result = $this->callAPIAndDocument('Activity', 'Get', $params, __FUNCTION__, __FILE__, $description, $subfile);
-    $this->assertEquals(1, $result['count'], 'in line ' . __LINE__);
+    $this->assertEquals(1, $result['count']);
     $description = "demonstrates _high filter (at time of writing doesn't work if contact_id is set";
     $subfile = "DateTimeHigh";
-    $this->assertEquals('2012-02-16 00:00:00', $result['values'][0]['activity_date_time'], 'in line ' . __LINE__);
+    $this->assertEquals('2012-02-16 00:00:00', $result['values'][0]['activity_date_time']);
     $params = array(
       'source_contact_id' => $this->_contactID,
       'version' => 3,
@@ -683,7 +685,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
     $result = $this->callAPIAndDocument('Activity', 'Get', $params, __FUNCTION__, __FILE__, $description, $subfile);
 
     $this->assertEquals(1, $result['count']);
-    $this->assertEquals('2011-01-01 00:00:00', $result['values'][0]['activity_date_time'], 'in line ' . __LINE__);
+    $this->assertEquals('2011-01-01 00:00:00', $result['values'][0]['activity_date_time']);
 
     $this->callAPISuccess('Activity', 'Delete', array('version' => 3, 'id' => $activityOne['id']));
     $this->callAPISuccess('Activity', 'Delete', array('version' => 3, 'id' => $activityTwo['id']));
@@ -699,9 +701,9 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
     $params = $this->_params;
     $params['custom_' . $ids['custom_field_id']] = "custom string";
 
-    $result = $this->callAPISuccess($this->_entity, 'create', $params);
+    $this->callAPISuccess($this->_entity, 'create', $params);
 
-    //  Retrieve the test value
+    // Retrieve the test value.
     $params = array(
       'activity_type_id' => $this->test_activity_type_value,
       'sequential' => 1,
@@ -727,7 +729,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
     $params['custom_' . $ids['custom_field_id']] = "custom string";
 
     $result = $this->callAPISuccess($this->_entity, 'create', $params);
-    //  Retrieve the test value
+    // Retrieve the test value
     $params = array(
       'contact_id' => $this->_params['source_contact_id'],
       'activity_type_id' => $this->test_activity_type_value,
@@ -739,19 +741,19 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
 
     $this->assertEquals($this->test_activity_type_value, $result['values'][0]['activity_type_id'], 'In line ' . __LINE__);
     $this->assertEquals('test activity type id', $result['values'][0]['subject'], 'In line ' . __LINE__);
-    $this->assertEquals($result['values'][0]['id'], $result['id'], 'in line ' . __LINE__);
+    $this->assertEquals($result['values'][0]['id'], $result['id']);
   }
 
   /**
-   * Check activity deletion with empty params
+   * Check activity deletion with empty params.
    */
   public function testDeleteActivityForEmptyParams() {
     $params = array('version' => $this->_apiversion);
-    $result = $this->callAPIFailure('activity', 'delete', $params);
+    $this->callAPIFailure('activity', 'delete', $params);
   }
 
   /**
-   * Check activity deletion without activity id
+   * Check activity deletion without activity id.
    */
   public function testDeleteActivityWithoutId() {
     $params = array(
@@ -872,14 +874,14 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
 
     $params = $this->_params;
 
-    //  Create an activity with custom data
+    // Create an activity with custom data
     //this has been updated from the previous 'old format' function - need to make it work
     $params = array(
       'source_contact_id' => $this->_contactID,
       'subject' => 'Make-it-Happen Meeting',
       'activity_date_time' => '2009-10-18',
       'duration' => 120,
-      'location' => 'Pensulvania',
+      'location' => 'Pennsylvania',
       'details' => 'a test activity to check the update api',
       'status_id' => 1,
       'activity_name' => 'Test activity type',
@@ -894,12 +896,12 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'version' => 3,
       'id' => $result['id'],
     ));
-    $this->assertEquals("custom string", $result['values'][$result['id']]['custom_' . $ids['custom_field_id']], ' in line ' . __LINE__);
-    $this->assertEquals("2009-10-18 00:00:00", $result['values'][$result['id']]['activity_date_time'], ' in line ' . __LINE__);
+    $this->assertEquals("custom string", $result['values'][$result['id']]['custom_' . $ids['custom_field_id']]);
+    $this->assertEquals("2009-10-18 00:00:00", $result['values'][$result['id']]['activity_date_time']);
     $fields = $this->callAPISuccess('activity', 'getfields', array('version' => $this->_apiversion));
     $this->assertTrue(is_array($fields['values']['custom_' . $ids['custom_field_id']]));
 
-    //  Update the activity with custom data
+    // Update the activity with custom data.
     $params = array(
       'id' => $activityId,
       'source_contact_id' => $this->_contactID,
@@ -918,7 +920,7 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'version' => 3,
       'id' => $result['id'],
     ));
-    $this->assertEquals("Updated my test data", $result['values'][$result['id']]['custom_' . $ids['custom_field_id']], ' in line ' . __LINE__);
+    $this->assertEquals("Updated my test data", $result['values'][$result['id']]['custom_' . $ids['custom_field_id']]);
   }
 
   /**
@@ -1077,8 +1079,8 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
    */
   public function testActivityUpdateKeepSource() {
     $activity = $this->callAPISuccess('activity', 'create', $this->_params);
-    //  Updating the activity but not providing anything for the source contact
-    //  (It was set as $this->_contactID earlier.)
+    // Updating the activity but not providing anything for the source contact
+    // (It was set as $this->_contactID earlier.)
     $params = array(
       'id' => $activity['id'],
       'subject' => 'Updated Make-it-Happen Meeting',
@@ -1100,22 +1102,22 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
   public function testActivitiesContactGet() {
     $activity = $this->callAPISuccess('activity', 'create', $this->_params);
     $activity2 = $this->callAPISuccess('activity', 'create', $this->_params2);
-    //  Get activities associated with contact $this->_contactID
+    // Get activities associated with contact $this->_contactID.
     $params = array(
       'contact_id' => $this->_contactID,
     );
     $result = $this->callAPISuccess('activity', 'get', $params);
 
     $this->assertEquals(2, $result['count'], 'In line ' . __LINE__);
-    $this->assertEquals($this->test_activity_type_value, $result['values'][$activity['id']]['activity_type_id'], 'In line ' . __LINE__);
-    $this->assertEquals('Test activity type', $result['values'][$activity['id']]['activity_name'], 'In line ' . __LINE__);
-    $this->assertEquals('Test activity type', $result['values'][$activity2['id']]['activity_name'], 'In line ' . __LINE__);
+    $this->assertEquals($this->test_activity_type_value, $result['values'][$activity['id']]['activity_type_id']);
+    $this->assertEquals('Test activity type', $result['values'][$activity['id']]['activity_name']);
+    $this->assertEquals('Test activity type', $result['values'][$activity2['id']]['activity_name']);
   }
 
   /**
-   * test chained Activity format
+   * Test chained Activity format.
    */
-  public function testchainedActivityGet() {
+  public function testChainedActivityGet() {
 
     $activity = $this->callAPISuccess('Contact', 'Create', array(
       'display_name' => "bob brown",
@@ -1142,15 +1144,15 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
   }
 
   /**
-   *  Test civicrm_activity_contact_get() with invalid Contact Id
+   * Test civicrm_activity_contact_get() with invalid Contact ID.
    */
   public function testActivitiesContactGetWithInvalidContactId() {
     $params = array('contact_id' => 'contact');
-    $result = $this->callAPIFailure('activity', 'get', $params);
+    $this->callAPIFailure('activity', 'get', $params);
   }
 
   /**
-   *  Test civicrm_activity_contact_get() with contact having no Activity
+   * Test civicrm_activity_contact_get() with contact having no Activity.
    */
   public function testActivitiesContactGetHavingNoActivity() {
     $params = array(
@@ -1165,16 +1167,18 @@ class api_v3_ActivityTest extends CiviUnitTestCase {
       'contact_id' => $contact['id'],
     );
     $result = $this->callAPISuccess('activity', 'get', $params);
-    $this->assertEquals($result['count'], 0, 'in line ' . __LINE__);
+    $this->assertEquals($result['count'], 0);
   }
 
+  /**
+   * Test getfields function.
+   */
   public function testGetFields() {
     $params = array('action' => 'create');
     $result = $this->callAPIAndDocument('activity', 'getfields', $params, __FUNCTION__, __FILE__, NULL, NULL, 'getfields');
-    $this->assertTrue(is_array($result['values']), 'get fields doesnt return values array in line ' . __LINE__);
-    // $this->assertTrue(is_array($result['values']['priority_id']['options']));
+    $this->assertTrue(is_array($result['values']), 'get fields doesn\'t return values array');
     foreach ($result['values'] as $key => $value) {
-      $this->assertTrue(is_array($value), $key . " is not an array in line " . __LINE__);
+      $this->assertTrue(is_array($value), $key . " is not an array");
     }
   }