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

---
 tests/phpunit/Civi/Angular/ManagerTest.php                      | 2 +-
 tests/phpunit/Civi/Angular/PartialSyntaxTest.php                | 2 +-
 tests/phpunit/Civi/Core/ThemesTest.php                          | 2 +-
 tests/phpunit/Civi/Token/TokenProcessorTest.php                 | 2 +-
 .../phpunit/Civi/WorkflowMessage/ExampleWorkflowMessageTest.php | 2 +-
 tests/phpunit/Civi/WorkflowMessage/FieldSpecTest.php            | 2 +-
 .../phpunit/Civi/WorkflowMessage/Traits/AddressingTraitTest.php | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/phpunit/Civi/Angular/ManagerTest.php b/tests/phpunit/Civi/Angular/ManagerTest.php
index eae65528ff..0100eae8e0 100644
--- a/tests/phpunit/Civi/Angular/ManagerTest.php
+++ b/tests/phpunit/Civi/Angular/ManagerTest.php
@@ -30,8 +30,8 @@ class ManagerTest extends \CiviUnitTestCase {
    * @inheritDoc
    */
   protected function setUp(): void {
-    $this->useTransaction(TRUE);
     parent::setUp();
+    $this->useTransaction(TRUE);
     $this->createLoggedInUser();
     $this->res = \CRM_Core_Resources::singleton();
     $this->angular = new Manager($this->res);
diff --git a/tests/phpunit/Civi/Angular/PartialSyntaxTest.php b/tests/phpunit/Civi/Angular/PartialSyntaxTest.php
index 0cfb3bf1e5..aa54473ebe 100644
--- a/tests/phpunit/Civi/Angular/PartialSyntaxTest.php
+++ b/tests/phpunit/Civi/Angular/PartialSyntaxTest.php
@@ -30,8 +30,8 @@ class PartialSyntaxTest extends \CiviUnitTestCase {
    * @inheritDoc
    */
   protected function setUp(): void {
-    $this->useTransaction(TRUE);
     parent::setUp();
+    $this->useTransaction(TRUE);
     $this->createLoggedInUser();
     $this->res = \CRM_Core_Resources::singleton();
     $this->angular = new Manager($this->res);
diff --git a/tests/phpunit/Civi/Core/ThemesTest.php b/tests/phpunit/Civi/Core/ThemesTest.php
index 3abb4f7d22..03f2691acd 100644
--- a/tests/phpunit/Civi/Core/ThemesTest.php
+++ b/tests/phpunit/Civi/Core/ThemesTest.php
@@ -10,8 +10,8 @@ namespace Civi\Core;
 class ThemesTest extends \CiviUnitTestCase {
 
   protected function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   public function getThemeExamples() {
diff --git a/tests/phpunit/Civi/Token/TokenProcessorTest.php b/tests/phpunit/Civi/Token/TokenProcessorTest.php
index 053e50a814..f6a4317f4f 100644
--- a/tests/phpunit/Civi/Token/TokenProcessorTest.php
+++ b/tests/phpunit/Civi/Token/TokenProcessorTest.php
@@ -20,8 +20,8 @@ class TokenProcessorTest extends \CiviUnitTestCase {
   protected $counts;
 
   protected function setUp(): void {
-    $this->useTransaction(TRUE);
     parent::setUp();
+    $this->useTransaction(TRUE);
     $this->dispatcher = new CiviEventDispatcher();
     $this->dispatcher->addListener('civi.token.list', [$this, 'onListTokens']);
     $this->dispatcher->addListener('civi.token.eval', [$this, 'onEvalTokens']);
diff --git a/tests/phpunit/Civi/WorkflowMessage/ExampleWorkflowMessageTest.php b/tests/phpunit/Civi/WorkflowMessage/ExampleWorkflowMessageTest.php
index 34766fb0d9..e60888d748 100644
--- a/tests/phpunit/Civi/WorkflowMessage/ExampleWorkflowMessageTest.php
+++ b/tests/phpunit/Civi/WorkflowMessage/ExampleWorkflowMessageTest.php
@@ -21,8 +21,8 @@ use Civi\Test\Invasive;
 class ExampleWorkflowMessageTest extends \CiviUnitTestCase {
 
   protected function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   /**
diff --git a/tests/phpunit/Civi/WorkflowMessage/FieldSpecTest.php b/tests/phpunit/Civi/WorkflowMessage/FieldSpecTest.php
index daf7037637..0a39791251 100644
--- a/tests/phpunit/Civi/WorkflowMessage/FieldSpecTest.php
+++ b/tests/phpunit/Civi/WorkflowMessage/FieldSpecTest.php
@@ -17,8 +17,8 @@ namespace Civi\WorkflowMessage;
 class FieldSpecTest extends \CiviUnitTestCase {
 
   protected function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   public function getScopeExamples() {
diff --git a/tests/phpunit/Civi/WorkflowMessage/Traits/AddressingTraitTest.php b/tests/phpunit/Civi/WorkflowMessage/Traits/AddressingTraitTest.php
index 6ad3cfb79c..3274c95a93 100644
--- a/tests/phpunit/Civi/WorkflowMessage/Traits/AddressingTraitTest.php
+++ b/tests/phpunit/Civi/WorkflowMessage/Traits/AddressingTraitTest.php
@@ -16,8 +16,8 @@ use Civi\WorkflowMessage\GenericWorkflowMessage;
 class AddressingTraitTest extends \CiviUnitTestCase {
 
   protected function setUp(): void {
-    $this->useTransaction();
     parent::setUp();
+    $this->useTransaction();
   }
 
   /**
-- 
2.25.1