fix(core): flaky labels tests

kestra-io · Jul 18, 2023 · 0679b84 · 0679b84
1 parent 2321500
commit 0679b84
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/core/src/test/java/io/kestra/core/models/triggers/types/FlowTest.java b/core/src/test/java/io/kestra/core/models/triggers/types/FlowTest.java
@@ -15,6 +15,7 @@
 import java.util.Optional;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.is;
 
 @MicronautTest
@@ -59,7 +60,7 @@ void success() {
 
         assertThat(evaluate.isPresent(), is(true));
         assertThat(evaluate.get().getFlowId(), is("flow-with-flow-trigger"));
-        assertThat(evaluate.get().getLabels().get(0), is(new Label("flow-label-1", "flow-label-1")));
-        assertThat(evaluate.get().getLabels().get(1), is(new Label("flow-label-2", "flow-label-2")));
+        assertThat(evaluate.get().getLabels(), hasItem(new Label("flow-label-1", "flow-label-1")));
+        assertThat(evaluate.get().getLabels(), hasItem(new Label("flow-label-2", "flow-label-2")));
     }
 }
diff --git a/core/src/test/java/io/kestra/core/models/triggers/types/ScheduleTest.java b/core/src/test/java/io/kestra/core/models/triggers/types/ScheduleTest.java
@@ -25,6 +25,7 @@
 import jakarta.inject.Inject;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.is;
 
 @MicronautTest
@@ -92,8 +93,8 @@ void success() throws Exception {
         assertThat(dateFromVars(vars.get("date"), date), is(date));
         assertThat(dateFromVars(vars.get("next"), date), is(date.plusMonths(1)));
         assertThat(dateFromVars(vars.get("previous"), date), is(date.minusMonths(1)));
-        assertThat(evaluate.get().getLabels().get(0), is(new Label("flow-label-1", "flow-label-1")));
-        assertThat(evaluate.get().getLabels().get(1), is(new Label("flow-label-2", "flow-label-2")));
+        assertThat(evaluate.get().getLabels(), hasItem(new Label("flow-label-1", "flow-label-1")));
+        assertThat(evaluate.get().getLabels(), hasItem(new Label("flow-label-2", "flow-label-2")));
     }
 
     @SuppressWarnings("unchecked")

diff --git a/core/src/test/java/io/kestra/core/schedulers/SchedulerThreadTest.java b/core/src/test/java/io/kestra/core/schedulers/SchedulerThreadTest.java
@@ -21,6 +21,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
 import static org.hamcrest.Matchers.is;
 import static org.mockito.Mockito.*;
 
@@ -94,8 +95,8 @@ void thread() throws Exception {
 
             assertThat(last.get().getTrigger().getVariables().get("defaultInjected"), is("done"));
             assertThat(last.get().getTrigger().getVariables().get("counter"), is(3));
-            assertThat(last.get().getLabels().get(0), is(new Label("flow-label-1", "flow-label-1")));
-            assertThat(last.get().getLabels().get(1), is(new Label("flow-label-2", "flow-label-2")));
+            assertThat(last.get().getLabels(), hasItem(new Label("flow-label-1", "flow-label-1")));
+            assertThat(last.get().getLabels(), hasItem(new Label("flow-label-2", "flow-label-2")));
             AbstractSchedulerTest.COUNTER = 0;
         }
     }