From 787a5af50f60b3ef50c220ad2f1837c0981468af Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 24 Mar 2021 15:42:52 +1300
Subject: [PATCH] Test fix to avoid caching issue

---
 tests/phpunit/CRM/Contribute/Form/TaskTest.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/tests/phpunit/CRM/Contribute/Form/TaskTest.php b/tests/phpunit/CRM/Contribute/Form/TaskTest.php
index b222d8151f..c37e43b77d 100644
--- a/tests/phpunit/CRM/Contribute/Form/TaskTest.php
+++ b/tests/phpunit/CRM/Contribute/Form/TaskTest.php
@@ -10,7 +10,7 @@
  */
 
 /**
- * Class CRM_Contribute_Form_Tasktest
+ * Class CRM_Contribute_Form_TaskTest
  */
 class CRM_Contribute_Form_TaskTest extends CiviUnitTestCase {
 
@@ -18,10 +18,12 @@ class CRM_Contribute_Form_TaskTest extends CiviUnitTestCase {
 
   /**
    * Clean up after each test.
+   *
+   * @throws \CRM_Core_Exception
    */
-  public function tearDown() {
+  public function tearDown(): void {
     $this->quickCleanUpFinancialEntities();
-    CRM_Utils_Hook::singleton()->reset();
+    parent::tearDown();
   }
 
   /**
@@ -29,13 +31,15 @@ class CRM_Contribute_Form_TaskTest extends CiviUnitTestCase {
    * executes without any error after sorting the search result.
    *
    * @throws \CRM_Core_Exception
+   * @throws \CiviCRM_API3_Exception
    */
-  public function testPreProcessCommonAfterSorting() {
+  public function testPreProcessCommonAfterSorting(): void {
     $fields = [
       'source' => 'contribution_source',
       'status' => 'contribution_status',
       'financialTypes' => 'financial_type',
     ];
+    $contributionIds = [];
     $financialTypes = ['Member Dues', 'Event Fee', 'Donation'];
     $status = ['Completed', 'Partially paid', 'Pending'];
     $source = ['test source text', 'check source text', 'source text'];
@@ -65,9 +69,10 @@ class CRM_Contribute_Form_TaskTest extends CiviUnitTestCase {
       $expectedValues[$fld] = $sortedFields;
     }
 
-    // Assert contribIds are returned in a sorted order.
-    $form = $this->getFormObject('CRM_Contribute_Form_Task', ['radio_ts' => 'ts_all'], 'Search');
     foreach ($fields as $val) {
+      // Assert contribIds are returned in a sorted order.
+      /* @var CRM_Contribute_Form_Task $form */
+      $form = $this->getFormObject('CRM_Contribute_Form_Task', ['radio_ts' => 'ts_all'], 'Search');
       $form->set(CRM_Utils_Sort::SORT_ORDER, "`{$val}` asc");
       CRM_Contribute_Form_Task::preProcessCommon($form);
 
-- 
2.25.1