fixup: flaky tests

Signed-off-by: Todd Baert <todd.baert@dynatrace.com>
open-feature · Oct 18, 2023 · 217e733 · 217e733
1 parent f35c909
commit 217e733
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/dev/openfeature/sdk/OpenFeatureAPI.java b/src/main/java/dev/openfeature/sdk/OpenFeatureAPI.java
@@ -305,7 +305,8 @@ void removeHandler(String clientName, ProviderEvent event, Consumer<EventDetails
     void addHandler(String clientName, ProviderEvent event, Consumer<EventDetails> handler) {
         try (AutoCloseableLock __ = lock.writeLockAutoCloseable()) {
             // if the provider is in the state associated with event, run immediately
-            if (this.providerRepository.getProvider(clientName).getState().matchesEvent(event)) {
+            if (Optional.ofNullable(this.providerRepository.getProvider(clientName).getState())
+                    .orElse(ProviderState.READY).matchesEvent(event)) {
                 eventSupport.runHandler(handler, EventDetails.builder().clientName(clientName).build());
             }
             eventSupport.addClientHandler(clientName, event, handler);

diff --git a/src/test/java/dev/openfeature/sdk/EventsTest.java b/src/test/java/dev/openfeature/sdk/EventsTest.java
@@ -24,7 +24,7 @@
 
 class EventsTest {
 
-    private static final int TIMEOUT = 200;
+    private static final int TIMEOUT = 300;
     private static final int INIT_DELAY = TIMEOUT / 2;
 
     @AfterAll

diff --git a/src/test/java/dev/openfeature/sdk/LockingTest.java b/src/test/java/dev/openfeature/sdk/LockingTest.java
@@ -12,9 +12,11 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
 
 import dev.openfeature.sdk.internal.AutoCloseableReentrantReadWriteLock;
 
+@Isolated()
 class LockingTest {
 
     private static OpenFeatureAPI api;
@@ -26,11 +28,12 @@ class LockingTest {
     @BeforeAll
     static void beforeAll() {
         api = OpenFeatureAPI.getInstance();
+        OpenFeatureAPI.getInstance().setProvider("LockingTest", new NoOpProvider());
     }
 
     @BeforeEach
     void beforeEach() {
-        client = (OpenFeatureClient) api.getClient();
+        client = (OpenFeatureClient) api.getClient("LockingTest");
 
         apiLock = setupLock(apiLock, mockInnerReadLock(), mockInnerWriteLock());
         OpenFeatureAPI.lock = apiLock;