From d0f6424d960539cc8c60a321212c2cc8bd79ae84 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 9 May 2022 11:40:56 -0400
Subject: [PATCH] APIv4 Tests - Remove unused extras from ConformanceTest

---
 tests/phpunit/api/v4/Entity/ConformanceTest.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/tests/phpunit/api/v4/Entity/ConformanceTest.php b/tests/phpunit/api/v4/Entity/ConformanceTest.php
index 0525e01174..c85ace355e 100644
--- a/tests/phpunit/api/v4/Entity/ConformanceTest.php
+++ b/tests/phpunit/api/v4/Entity/ConformanceTest.php
@@ -20,7 +20,6 @@ namespace api\v4\Entity;
 
 use api\v4\Service\TestCreationParameterProvider;
 use api\v4\Traits\CheckAccessTrait;
-use api\v4\Traits\OptionCleanupTrait;
 use api\v4\Traits\TableDropperTrait;
 use Civi\API\Exception\UnauthorizedException;
 use Civi\Api4\CustomField;
@@ -35,18 +34,14 @@ use Civi\Api4\Utils\CoreUtil;
 use Civi\Core\Event\PostEvent;
 use Civi\Core\Event\PreEvent;
 use Civi\Test\HookInterface;
-use Civi\Test\TransactionalInterface;
 
 /**
  * @group headless
  */
-class ConformanceTest extends Api4TestBase implements HookInterface, TransactionalInterface {
+class ConformanceTest extends Api4TestBase implements HookInterface {
 
   use CheckAccessTrait;
   use TableDropperTrait;
-  use OptionCleanupTrait {
-    setUp as setUpOptionCleanup;
-  }
 
   /**
    * @var \api\v4\Service\TestCreationParameterProvider
@@ -61,7 +56,6 @@ class ConformanceTest extends Api4TestBase implements HookInterface, Transaction
   public function setUp(): void {
     // Enable all components
     \CRM_Core_BAO_ConfigSetting::enableAllComponents();
-    $this->setUpOptionCleanup();
     $this->loadDataSet('CaseType');
     $this->loadDataSet('ConformanceTest');
     $gatherer = new SpecGatherer();
-- 
2.25.1