chore(tasks): delete reference on SchedulerExecutionStateInterface

kestra-io · Jun 29, 2023 · dfe512d · dfe512d
1 parent af23df7
commit dfe512d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-version=0.9.1-SNAPSHOT
-kestraVersion=0.9.+
+version=0.10.0-SNAPSHOT
+kestraVersion=0.10.+
 micronautVersion=3.9.3
 lombokVersion=1.18.28
 awsVersion=2.20.53
diff --git a/src/test/java/io/kestra/plugin/aws/s3/TriggerTest.java b/src/test/java/io/kestra/plugin/aws/s3/TriggerTest.java
@@ -5,9 +5,9 @@
 import io.kestra.core.queues.QueueInterface;
 import io.kestra.core.repositories.LocalFlowRepositoryLoader;
 import io.kestra.core.runners.FlowListeners;
+import io.kestra.core.runners.Worker;
 import io.kestra.core.schedulers.AbstractScheduler;
 import io.kestra.core.schedulers.DefaultScheduler;
-import io.kestra.core.schedulers.SchedulerExecutionStateInterface;
 import io.kestra.core.schedulers.SchedulerTriggerStateInterface;
 import io.kestra.plugin.aws.s3.models.S3Object;
 import io.micronaut.context.ApplicationContext;
@@ -30,9 +30,6 @@ class TriggerTest extends AbstractTest {
     @Inject
     private SchedulerTriggerStateInterface triggerState;
 
-    @Inject
-    private SchedulerExecutionStateInterface executionState;
-
     @Inject
     private FlowListeners flowListenersService;
 
@@ -55,12 +52,14 @@ void flow() throws Exception {
         CountDownLatch queueCount = new CountDownLatch(1);
 
         // scheduler
-        try (AbstractScheduler scheduler = new DefaultScheduler(
-            this.applicationContext,
-            this.flowListenersService,
-            this.executionState,
-            this.triggerState
-        )) {
+        try (
+            AbstractScheduler scheduler = new DefaultScheduler(
+                this.applicationContext,
+                this.flowListenersService,
+                this.triggerState
+            );
+            Worker worker = new Worker(applicationContext, 8, null);
+        ) {
             AtomicReference<Execution> last = new AtomicReference<>();
 
             // wait for execution
@@ -75,6 +74,7 @@ void flow() throws Exception {
             upload("trigger/s3", "trigger-test");
             upload("trigger/s3", "trigger-test");
 
+            worker.run();
             scheduler.run();
             repositoryLoader.load(Objects.requireNonNull(TriggerTest.class.getClassLoader().getResource("flows/s3")));
 

diff --git a/src/test/java/io/kestra/plugin/aws/sqs/TriggerTest.java b/src/test/java/io/kestra/plugin/aws/sqs/TriggerTest.java
@@ -6,15 +6,14 @@
 import io.kestra.core.repositories.LocalFlowRepositoryLoader;
 import io.kestra.core.runners.FlowListeners;
 import io.kestra.core.runners.RunContextFactory;
+import io.kestra.core.runners.Worker;
 import io.kestra.core.schedulers.AbstractScheduler;
 import io.kestra.core.schedulers.DefaultScheduler;
-import io.kestra.core.schedulers.SchedulerExecutionStateInterface;
 import io.kestra.core.schedulers.SchedulerTriggerStateInterface;
 import io.kestra.plugin.aws.sqs.model.Message;
 import io.micronaut.context.ApplicationContext;
 import jakarta.inject.Inject;
 import jakarta.inject.Named;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.containers.localstack.LocalStackContainer;
 
@@ -35,9 +34,6 @@ class TriggerTest extends AbstractSqsTest {
     @Inject
     private SchedulerTriggerStateInterface triggerState;
 
-    @Inject
-    private SchedulerExecutionStateInterface executionState;
-
     @Inject
     private FlowListeners flowListenersService;
 
@@ -58,8 +54,14 @@ void flow() throws Exception {
         CountDownLatch queueCount = new CountDownLatch(1);
 
         // scheduler
-        try (AbstractScheduler scheduler = new DefaultScheduler(this.applicationContext, this.flowListenersService,
-            this.executionState, this.triggerState)) {
+        try (
+            AbstractScheduler scheduler = new DefaultScheduler(
+                this.applicationContext,
+                this.flowListenersService,
+                this.triggerState
+            );
+            Worker worker = new Worker(applicationContext, 8, null);
+        ) {
             AtomicReference<Execution> last = new AtomicReference<>();
 
             // wait for execution
@@ -70,7 +72,7 @@ void flow() throws Exception {
                 assertThat(execution.getFlowId(), is("sqs-listen"));
             });
 
-
+            worker.run();
             scheduler.run();
 
             repositoryLoader.load(Objects.requireNonNull(TriggerTest.class.getClassLoader().getResource("flows/sqs")));
@@ -106,4 +108,4 @@ void flow() throws Exception {
         }
     }
 
-}
+}