From f19fee1083bd03253d8df2b791a228756ff8ed65 Mon Sep 17 00:00:00 2001
From: Aidan Saunders <aidan.saunders@squiffle.uk>
Date: Sat, 27 Jul 2019 07:09:38 +0100
Subject: [PATCH] Small test fixes/standardisations.

---
 tests/phpunit/api/v3/ImTest.php     | 19 ++++++++-----------
 tests/phpunit/api/v3/OpenIDTest.php | 16 ++++++++--------
 tests/phpunit/api/v3/PhoneTest.php  |  2 ++
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/tests/phpunit/api/v3/ImTest.php b/tests/phpunit/api/v3/ImTest.php
index f918b333a8..ae900b9765 100644
--- a/tests/phpunit/api/v3/ImTest.php
+++ b/tests/phpunit/api/v3/ImTest.php
@@ -33,11 +33,8 @@
  * @group headless
  */
 class api_v3_ImTest extends CiviUnitTestCase {
-
-  protected $params;
-
+  protected $_params;
   protected $id;
-
   protected $_entity;
 
   public $DBResetRequired = FALSE;
@@ -48,7 +45,7 @@ class api_v3_ImTest extends CiviUnitTestCase {
 
     $this->_entity = 'im';
     $this->_contactID = $this->organizationCreate();
-    $this->params = [
+    $this->_params = [
       'contact_id' => $this->_contactID,
       'name' => 'My Yahoo IM Handle',
       'location_type_id' => 1,
@@ -65,9 +62,9 @@ class api_v3_ImTest extends CiviUnitTestCase {
    */
   public function testCreateIm($version) {
     $this->_apiversion = $version;
-    $result = $this->callAPIAndDocument($this->_entity, 'create', $this->params, __FUNCTION__, __FILE__);
+    $result = $this->callAPIAndDocument($this->_entity, 'create', $this->_params, __FUNCTION__, __FILE__);
     $this->assertEquals(1, $result['count']);
-    $this->getAndCheck($this->params, $result['id'], $this->_entity);
+    $this->getAndCheck($this->_params, $result['id'], $this->_entity);
     $this->assertNotNull($result['values'][$result['id']]['id']);
   }
 
@@ -94,8 +91,8 @@ class api_v3_ImTest extends CiviUnitTestCase {
    */
   public function testGetIm($version) {
     $this->_apiversion = $version;
-    $this->callAPISuccess($this->_entity, 'create', $this->params);
-    $result = $this->callAPIAndDocument($this->_entity, 'get', $this->params, __FUNCTION__, __FILE__);
+    $this->callAPISuccess($this->_entity, 'create', $this->_params);
+    $result = $this->callAPIAndDocument($this->_entity, 'get', $this->_params, __FUNCTION__, __FILE__);
     $this->assertEquals(1, $result['count']);
     $this->assertNotNull($result['values'][$result['id']]['id']);
     $this->callAPISuccess($this->_entity, 'delete', ['id' => $result['id']]);
@@ -108,7 +105,7 @@ class api_v3_ImTest extends CiviUnitTestCase {
    */
   public function testDeleteIm($version) {
     $this->_apiversion = $version;
-    $result = $this->callAPISuccess($this->_entity, 'create', $this->params);
+    $result = $this->callAPISuccess($this->_entity, 'create', $this->_params);
     $deleteParams = ['id' => $result['id']];
     $this->callAPIAndDocument($this->_entity, 'delete', $deleteParams, __FUNCTION__, __FILE__);
     $checkDeleted = $this->callAPISuccess($this->_entity, 'get', []);
@@ -119,7 +116,7 @@ class api_v3_ImTest extends CiviUnitTestCase {
    * Skip api4 test - delete behaves differently
    */
   public function testDeleteImInvalid() {
-    $this->callAPISuccess($this->_entity, 'create', $this->params);
+    $this->callAPISuccess($this->_entity, 'create', $this->_params);
     $deleteParams = ['id' => 600];
     $this->callAPIFailure($this->_entity, 'delete', $deleteParams);
     $checkDeleted = $this->callAPISuccess($this->_entity, 'get', []);
diff --git a/tests/phpunit/api/v3/OpenIDTest.php b/tests/phpunit/api/v3/OpenIDTest.php
index 062ee4a626..07fe22c9df 100644
--- a/tests/phpunit/api/v3/OpenIDTest.php
+++ b/tests/phpunit/api/v3/OpenIDTest.php
@@ -35,7 +35,7 @@
 class api_v3_OpenIDTest extends CiviUnitTestCase {
 
   protected $_apiversion = 3;
-  protected $params;
+  protected $_params;
   protected $id;
   protected $_entity;
 
@@ -47,7 +47,7 @@ class api_v3_OpenIDTest extends CiviUnitTestCase {
 
     $this->_entity = 'OpenID';
     $this->_contactID = $this->organizationCreate();
-    $this->params = [
+    $this->_params = [
       'contact_id' => $this->_contactID,
       'openid' => 'My OpenID handle',
       'location_type_id' => 1,
@@ -60,9 +60,9 @@ class api_v3_OpenIDTest extends CiviUnitTestCase {
    */
   public function testCreateOpenID($version) {
     $this->_apiversion = $version;
-    $result = $this->callAPIAndDocument($this->_entity, 'create', $this->params, __FUNCTION__, __FILE__);
+    $result = $this->callAPIAndDocument($this->_entity, 'create', $this->_params, __FUNCTION__, __FILE__);
     $this->assertEquals(1, $result['count'], 'In line ' . __LINE__);
-    $this->getAndCheck($this->params, $result['id'], $this->_entity);
+    $this->getAndCheck($this->_params, $result['id'], $this->_entity);
     $this->assertNotNull($result['values'][$result['id']]['id'], 'In line ' . __LINE__);
   }
 
@@ -88,8 +88,8 @@ class api_v3_OpenIDTest extends CiviUnitTestCase {
    */
   public function testGetOpenID($version) {
     $this->_apiversion = $version;
-    $result = $this->callAPISuccess($this->_entity, 'create', $this->params);
-    $result = $this->callAPIAndDocument($this->_entity, 'get', $this->params, __FUNCTION__, __FILE__);
+    $result = $this->callAPISuccess($this->_entity, 'create', $this->_params);
+    $result = $this->callAPIAndDocument($this->_entity, 'get', $this->_params, __FUNCTION__, __FILE__);
     $this->assertEquals(1, $result['count'], 'In line ' . __LINE__);
     $this->assertNotNull($result['values'][$result['id']]['id'], 'In line ' . __LINE__);
     $this->callAPISuccess($this->_entity, 'delete', ['id' => $result['id']]);
@@ -101,7 +101,7 @@ class api_v3_OpenIDTest extends CiviUnitTestCase {
    */
   public function testDeleteOpenID($version) {
     $this->_apiversion = $version;
-    $result = $this->callAPISuccess($this->_entity, 'create', $this->params);
+    $result = $this->callAPISuccess($this->_entity, 'create', $this->_params);
     $deleteParams = ['id' => $result['id']];
     $result = $this->callAPIAndDocument($this->_entity, 'delete', $deleteParams, __FUNCTION__, __FILE__);
     $checkDeleted = $this->callAPISuccess($this->_entity, 'get', []);
@@ -114,7 +114,7 @@ class api_v3_OpenIDTest extends CiviUnitTestCase {
    */
   public function testDeleteOpenIDInvalid($version) {
     $this->_apiversion = $version;
-    $result = $this->callAPISuccess($this->_entity, 'create', $this->params);
+    $result = $this->callAPISuccess($this->_entity, 'create', $this->_params);
     $deleteParams = ['id' => 600];
     $result = $this->callAPIFailure($this->_entity, 'delete', $deleteParams);
     $checkDeleted = $this->callAPISuccess($this->_entity, 'get', []);
diff --git a/tests/phpunit/api/v3/PhoneTest.php b/tests/phpunit/api/v3/PhoneTest.php
index 89eff191ea..edd07e589c 100644
--- a/tests/phpunit/api/v3/PhoneTest.php
+++ b/tests/phpunit/api/v3/PhoneTest.php
@@ -36,8 +36,10 @@ class api_v3_PhoneTest extends CiviUnitTestCase {
   protected $_contactID;
   protected $_locationType;
   protected $_params;
+  protected $_entity;
 
   public function setUp() {
+    $this->_entity = 'Phone';
     parent::setUp();
     $this->useTransaction();
 
-- 
2.25.1