More and better test cleanup

qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/scheduler/QScheduleManagerTest.java

@@ -54,28 +54,7 @@ class QScheduleManagerTest extends BaseTest
    void afterEach()
    {
       QLogger.deactivateCollectingLoggerForClass(QuartzScheduler.class);
-
+      QuartzTestUtils.afterEach();
-      try
-      {
-         QScheduleManager.getInstance().unInit();
-      }
-      catch(IllegalStateException ise)
-      {
-         /////////////////////////////////////////////////////////////////
-         // ok, might just mean that this test didn't init the instance //
-         /////////////////////////////////////////////////////////////////
-      }
-
-      try
-      {
-         QuartzScheduler.getInstance().unInit();
-      }
-      catch(IllegalStateException ise)
-      {
-         /////////////////////////////////////////////////////////////////
-         // ok, might just mean that this test didn't init the instance //
-         /////////////////////////////////////////////////////////////////
-      }
    }
 
 

qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/scheduler/processes/ScheduleAllNewJobsProcessTest.java

@@ -66,10 +66,9 @@ class ScheduleAllNewJobsProcessTest extends BaseTest
    @AfterEach
    void afterEach()
    {
-      QLogger.deactivateCollectingLoggerForClass(QuartzScheduler.class);
-
       try
       {
+         QScheduleManager.getInstance().stop();
          QScheduleManager.getInstance().unInit();
       }
       catch(IllegalStateException ise)

qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/scheduler/processes/UnscheduleAllJobsProcessTest.java

@@ -28,7 +28,6 @@ import com.kingsrook.qqq.backend.core.BaseTest;
 import com.kingsrook.qqq.backend.core.actions.processes.RunProcessAction;
 import com.kingsrook.qqq.backend.core.context.QContext;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.logging.QLogger;
 import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessInput;
 import com.kingsrook.qqq.backend.core.model.metadata.MetaDataProducerHelper;
 import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
@@ -40,6 +39,7 @@ import com.kingsrook.qqq.backend.core.scheduler.quartz.QuartzScheduler;
 import com.kingsrook.qqq.backend.core.scheduler.quartz.QuartzTestUtils;
 import com.kingsrook.qqq.backend.core.utils.TestUtils;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.quartz.SchedulerException;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -52,35 +52,23 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 class UnscheduleAllJobsProcessTest extends BaseTest
 {
 
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   @BeforeEach
+   void beforeEach()
+   {
+      QuartzTestUtils.afterEach();
+   }
+
+
    /*******************************************************************************
     **
     *******************************************************************************/
    @AfterEach
    void afterEach()
    {
-      QLogger.deactivateCollectingLoggerForClass(QuartzScheduler.class);
+      QuartzTestUtils.afterEach();
-
-      try
-      {
-         QScheduleManager.getInstance().unInit();
-      }
-      catch(IllegalStateException ise)
-      {
-         /////////////////////////////////////////////////////////////////
-         // ok, might just mean that this test didn't init the instance //
-         /////////////////////////////////////////////////////////////////
-      }
-
-      try
-      {
-         QuartzScheduler.getInstance().unInit();
-      }
-      catch(IllegalStateException ise)
-      {
-         /////////////////////////////////////////////////////////////////
-         // ok, might just mean that this test didn't init the instance //
-         /////////////////////////////////////////////////////////////////
-      }
    }
 
 

qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/scheduler/quartz/QuartzTestUtils.java

@@ -125,6 +125,7 @@ public class QuartzTestUtils
 
       try
       {
+         QuartzScheduler.getInstance().stop();
          QuartzScheduler.getInstance().unInit();
       }
       catch(IllegalStateException ise)

qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/scheduler/simple/SimpleSchedulerTest.java

@@ -53,6 +53,7 @@ class SimpleSchedulerTest extends BaseTest
    @AfterEach
    void afterEach()
    {
+      QScheduleManager.getInstance().stop();
       QScheduleManager.getInstance().unInit();
    }