added wait for history insert

Author: sterlp

core/src/main/java/org/sterl/spring/persistent_tasks/history/config/TriggerHistoryConfig.java

@@ -2,14 +2,13 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.task.TaskExecutor;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
 @Configuration
 public class TriggerHistoryConfig {
 
     @Bean
-    TaskExecutor triggerHistoryExecutor() {
+    ThreadPoolTaskExecutor triggerHistoryExecutor() {
         var taskExecutor = new ThreadPoolTaskExecutor();
         taskExecutor.setCorePoolSize(1);
         taskExecutor.setMaxPoolSize(4);

core/src/test/java/org/sterl/spring/persistent_tasks/AbstractSpringTest.java

@@ -4,6 +4,7 @@
 import java.time.Duration;
 import java.util.Optional;
 
+import org.awaitility.Awaitility;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +16,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 import org.springframework.lang.Nullable;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.event.RecordApplicationEvents;
@@ -65,6 +67,8 @@ public class AbstractSpringTest {
 
     @Autowired
     protected HistoryService historyService;
+    @Autowired
+    private ThreadPoolTaskExecutor triggerHistoryExecutor;
 
     @Autowired
     protected TransactionTemplate trx;
@@ -167,6 +171,10 @@ PersistentTask<Long> slowTask(AsyncAsserts asserts) {
             };
         }
     }
+    
+    protected void awaidHistoryThreads() {
+        Awaitility.await().until(() -> triggerHistoryExecutor.getActiveCount() == 0);
+    }
 
     @Deprecated
     protected Optional<RunningTriggerEntity> runNextTrigger() {

core/src/test/java/org/sterl/spring/persistent_tasks/task/TaskTransactionTest.java

@@ -164,17 +164,23 @@ void testRequiresNewHasOwnTransaction(String task) {
     @ValueSource(strings = {"transactionalClass", "transactionalClassAndMethod", "transactionalClosure"})
     void testTransactionalTask(String task) throws InterruptedException {
         // GIVEN
+        personRepository.deleteAllInBatch();
         var t = triggerService.queue(TriggerBuilder
                 .newTrigger(task, task).build());
 
         // WHEN
-        personRepository.deleteAllInBatch();
         hibernateAsserts.reset();
         triggerService.run(t).get();
 
         // THEN
         asserts.awaitValue(task);
-        hibernateAsserts.assertTrxCount(2);
+        awaidHistoryThreads();
+        hibernateAsserts
+            // running trigger
+            //.assertDeletedCount(1)
+            // 1 running trigger, 3 history, 1 trigger completed
+            .assertInsertCount(4)
+            .assertTrxCount(2);
         assertThat(personRepository.count()).isEqualTo(1);
     }
 }

core/src/test/java/org/sterl/spring/persistent_tasks/test/AsyncAsserts.java

@@ -131,7 +131,7 @@ public void awaitOrdered(Runnable fn, String value, String... values) {
     }
 
     public ListAssert<String> assertValue(String value) {
-        return assertThat(new ArrayList<>(values)).contains(value);
+        return assertThat(values).contains(value);
     }
 
     public void assertMissing(String value) {