From dc40e455f7ea948f5abe6906bcf8f89d4c0d114e Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 16 Mar 2023 22:54:15 -0700
Subject: [PATCH] Normalize order of setUp()/useTransaction() - batch 4

---
 tests/phpunit/CRM/Utils/LazyArrayTest.php               | 2 +-
 tests/phpunit/CRM/Utils/Mail/FilteredPearMailerTest.php | 2 +-
 tests/phpunit/CRM/Utils/Mail/IncomingTest.php           | 2 +-
 tests/phpunit/CRM/Utils/MailTest.php                    | 2 +-
 tests/phpunit/CRM/Utils/MoneyTest.php                   | 2 +-
 tests/phpunit/CRM/Utils/NumberTest.php                  | 2 +-
 tests/phpunit/CRM/Utils/PDF/UtilsTest.php               | 2 +-
 tests/phpunit/CRM/Utils/RuleTest.php                    | 2 +-
 tests/phpunit/CRM/Utils/SQL/DeleteTest.php              | 2 +-
 tests/phpunit/CRM/Utils/SQL/InsertTest.php              | 2 +-
 tests/phpunit/CRM/Utils/SQL/SelectTest.php              | 2 +-
 tests/phpunit/CRM/Utils/SQLTest.php                     | 2 +-
 tests/phpunit/CRM/Utils/SignerTest.php                  | 2 +-
 tests/phpunit/CRM/Utils/StringTest.php                  | 2 +-
 tests/phpunit/CRM/Utils/SystemTest.php                  | 2 +-
 tests/phpunit/CRM/Utils/TimeTest.php                    | 2 +-
 tests/phpunit/CRM/Utils/TokenTest.php                   | 2 +-
 tests/phpunit/CRM/Utils/XMLTest.php                     | 2 +-
 tests/phpunit/CRM/Utils/ZipTest.php                     | 2 +-
 tests/phpunit/CRM/Utils/versionCheckTest.php            | 2 +-
 20 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/phpunit/CRM/Utils/LazyArrayTest.php b/tests/phpunit/CRM/Utils/LazyArrayTest.php
