From 35557e72c8a04669cf62882db82ba5d55874766a Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 16 Mar 2023 22:13:50 +1300
Subject: [PATCH] Minor tidy up in MappingTest

---
 tests/phpunit/api/v3/MappingTest.php | 35 +++++++++++++---------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/tests/phpunit/api/v3/MappingTest.php b/tests/phpunit/api/v3/MappingTest.php
index 4418b8661f..7a592bff6d 100644
--- a/tests/phpunit/api/v3/MappingTest.php
+++ b/tests/phpunit/api/v3/MappingTest.php
@@ -18,16 +18,13 @@
  */
 class api_v3_MappingTest extends CiviUnitTestCase {
 
-  protected $_apiversion = 3;
   protected $params;
   protected $id;
-  protected $_entity;
 
   public function setUp(): void {
     parent::setUp();
-    $this->useTransaction(TRUE);
+    $this->useTransaction();
 
-    $this->_entity = 'mapping';
     $this->params = [
       'name' => 'Mapping name',
       'description' => 'Mapping description',
@@ -36,34 +33,34 @@ class api_v3_MappingTest extends CiviUnitTestCase {
     ];
   }
 
-  public function testCreateMapping() {
-    $result = $this->callAPIAndDocument($this->_entity, 'create', $this->params, __FUNCTION__, __FILE__);
+  public function testCreateMapping(): void {
+    $result = $this->callAPIAndDocument('Mapping', 'create', $this->params, __FUNCTION__, __FILE__);
     $this->assertEquals(1, $result['count']);
-    $this->getAndCheck($this->params, $result['id'], $this->_entity);
+    $this->getAndCheck($this->params, $result['id'], 'Mapping');
     $this->assertNotNull($result['values'][$result['id']]['id']);
   }
 
-  public function testGetMapping() {
-    $result = $this->callAPISuccess($this->_entity, 'create', $this->params);
-    $result = $this->callAPIAndDocument($this->_entity, 'get', $this->params, __FUNCTION__, __FILE__);
+  public function testGetMapping(): void {
+    $this->callAPISuccess('Mapping', 'create', $this->params);
+    $result = $this->callAPIAndDocument('Mapping', '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']]);
+    $this->callAPISuccess('Mapping', 'delete', ['id' => $result['id']]);
   }
 
-  public function testDeleteMapping() {
-    $result = $this->callAPISuccess($this->_entity, 'create', $this->params);
+  public function testDeleteMapping(): void {
+    $result = $this->callAPISuccess('Mapping', 'create', $this->params);
     $deleteParams = ['id' => $result['id']];
-    $result = $this->callAPIAndDocument($this->_entity, 'delete', $deleteParams, __FUNCTION__, __FILE__);
-    $checkDeleted = $this->callAPISuccess($this->_entity, 'get', []);
+    $this->callAPIAndDocument('Mapping', 'delete', $deleteParams, __FUNCTION__, __FILE__);
+    $checkDeleted = $this->callAPISuccess('Mapping', 'get', []);
     $this->assertEquals(0, $checkDeleted['count']);
   }
 
-  public function testDeleteMappingInvalid() {
-    $result = $this->callAPISuccess($this->_entity, 'create', $this->params);
+  public function testDeleteMappingInvalid(): void {
+    $this->callAPISuccess('Mapping', 'create', $this->params);
     $deleteParams = ['id' => 600];
-    $result = $this->callAPIFailure($this->_entity, 'delete', $deleteParams);
-    $checkDeleted = $this->callAPISuccess($this->_entity, 'get', []);
+    $this->callAPIFailure('Mapping', 'delete', $deleteParams);
+    $checkDeleted = $this->callAPISuccess('Mapping', 'get', []);
     $this->assertEquals(1, $checkDeleted['count']);
   }
 
-- 
2.25.1