From 9fdf0f42ef1c6929d08d719ed303ce27f7b74855 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 25 Jan 2023 11:30:15 +1300
Subject: [PATCH] Move over testRecords property

---
 Civi/Test/Api4TestTrait.php           |  7 +++++++
 tests/phpunit/api/v4/Api4TestBase.php | 12 ++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Civi/Test/Api4TestTrait.php b/Civi/Test/Api4TestTrait.php
index fa88143042..aef2f3df78 100644
--- a/Civi/Test/Api4TestTrait.php
+++ b/Civi/Test/Api4TestTrait.php
@@ -16,6 +16,13 @@ use Civi\Api4\Utils\CoreUtil;
  */
 trait Api4TestTrait {
 
+  /**
+   * Records created which will be deleted during tearDown
+   *
+   * @var array
+   */
+  private $testRecords = [];
+
   /**
    * Inserts a test record, supplying all required values if not provided.
    *
diff --git a/tests/phpunit/api/v4/Api4TestBase.php b/tests/phpunit/api/v4/Api4TestBase.php
index 11f8800fe0..eb4f904bbb 100644
--- a/tests/phpunit/api/v4/Api4TestBase.php
+++ b/tests/phpunit/api/v4/Api4TestBase.php
@@ -20,6 +20,7 @@
 namespace api\v4;
 
 use Civi\Api4\UFMatch;
+use Civi\Test;
 use Civi\Test\Api4TestTrait;
 use Civi\Test\CiviEnvBuilder;
 use Civi\Test\HeadlessInterface;
@@ -32,13 +33,6 @@ class Api4TestBase extends TestCase implements HeadlessInterface {
 
   use Api4TestTrait;
 
-  /**
-   * Records created which will be deleted during tearDown
-   *
-   * @var array
-   */
-  public $testRecords = [];
-
   /**
    * @see CiviUnitTestCase
    *
@@ -52,13 +46,11 @@ class Api4TestBase extends TestCase implements HeadlessInterface {
   }
 
   public function setUpHeadless(): CiviEnvBuilder {
-    return \Civi\Test::headless()->apply();
+    return Test::headless()->apply();
   }
 
   /**
    * Post test cleanup.
-   *
-   * @throws \CRM_Core_Exception
    */
   public function tearDown(): void {
     $implements = class_implements($this);
-- 
2.25.1