index 8f6209a162..e288f7cae8 100644
--- a/tests/phpunit/CRM/Utils/LazyArrayTest.php
+++ b/tests/phpunit/CRM/Utils/LazyArrayTest.php
@@ -7,8 +7,8 @@
 class CRM_Utils_LazyArrayTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   public function testAssoc() {
diff --git a/tests/phpunit/CRM/Utils/Mail/FilteredPearMailerTest.php b/tests/phpunit/CRM/Utils/Mail/FilteredPearMailerTest.php
index fe4796db8a..307db97b0c 100644
--- a/tests/phpunit/CRM/Utils/Mail/FilteredPearMailerTest.php
+++ b/tests/phpunit/CRM/Utils/Mail/FilteredPearMailerTest.php
@@ -7,8 +7,8 @@
 class CRM_Utils_Mail_FilteredPearMailerTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   public function testFilter() {
diff --git a/tests/phpunit/CRM/Utils/Mail/IncomingTest.php b/tests/phpunit/CRM/Utils/Mail/IncomingTest.php
index 2e1073106e..aebc2fab72 100644
--- a/tests/phpunit/CRM/Utils/Mail/IncomingTest.php
+++ b/tests/phpunit/CRM/Utils/Mail/IncomingTest.php
@@ -32,8 +32,8 @@ class CRM_Utils_Mail_IncomingTest extends CiviUnitTestCase {
   protected $name;
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
 
     $rand = rand(0, 1000);
     $this->email = "test{$rand}@example.com";
diff --git a/tests/phpunit/CRM/Utils/MailTest.php b/tests/phpunit/CRM/Utils/MailTest.php
index bd287856c4..8e32fac889 100644
--- a/tests/phpunit/CRM/Utils/MailTest.php
+++ b/tests/phpunit/CRM/Utils/MailTest.php
@@ -7,8 +7,8 @@
 class CRM_Utils_MailTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   /**
diff --git a/tests/phpunit/CRM/Utils/MoneyTest.php b/tests/phpunit/CRM/Utils/MoneyTest.php
index eb404bbb0a..11c6e133f9 100644
--- a/tests/phpunit/CRM/Utils/MoneyTest.php
+++ b/tests/phpunit/CRM/Utils/MoneyTest.php
@@ -8,8 +8,8 @@
 class CRM_Utils_MoneyTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   /**
diff --git a/tests/phpunit/CRM/Utils/NumberTest.php b/tests/phpunit/CRM/Utils/NumberTest.php
index 9ed164204d..b966d00d6e 100644
--- a/tests/phpunit/CRM/Utils/NumberTest.php
+++ b/tests/phpunit/CRM/Utils/NumberTest.php
@@ -7,8 +7,8 @@
 class CRM_Utils_NumberTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   /**
diff --git a/tests/phpunit/CRM/Utils/PDF/UtilsTest.php b/tests/phpunit/CRM/Utils/PDF/UtilsTest.php
index 0a7c97ad8a..ba81abe0f4 100644
--- a/tests/phpunit/CRM/Utils/PDF/UtilsTest.php
+++ b/tests/phpunit/CRM/Utils/PDF/UtilsTest.php
@@ -7,8 +7,8 @@
 class CRM_Utils_PDF_UtilsTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   /**
diff --git a/tests/phpunit/CRM/Utils/RuleTest.php b/tests/phpunit/CRM/Utils/RuleTest.php
index 007887b11c..bc6915be0c 100644
--- a/tests/phpunit/CRM/Utils/RuleTest.php
+++ b/tests/phpunit/CRM/Utils/RuleTest.php
@@ -10,8 +10,8 @@ class CRM_Utils_RuleTest extends CiviUnitTestCase {
    * Set up for tests.
    */
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   /**
diff --git a/tests/phpunit/CRM/Utils/SQL/DeleteTest.php b/tests/phpunit/CRM/Utils/SQL/DeleteTest.php
index a9a832232f..852de07973 100644
--- a/tests/phpunit/CRM/Utils/SQL/DeleteTest.php
+++ b/tests/phpunit/CRM/Utils/SQL/DeleteTest.php
@@ -7,8 +7,8 @@
 class CRM_Utils_SQL_DeleteTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   public function testGetDefault() {
diff --git a/tests/phpunit/CRM/Utils/SQL/InsertTest.php b/tests/phpunit/CRM/Utils/SQL/InsertTest.php
index 0bd377ddbe..de3a801eb5 100644
--- a/tests/phpunit/CRM/Utils/SQL/InsertTest.php
+++ b/tests/phpunit/CRM/Utils/SQL/InsertTest.php
@@ -7,8 +7,8 @@
 class CRM_Utils_SQL_InsertTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   public function testRow_twice() {
diff --git a/tests/phpunit/CRM/Utils/SQL/SelectTest.php b/tests/phpunit/CRM/Utils/SQL/SelectTest.php
index c36641cdc8..ab601cc6b7 100644
--- a/tests/phpunit/CRM/Utils/SQL/SelectTest.php
+++ b/tests/phpunit/CRM/Utils/SQL/SelectTest.php
@@ -7,8 +7,8 @@
 class CRM_Utils_SQL_SelectTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   public function testGetDefault() {
diff --git a/tests/phpunit/CRM/Utils/SQLTest.php b/tests/phpunit/CRM/Utils/SQLTest.php
index 5114f6014b..02e3a879c8 100644
--- a/tests/phpunit/CRM/Utils/SQLTest.php
+++ b/tests/phpunit/CRM/Utils/SQLTest.php
@@ -7,8 +7,8 @@
 class CRM_Utils_SQLTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   public function testInterpolate() {
diff --git a/tests/phpunit/CRM/Utils/SignerTest.php b/tests/phpunit/CRM/Utils/SignerTest.php
index f30dcbfc62..aef18d5684 100644
--- a/tests/phpunit/CRM/Utils/SignerTest.php
+++ b/tests/phpunit/CRM/Utils/SignerTest.php
@@ -16,8 +16,8 @@
 class CRM_Utils_SignerTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   public function testSignValidate() {
diff --git a/tests/phpunit/CRM/Utils/StringTest.php b/tests/phpunit/CRM/Utils/StringTest.php
index a593e25ee1..4a86843c35 100644
--- a/tests/phpunit/CRM/Utils/StringTest.php
+++ b/tests/phpunit/CRM/Utils/StringTest.php
@@ -10,8 +10,8 @@ class CRM_Utils_StringTest extends CiviUnitTestCase {
    * Set up for tests.
    */
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   public function testBase64Url(): void {
diff --git a/tests/phpunit/CRM/Utils/SystemTest.php b/tests/phpunit/CRM/Utils/SystemTest.php
index edc7c0ed23..964231da53 100644
--- a/tests/phpunit/CRM/Utils/SystemTest.php
+++ b/tests/phpunit/CRM/Utils/SystemTest.php
@@ -8,8 +8,8 @@
 class CRM_Utils_SystemTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   public function testUrlQueryString() {
diff --git a/tests/phpunit/CRM/Utils/TimeTest.php b/tests/phpunit/CRM/Utils/TimeTest.php
index 1db72865cf..6218c12b0c 100644
--- a/tests/phpunit/CRM/Utils/TimeTest.php
+++ b/tests/phpunit/CRM/Utils/TimeTest.php
@@ -7,8 +7,8 @@
 class CRM_Utils_TimeTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   /**
diff --git a/tests/phpunit/CRM/Utils/TokenTest.php b/tests/phpunit/CRM/Utils/TokenTest.php
index ebd5d25511..962e52b8b4 100644
--- a/tests/phpunit/CRM/Utils/TokenTest.php
+++ b/tests/phpunit/CRM/Utils/TokenTest.php
@@ -9,8 +9,8 @@ use Civi\Token\TokenProcessor;
 class CRM_Utils_TokenTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   /**
diff --git a/tests/phpunit/CRM/Utils/XMLTest.php b/tests/phpunit/CRM/Utils/XMLTest.php
index 2f0f250d83..9d16cd2208 100644
--- a/tests/phpunit/CRM/Utils/XMLTest.php
+++ b/tests/phpunit/CRM/Utils/XMLTest.php
@@ -10,8 +10,8 @@ class CRM_Utils_XMLTest extends CiviUnitTestCase {
    * Set up for tests.
    */
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   public function testFilterMarkupTest(): void {
diff --git a/tests/phpunit/CRM/Utils/ZipTest.php b/tests/phpunit/CRM/Utils/ZipTest.php
index 28632948fb..5b43c3f473 100644
--- a/tests/phpunit/CRM/Utils/ZipTest.php
+++ b/tests/phpunit/CRM/Utils/ZipTest.php
@@ -22,8 +22,8 @@ class CRM_Utils_ZipTest extends CiviUnitTestCase {
   private $file = FALSE;
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
     $this->file = FALSE;
   }
 
diff --git a/tests/phpunit/CRM/Utils/versionCheckTest.php b/tests/phpunit/CRM/Utils/versionCheckTest.php
index f1a2c449c2..cc164b6a79 100644
--- a/tests/phpunit/CRM/Utils/versionCheckTest.php
+++ b/tests/phpunit/CRM/Utils/versionCheckTest.php
@@ -9,8 +9,8 @@ use Civi\Test\Invasive;
 class CRM_Utils_versionCheckTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   /**
-- 
2.25.1