Normalize order of setUp()/useTransaction() - batch 3

diff --git a/tests/phpunit/CRM/Utils/API/MatchOptionTest.php b/tests/phpunit/CRM/Utils/API/MatchOptionTest.php
index c622abe1a68906818df0e55f0e7c3118edf04fbd..32bc748f869be5560c4022d72bb9f1b0ae44b1e6 100644 (file)
--- a/tests/phpunit/CRM/Utils/API/MatchOptionTest.php
+++ b/tests/phpunit/CRM/Utils/API/MatchOptionTest.php
@@ -12,8 +12,8 @@ class CRM_Utils_API_MatchOptionTest extends CiviUnitTestCase {
   public $noise;
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
     $this->assertDBQuery(0, "SELECT count(*) FROM civicrm_contact WHERE first_name='Jeffrey' and last_name='Lebowski'");
 
     // Create noise to ensure we don't accidentally/coincidentally match the first record

diff --git a/tests/phpunit/CRM/Utils/ArrayTest.php b/tests/phpunit/CRM/Utils/ArrayTest.php
index d76f3dce3e9f990ce6458508fd523f64258f03fe..19df34d5d346ee9e357b0a4398e51e9592deb30c 100644 (file)
--- a/tests/phpunit/CRM/Utils/ArrayTest.php
+++ b/tests/phpunit/CRM/Utils/ArrayTest.php
@@ -10,8 +10,8 @@ class CRM_Utils_ArrayTest extends CiviUnitTestCase {
    * Set up for tests.
    */
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   public function testAsColumns() {

diff --git a/tests/phpunit/CRM/Utils/AutoCleanTest.php b/tests/phpunit/CRM/Utils/AutoCleanTest.php
index 6cfc20f62d0dffbac58ac8775a0eb807481a95ac..8c65827e5af27036f935d7eae3296c525a997207 100644 (file)
--- a/tests/phpunit/CRM/Utils/AutoCleanTest.php
+++ b/tests/phpunit/CRM/Utils/AutoCleanTest.php
@@ -9,8 +9,8 @@ class CRM_Utils_AutoCleanTest extends CiviUnitTestCase {
   public $foo;
 
   protected function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   public function testAutoclean() {

diff --git a/tests/phpunit/CRM/Utils/Check/Component/EnvTest.php b/tests/phpunit/CRM/Utils/Check/Component/EnvTest.php
index 0a7d17634a3f9f3b030f1375c92a83071e7e65d9..67f4438f9c01afe11e6cc46a2b003325e856c79b 100644 (file)
--- a/tests/phpunit/CRM/Utils/Check/Component/EnvTest.php
+++ b/tests/phpunit/CRM/Utils/Check/Component/EnvTest.php
@@ -9,8 +9,8 @@
 class CRM_Utils_Check_Component_EnvTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   /**

diff --git a/tests/phpunit/CRM/Utils/Check/Component/OptionGroupsTest.php b/tests/phpunit/CRM/Utils/Check/Component/OptionGroupsTest.php
index e361b91d594d77cf750d32eac9e14d11651bcc41..1b1a77f59f5663d8eb5aa3f77941e8d726ab22fc 100644 (file)
--- a/tests/phpunit/CRM/Utils/Check/Component/OptionGroupsTest.php
+++ b/tests/phpunit/CRM/Utils/Check/Component/OptionGroupsTest.php
@@ -9,8 +9,8 @@
 class CRM_Utils_Check_Component_OptionGroupsTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   public function testCheckOptionGroupValues() {

diff --git a/tests/phpunit/CRM/Utils/ColorTest.php b/tests/phpunit/CRM/Utils/ColorTest.php
index 794194fafb72b638b0f41060d0e7dc126d8e4aa3..ba94406ad80cb2b096b9135c78221b53906e5692 100644 (file)
--- a/tests/phpunit/CRM/Utils/ColorTest.php
+++ b/tests/phpunit/CRM/Utils/ColorTest.php
@@ -7,8 +7,8 @@
 class CRM_Utils_ColorTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   /**

diff --git a/tests/phpunit/CRM/Utils/DateTest.php b/tests/phpunit/CRM/Utils/DateTest.php
index 69db971e496a0fe4bcb1e00c7c6b97344a10eabf..c17368e4b814eb8c632cf658f463374840e78593 100644 (file)
--- a/tests/phpunit/CRM/Utils/DateTest.php
+++ b/tests/phpunit/CRM/Utils/DateTest.php
@@ -30,8 +30,8 @@ class CRM_Utils_DateTest extends CiviUnitTestCase {
    * Set up for tests.
    */
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   /**

diff --git a/tests/phpunit/CRM/Utils/HTMLTest.php b/tests/phpunit/CRM/Utils/HTMLTest.php
index 8affd0a5c7944d1f8bf13340a97472a3083f98ef..7885e492f990655c41403654425ad9d632b58f38 100644 (file)
--- a/tests/phpunit/CRM/Utils/HTMLTest.php
+++ b/tests/phpunit/CRM/Utils/HTMLTest.php
@@ -16,8 +16,8 @@
 class CRM_Utils_HTMLTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   /**

diff --git a/tests/phpunit/CRM/Utils/HookTest.php b/tests/phpunit/CRM/Utils/HookTest.php
index a0c594921b9af078e27892aaea5b3b2d2eb01c5e..a74e543bfc2241b460e343ce3bbb8842271a5687 100644 (file)
--- a/tests/phpunit/CRM/Utils/HookTest.php
+++ b/tests/phpunit/CRM/Utils/HookTest.php
@@ -27,8 +27,8 @@ class CRM_Utils_HookTest extends CiviUnitTestCase {
   public $hook;
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
     $this->fakeModules = [
       'hooktesta',
       'hooktestb',

diff --git a/tests/phpunit/CRM/Utils/HtmlToTextTest.php b/tests/phpunit/CRM/Utils/HtmlToTextTest.php
index 67c7881d0d8750e00275e847f09bc7c7aa6e99c2..817f49a721ab346f9dacde08ad3811c3a651d689 100644 (file)
--- a/tests/phpunit/CRM/Utils/HtmlToTextTest.php
+++ b/tests/phpunit/CRM/Utils/HtmlToTextTest.php
@@ -7,8 +7,8 @@
 class CRM_Utils_HtmlToTextTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   /**

diff --git a/tests/phpunit/CRM/Utils/HttpClientTest.php b/tests/phpunit/CRM/Utils/HttpClientTest.php
index 2890e87d55bbd3791767874095b0539411bc787a..70a128d840acf3d330d80c54938830d3bc21d707 100644 (file)
--- a/tests/phpunit/CRM/Utils/HttpClientTest.php
+++ b/tests/phpunit/CRM/Utils/HttpClientTest.php
@@ -25,8 +25,8 @@ class CRM_Utils_HttpClientTest extends CiviUnitTestCase {
   protected $client;
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
 
     $this->tmpFile = $this->createTempDir() . '/example.txt';
 

diff --git a/tests/phpunit/CRM/Utils/ICalendarTest.php b/tests/phpunit/CRM/Utils/ICalendarTest.php
index a12ea46d859d63ede94d6c2b94fcc89f8a8524b3..a4e7017aaf5a4e7b1c9181c7c2944bb2ef7e03dd 100644 (file)
--- a/tests/phpunit/CRM/Utils/ICalendarTest.php
+++ b/tests/phpunit/CRM/Utils/ICalendarTest.php
@@ -16,8 +16,8 @@
 class CRM_Utils_ICalendarTest extends CiviUnitTestCase {
 
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   /**

diff --git a/tests/phpunit/CRM/Utils/JSTest.php b/tests/phpunit/CRM/Utils/JSTest.php
index 199e4939c5f054f5ebda0b4bd949803223946f53..4e4fdafeeb5bb52098a2598409c4f1d39b9fbad2 100644 (file)
--- a/tests/phpunit/CRM/Utils/JSTest.php
+++ b/tests/phpunit/CRM/Utils/JSTest.php
@@ -19,8 +19,8 @@ class CRM_Utils_JSTest extends CiviUnitTestCase {
    * Set up for tests.
    */
   public function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   /**