fix membershiptypetest

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

diff --git a/tests/phpunit/api/v3/EmailTest.php b/tests/phpunit/api/v3/EmailTest.php
index 6c4e62e64747572d10c01a83e4d827044ad7597f..735be1bb43f9f2b72a05a87fc0a1b5873572c629 100644 (file)
--- a/tests/phpunit/api/v3/EmailTest.php
+++ b/tests/phpunit/api/v3/EmailTest.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
 | CiviCRM version 4.6                                                |
 +--------------------------------------------------------------------+
-| Copyright CiviCRM LLC (c) 2004-2014                                |
+| Copyright CiviCRM LLC (c) 2004-2015                                |
 +--------------------------------------------------------------------+
 | This file is a part of CiviCRM.                                    |
 |                                                                    |
@@ -70,9 +70,9 @@ class api_v3_EmailTest extends CiviUnitTestCase {
     $this->assertEquals(0, $get['count'], 'Contact not successfully deleted In line ' . __LINE__);
 
     $result = $this->callAPIAndDocument('email', 'create', $params, __FUNCTION__, __FILE__);
-    $this->assertEquals(1, $result['count'], 'In line ' . __LINE__);
-    $this->assertNotNull($result['id'], 'In line ' . __LINE__);
-    $this->assertNotNull($result['values'][$result['id']]['id'], 'In line ' . __LINE__);
+    $this->assertEquals(1, $result['count']);
+    $this->assertNotNull($result['id']);
+    $this->assertNotNull($result['values'][$result['id']]['id']);
     $delresult = $this->callAPISuccess('email', 'delete', array('id' => $result['id']));
   }
 
