From 1ceb39c66e7fe82ff1a82248edb6bb407f028a21 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 16 Jul 2021 20:25:01 +1200
Subject: [PATCH] Api test cleanup fixes

---
 .../phpunit/api/v4/Action/BaseCustomValueTest.php | 15 ++-------------
 .../api/v4/Action/CreateWithOptionGroupTest.php   |  9 ---------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/tests/phpunit/api/v4/Action/BaseCustomValueTest.php b/tests/phpunit/api/v4/Action/BaseCustomValueTest.php
index 9064c9e143..73cb89825d 100644
--- a/tests/phpunit/api/v4/Action/BaseCustomValueTest.php
+++ b/tests/phpunit/api/v4/Action/BaseCustomValueTest.php
@@ -20,29 +20,18 @@
 namespace api\v4\Action;
 
 use api\v4\UnitTestCase;
-use api\v4\Traits\TableDropperTrait;
 use Civi\Api4\CustomGroup;
+use Civi\Api4\CustomField;
 
 abstract class BaseCustomValueTest extends UnitTestCase {
 
-  use \api\v4\Traits\OptionCleanupTrait {
-    setUp as setUpOptionCleanup;
-  }
-  use TableDropperTrait;
-
-  /**
-   * Set up baseline for testing
-   */
-  public function setUp(): void {
-    $this->setUpOptionCleanup();
-  }
-
   /**
    * Delete all created options groups.
    *
    * @throws \API_Exception
    */
   public function tearDown(): void {
+    CustomField::delete(FALSE)->addWhere('id', '>', 0)->execute();
     CustomGroup::delete(FALSE)->addWhere('id', '>', 0)->execute();
     parent::tearDown();
   }
diff --git a/tests/phpunit/api/v4/Action/CreateWithOptionGroupTest.php b/tests/phpunit/api/v4/Action/CreateWithOptionGroupTest.php
index 11030b8f6e..dc778fe31d 100644
--- a/tests/phpunit/api/v4/Action/CreateWithOptionGroupTest.php
+++ b/tests/phpunit/api/v4/Action/CreateWithOptionGroupTest.php
@@ -28,15 +28,6 @@ use Civi\Api4\Contact;
  */
 class CreateWithOptionGroupTest extends BaseCustomValueTest {
 
-  /**
-   * Remove the custom tables
-   */
-  public function setUp(): void {
-    $this->dropByPrefix('civicrm_value_financial');
-    $this->dropByPrefix('civicrm_value_favorite');
-    parent::setUp();
-  }
-
   public function testGetWithCustomData() {
     $group = uniqid('fava');
     $colorField = uniqid('colora');
-- 
2.25.1