feat(flagd): Improve e2e coverage

Signed-off-by: Simon Schrottner <[email protected]>

Author: aepfli

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/RunFlagdRpcCucumberTest.java

@@ -16,9 +16,9 @@
 @Order(value = Integer.MAX_VALUE)
 @Suite
 @IncludeEngines("cucumber")
-//@SelectClasspathResource("features/evaluation.feature")
-//@SelectClasspathResource("features/flagd-json-evaluator.feature")
-//@SelectClasspathResource("features/flagd.feature")
+@SelectClasspathResource("features/evaluation.feature")
+@SelectClasspathResource("features/flagd-json-evaluator.feature")
+@SelectClasspathResource("features/flagd.feature")
 @SelectClasspathResource("features/flagd-rpc-caching.feature")
 @ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "pretty")
 @ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "dev.openfeature.contrib.providers.flagd.e2e.rpc,dev.openfeature.contrib.providers.flagd.e2e.steps")

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/process/core/FlagdInProcessSetup.java

@@ -2,6 +2,7 @@
 
 import dev.openfeature.contrib.providers.flagd.e2e.ContainerConfig;
 import io.cucumber.java.AfterAll;
+import io.cucumber.java.Before;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.parallel.Isolated;
 
@@ -24,6 +25,10 @@ public class FlagdInProcessSetup {
     @BeforeAll()
     public static void setup() throws InterruptedException {
         flagdContainer.start();
+    }
+
+    @Before()
+    public static void setupTest() throws InterruptedException {
         FlagdInProcessSetup.provider = new FlagdProvider(FlagdOptions.builder()
         .resolverType(Config.Resolver.IN_PROCESS)
         .deadline(1000)
@@ -37,4 +42,4 @@ public static void setup() throws InterruptedException {
     public static void tearDown() {
         flagdContainer.stop();
     }
-}
+}

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/reconnect/process/FlagdInProcessSetup.java

@@ -2,6 +2,7 @@
 
 import dev.openfeature.contrib.providers.flagd.e2e.ContainerConfig;
 import io.cucumber.java.AfterAll;
+import io.cucumber.java.Before;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.parallel.Isolated;
 
@@ -21,6 +22,9 @@ public class FlagdInProcessSetup {
     @BeforeAll()
     public static void setup() throws InterruptedException {
         flagdContainer.start();
+    }
+    @Before()
+    public static void setupTest() throws InterruptedException {
         FeatureProvider workingProvider = new FlagdProvider(FlagdOptions.builder()
         .resolverType(Config.Resolver.IN_PROCESS)
         .port(flagdContainer.getFirstMappedPort())

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/reconnect/rpc/FlagdRpcSetup.java

@@ -1,29 +1,31 @@
 package dev.openfeature.contrib.providers.flagd.e2e.reconnect.rpc;
 
-import dev.openfeature.contrib.providers.flagd.e2e.ContainerConfig;
-import io.cucumber.java.AfterAll;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.parallel.Isolated;
-
 import dev.openfeature.contrib.providers.flagd.Config;
 import dev.openfeature.contrib.providers.flagd.FlagdOptions;
 import dev.openfeature.contrib.providers.flagd.FlagdProvider;
+import dev.openfeature.contrib.providers.flagd.e2e.ContainerConfig;
 import dev.openfeature.contrib.providers.flagd.e2e.reconnect.steps.StepDefinitions;
 import dev.openfeature.contrib.providers.flagd.resolver.grpc.cache.CacheType;
 import dev.openfeature.sdk.FeatureProvider;
+import io.cucumber.java.AfterAll;
+import io.cucumber.java.Before;
 import io.cucumber.java.BeforeAll;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.parallel.Isolated;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.utility.DockerImageName;
 
 @Isolated()
 @Order(value = Integer.MAX_VALUE)
 public class FlagdRpcSetup {
     private static final GenericContainer flagdContainer = ContainerConfig.flagd(true);
 
     @BeforeAll()
-    public static void setup() throws InterruptedException {
+    public static void setups() throws InterruptedException {
         flagdContainer.start();
+    }
+
+    @Before()
+    public static void setupTest() throws InterruptedException {
 
         FeatureProvider workingProvider = new FlagdProvider(FlagdOptions.builder()
                 .resolverType(Config.Resolver.RPC)

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/reconnect/steps/StepDefinitions.java

@@ -125,4 +125,4 @@ public void an_error_should_be_indicated_within_the_configured_deadline() {
             OpenFeatureAPI.getInstance().setProviderAndWait("unavailable", StepDefinitions.unavailableProvider);
         });
     }
-}
+}

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/rpc/FlagdRpcSetup.java

@@ -1,21 +1,17 @@
 package dev.openfeature.contrib.providers.flagd.e2e.rpc;
 
-import dev.openfeature.contrib.providers.flagd.e2e.ContainerConfig;
-import dev.openfeature.contrib.providers.flagd.resolver.grpc.cache.CacheType;
-import io.cucumber.java.AfterAll;
-import org.junit.jupiter.api.Order;
-import org.junit.jupiter.api.parallel.Isolated;
-
 import dev.openfeature.contrib.providers.flagd.Config;
 import dev.openfeature.contrib.providers.flagd.FlagdOptions;
 import dev.openfeature.contrib.providers.flagd.FlagdProvider;
+import dev.openfeature.contrib.providers.flagd.e2e.ContainerConfig;
 import dev.openfeature.contrib.providers.flagd.e2e.steps.StepDefinitions;
 import dev.openfeature.sdk.FeatureProvider;
+import io.cucumber.java.AfterAll;
+import io.cucumber.java.Before;
 import io.cucumber.java.BeforeAll;
+import org.junit.jupiter.api.Order;
+import org.junit.jupiter.api.parallel.Isolated;
 import org.testcontainers.containers.GenericContainer;
-import org.testcontainers.junit.jupiter.Container;
-import org.testcontainers.junit.jupiter.Testcontainers;
-import org.testcontainers.utility.DockerImageName;
 
 @Isolated()
 @Order(value = Integer.MAX_VALUE)
@@ -27,6 +23,10 @@ public class FlagdRpcSetup {
     @BeforeAll()
     public static void setup() {
         flagdContainer.start();
+    }
+
+    @Before()
+    public static void test_setup() {
         FlagdRpcSetup.provider = new FlagdProvider(FlagdOptions.builder()
                 .resolverType(Config.Resolver.RPC)
                 .port(flagdContainer.getFirstMappedPort())

providers/flagd/src/test/java/dev/openfeature/contrib/providers/flagd/e2e/steps/config/ConfigSteps.java

@@ -53,10 +53,10 @@ public void we_have_an_option_of_type_with_value(String option, String type, Str
     Map<String, String> envVarsSet = new HashMap<>();
 
     @When("we have an environment variable {string} with value {string}")
-    public void we_have_an_environment_variable_with_value(String string, String string2) throws IllegalAccessException, NoSuchFieldException {
-        String getenv = System.getenv(string);
-        envVarsSet.put(string, getenv);
-        EnvironmentVariableUtils.set(string, string2);
+    public void we_have_an_environment_variable_with_value(String varName, String value) throws IllegalAccessException, NoSuchFieldException {
+        String getenv = System.getenv(varName);
+        envVarsSet.put(varName, getenv);
+        EnvironmentVariableUtils.set(varName, value);
     }
 
     private Object convert(String value, String type) throws ClassNotFoundException {