@@ -107,8 +107,8 @@ class api_v3_EmailTest extends CiviUnitTestCase {
 
   public function testCreateEmailWithoutEmail() {
     $result = $this->callAPIFailure('Email', 'Create', array('contact_id' => 4));
-    $this->assertContains('missing', $result['error_message'], 'In line ' . __LINE__);
-    $this->assertContains('email', $result['error_message'], 'In line ' . __LINE__);
+    $this->assertContains('missing', $result['error_message']);
+    $this->assertContains('email', $result['error_message']);
   }
 
   public function testGetEmail() {
@@ -141,7 +141,7 @@ class api_v3_EmailTest extends CiviUnitTestCase {
     $create = $this->callAPISuccess('email', 'create', $params);
 
     $result = $this->callAPIAndDocument('email', 'delete', array('id' => $create['id']), __FUNCTION__, __FILE__);
-    $this->assertEquals(1, $result['count'], 'In line ' . __LINE__);
+    $this->assertEquals(1, $result['count']);
     $get = $this->callAPISuccess('email', 'get', array(
       'location_type_id' => $this->_locationType->id,
     ));
@@ -187,7 +187,7 @@ class api_v3_EmailTest extends CiviUnitTestCase {
       ),
     );
     $replace1 = $this->callAPIAndDocument('email', 'replace', $replace1Params, __FUNCTION__, __FILE__);
-    $this->assertEquals(5, $replace1['count'], 'In line ' . __LINE__);
+    $this->assertEquals(5, $replace1['count']);
 
     // check emails at location #1 or #2
     $get = $this->callAPISuccess('email', 'get', array(
@@ -207,7 +207,7 @@ class api_v3_EmailTest extends CiviUnitTestCase {
       ),
     );
     $replace2 = $this->callAPISuccess('email', 'replace', $replace2Params);
-    $this->assertEquals(1, $replace2['count'], 'In line ' . __LINE__);
+    $this->assertEquals(1, $replace2['count']);
 
     // check emails at location #1 -- all three replaced by one
     $get = $this->callAPISuccess('email', 'get', array(
@@ -230,7 +230,7 @@ class api_v3_EmailTest extends CiviUnitTestCase {
       'values' => array(),
     );
     $replace3 = $this->callAPISuccess('email', 'replace', $replace3Params);
-    $this->assertEquals(0, $replace3['count'], 'In line ' . __LINE__);
+    $this->assertEquals(0, $replace3['count']);
 
     // check emails
     $get = $this->callAPISuccess('email', 'get', array(
@@ -249,7 +249,7 @@ class api_v3_EmailTest extends CiviUnitTestCase {
     ));
     $this->assertAPISuccess($get, 'In line ' . __LINE__);
     $this->assertEquals(0, $get['count'], 'email already exists ' . __LINE__);
-    $description = "example demonstrates use of Replace in a nested API call";
+    $description = "Demonstrates use of Replace in a nested API call.";
     $subfile = "NestedReplaceEmail";
     // initialize email list with three emails at loc #1 and two emails at loc #2
     $getReplace1Params = array(
@@ -286,7 +286,7 @@ class api_v3_EmailTest extends CiviUnitTestCase {
       ),
     );
     $getReplace1 = $this->callAPIAndDocument('contact', 'get', $getReplace1Params, __FUNCTION__, __FILE__, $description, $subfile);
-    $this->assertEquals(5, $getReplace1['values'][$this->_contactID]['api.email.replace']['count'], 'In line ' . __LINE__);
+    $this->assertEquals(5, $getReplace1['values'][$this->_contactID]['api.email.replace']['count']);
 
     // check emails at location #1 or #2
     $get = $this->callAPISuccess('email', 'get', array(
@@ -308,8 +308,8 @@ class api_v3_EmailTest extends CiviUnitTestCase {
       ),
     );
     $getReplace2 = $this->callAPISuccess('contact', 'get', $getReplace2Params);
-    $this->assertEquals(0, $getReplace2['values'][$this->_contactID]['api.email.replace']['is_error'], 'In line ' . __LINE__);
-    $this->assertEquals(1, $getReplace2['values'][$this->_contactID]['api.email.replace']['count'], 'In line ' . __LINE__);
+    $this->assertEquals(0, $getReplace2['values'][$this->_contactID]['api.email.replace']['is_error']);
+    $this->assertEquals(1, $getReplace2['values'][$this->_contactID]['api.email.replace']['count']);
 
     // check emails at location #1 -- all three replaced by one
     $get = $this->callAPISuccess('email', 'get', array(
@@ -347,7 +347,7 @@ class api_v3_EmailTest extends CiviUnitTestCase {
       ),
     );
     $replace1 = $this->callAPISuccess('email', 'replace', $replace1Params);
-    $this->assertEquals(1, $replace1['count'], 'In line ' . __LINE__);
+    $this->assertEquals(1, $replace1['count']);
 
     $keys = array_keys($replace1['values']);
     $emailID = array_shift($keys);
@@ -363,7 +363,7 @@ class api_v3_EmailTest extends CiviUnitTestCase {
       ),
     );
     $replace2 = $this->callAPISuccess('email', 'replace', $replace2Params);
-    $this->assertEquals(1, $replace2['count'], 'In line ' . __LINE__);
+    $this->assertEquals(1, $replace2['count']);
 
     // ensure the 'email' was updated while other fields were preserved
     $get = $this->callAPISuccess('email', 'get', array(
@@ -372,9 +372,9 @@ class api_v3_EmailTest extends CiviUnitTestCase {
     ));
 
     $this->assertEquals(1, $get['count'], 'Incorrect email count at ' . __LINE__);
-    $this->assertEquals(1, $get['values'][$emailID]['is_primary'], 'In line ' . __LINE__);
-    $this->assertEquals(1, $get['values'][$emailID]['on_hold'], 'In line ' . __LINE__);
-    $this->assertEquals('1-2@example.com', $get['values'][$emailID]['email'], 'In line ' . __LINE__);
+    $this->assertEquals(1, $get['values'][$emailID]['is_primary']);
+    $this->assertEquals(1, $get['values'][$emailID]['on_hold']);
+    $this->assertEquals('1-2@example.com', $get['values'][$emailID]['email']);
   }
 
 }