test: improve gherkin test suite only relying on the newest version, with data loading

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

diff --git c/src/test/java/dev/openfeature/sdk/e2e/steps/ContextSteps.java i/src/test/java/dev/openfeature/sdk/e2e/steps/ContextSteps.java
index e4cd603..121b567 100644
--- c/src/test/java/dev/openfeature/sdk/e2e/steps/ContextSteps.java
+++ i/src/test/java/dev/openfeature/sdk/e2e/steps/ContextSteps.java
@@ -114,9 +114,9 @@ public class ContextSteps {
     public void a_context_containing_a_key_with_type_and_with_value(String key, String type, String value)
             throws ClassNotFoundException, InstantiationException {
         Map<String, Value> map = state.context.asMap();
-        Map<String, Value> map = state.context.asMap();
         map.put(key, new Value(Utils.convert(value, type)));
         state.context = new MutableContext(state.context.getTargetingKey(), map);
+    }

     @given("a context containing a targeting key with value {string}")
     public void a_context_containing_a_targeting_key_with_value(String string) {
diff --git c/src/test/java/dev/openfeature/sdk/testutils/jackson/CelContextEvaluator.java i/src/test/java/dev/openfeature/sdk/testutils/jackson/CelContextEvaluator.java
index 20f3f5f..138c23f 100644
--- c/src/test/java/dev/openfeature/sdk/testutils/jackson/CelContextEvaluator.java
+++ i/src/test/java/dev/openfeature/sdk/testutils/jackson/CelContextEvaluator.java
@@ -46,7 +46,6 @@ public class CelContextEvaluator<T> implements ContextEvaluator<T> {
                 // Evaluate with context, overriding defaults.
                 objectMap.putAll(evaluationContext.asObjectMap());
             }
-            }

             Object result = program.eval(objectMap);

diff --git c/src/test/java/dev/openfeature/sdk/testutils/jackson/VariantsMapDeserializer.java i/src/test/java/dev/openfeature/sdk/testutils/jackson/VariantsMapDeserializer.java
index 339d8c8..9a63f58 100644
--- c/src/test/java/dev/openfeature/sdk/testutils/jackson/VariantsMapDeserializer.java
+++ i/src/test/java/dev/openfeature/sdk/testutils/jackson/VariantsMapDeserializer.java
@@ -50,6 +50,7 @@ public class VariantsMapDeserializer extends JsonDeserializer<Map<String, Object
     }

     private Object convertJsonNodeToValue(JsonNode node) throws InstantiationException {
+
         if (node.isNull()) {
             return null;
         } else if (node.isBoolean()) {
@@ -60,25 +61,8 @@ public class VariantsMapDeserializer extends JsonDeserializer<Map<String, Object
             return node.asDouble();
         } else if (node.isTextual()) {
             return node.asText();
-        } else if (node.isArray()) {
-            List<Object> list = new ArrayList<>();
-            for (JsonNode item : node) {
-                list.add(convertJsonNodeToValue(item));
-            }
-            return list;
         } else if (node.isObject()) {
-            Map<String, Value> map = new HashMap<>();
-            Iterator<Map.Entry<String, JsonNode>> fields = node.fields();
-            while (fields.hasNext()) {
-                Map.Entry<String, JsonNode> field = fields.next();
-                Object o = convertJsonNodeToValue(field.getValue());
-                if (o instanceof Value) {
-                    map.put(field.getKey(), (Value) o);
-                } else {
-                    map.put(field.getKey(), new Value(o));
-                }
-            }
-            return new Value(new MutableStructure(map));
+            return Value.objectToValue(node);
         }

         throw new IllegalArgumentException("Unsupported JSON node type: " + node.getNodeType());

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

Author: aepfli

pom.xml

@@ -168,10 +168,21 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.19.2</version>
             <scope>test</scope>
         </dependency>
 
@@ -205,6 +216,14 @@
             </dependency>
             <!-- End mockito workaround-->
 
+            <dependency>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>2.16.1</version> <!-- Use the desired version -->
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>cucumber-bom</artifactId>

spec

@@ -16,5 +16,5 @@
 @ConfigurationParameter(key = PLUGIN_PROPERTY_NAME, value = "pretty")
 @ConfigurationParameter(key = GLUE_PROPERTY_NAME, value = "dev.openfeature.sdk.e2e.steps")
 @ConfigurationParameter(key = OBJECT_FACTORY_PROPERTY_NAME, value = "io.cucumber.picocontainer.PicoFactory")
-@ExcludeTags({"deprecated"})
+@ExcludeTags({"deprecated", "provider-status", "reason-codes", "async", "immutability", "evaluation-options"})
 public class GherkinSpecTest {}

src/test/java/dev/openfeature/sdk/e2e/GherkinSpecTest.java

@@ -1,5 +1,8 @@
 package dev.openfeature.sdk.e2e;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import dev.openfeature.sdk.Value;
 import java.util.Objects;
 
 public final class Utils {
@@ -22,6 +25,12 @@ public static Object convert(String value, String type) {
                 return Double.parseDouble(value);
             case "long":
                 return Long.parseLong(value);
+            case "object":
+                try {
+                    return Value.objectToValue(new ObjectMapper().readValue(value, Object.class));
+                } catch (JsonProcessingException e) {
+                    throw new RuntimeException(e);
+                }
         }
         throw new RuntimeException("Unknown config type: " + type);
     }

src/test/java/dev/openfeature/sdk/e2e/Utils.java

@@ -15,6 +15,7 @@
 import dev.openfeature.sdk.Value;
 import dev.openfeature.sdk.e2e.ContextStoringProvider;
 import dev.openfeature.sdk.e2e.State;
+import dev.openfeature.sdk.e2e.Utils;
 import io.cucumber.datatable.DataTable;
 import io.cucumber.java.en.And;
 import io.cucumber.java.en.Given;
@@ -105,18 +106,16 @@ public void contextEntriesForEachLevelFromAPILevelDownToTheLevelWithKeyAndValue(
     }
 
     @Given("a context containing a key {string} with null value")
-    public void a_context_containing_a_key_with_null_value(String key)
-            throws ClassNotFoundException, InstantiationException {
+    public void a_context_containing_a_key_with_null_value(String key) {
         a_context_containing_a_key_with_type_and_with_value(key, "String", null);
     }
 
     @Given("a context containing a key {string}, with type {string} and with value {string}")
-    public void a_context_containing_a_key_with_type_and_with_value(String key, String type, String value)
-            throws ClassNotFoundException, InstantiationException {
+    public void a_context_containing_a_key_with_type_and_with_value(String key, String type, String value) {
         Map<String, Value> map = state.context.asMap();
-        Map<String, Value> map = state.context.asMap();
-        map.put(key, new Value(Utils.convert(value, type)));
+        map.put(key, Value.objectToValue(Utils.convert(value, type)));
         state.context = new MutableContext(state.context.getTargetingKey(), map);
+    }
 
     @Given("a context containing a targeting key with value {string}")
     public void a_context_containing_a_targeting_key_with_value(String string) {

src/test/java/dev/openfeature/sdk/e2e/steps/ContextSteps.java

@@ -61,7 +61,15 @@ public void the_flag_was_evaluated_with_details() {
 
     @Then("the resolved details value should be {string}")
     public void the_resolved_details_value_should_be(String value) {
-        assertThat(state.evaluation.getValue()).isEqualTo(Utils.convert(value, state.flag.type));
+        Object evaluationValue = state.evaluation.getValue();
+        if (state.flag.type.equalsIgnoreCase("object")) {
+            assertThat(((Value) evaluationValue).asStructure().asObjectMap())
+                    .isEqualTo(((Value) Utils.convert(value, state.flag.type))
+                            .asStructure()
+                            .asObjectMap());
+        } else {
+            assertThat(evaluationValue).isEqualTo(Utils.convert(value, state.flag.type));
+        }
     }
 
     @Then("the flag key should be {string}")

src/test/java/dev/openfeature/sdk/e2e/steps/FlagStepDefinitions.java

@@ -12,6 +12,7 @@
 import dev.openfeature.sdk.testutils.jackson.InMemoryFlagMixin;
 import java.io.IOException;
 import java.nio.file.Paths;
+import java.util.Collections;
 import java.util.Map;
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
@@ -32,33 +33,37 @@ public class TestFlagsUtils {
     public static final String WRONG_FLAG_KEY = "wrong-flag";
     public static final String METADATA_FLAG_KEY = "metadata-flag";
 
+    private static Map<String, Flag<?>> flags;
     /**
      * Building flags for testing purposes.
      *
      * @return map of flags
      */
     public static Map<String, Flag<?>> buildFlags() {
-        ObjectMapper objectMapper = new ObjectMapper();
-        objectMapper.configure(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION.mappedFeature(), true);
-        objectMapper.addMixIn(Flag.class, InMemoryFlagMixin.class);
-        objectMapper.addMixIn(Flag.FlagBuilder.class, InMemoryFlagMixin.FlagBuilderMixin.class);
+        if (flags == null) {
+            ObjectMapper objectMapper = new ObjectMapper();
+            objectMapper.configure(StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION.mappedFeature(), true);
+            objectMapper.addMixIn(Flag.class, InMemoryFlagMixin.class);
+            objectMapper.addMixIn(Flag.FlagBuilder.class, InMemoryFlagMixin.FlagBuilderMixin.class);
 
-        SimpleModule module = new SimpleModule();
-        module.addDeserializer(ImmutableMetadata.class, new ImmutableMetadataDeserializer());
-        module.addDeserializer(ContextEvaluator.class, new ContextEvaluatorDeserializer());
-        objectMapper.registerModule(module);
+            SimpleModule module = new SimpleModule();
+            module.addDeserializer(ImmutableMetadata.class, new ImmutableMetadataDeserializer());
+            module.addDeserializer(ContextEvaluator.class, new ContextEvaluatorDeserializer());
+            objectMapper.registerModule(module);
 
-        Map<String, Flag<?>> flagsJson;
-        try {
-            flagsJson = objectMapper.readValue(
-                    Paths.get("spec/specification/assets/gherkin/test-flags.json")
-                            .toFile(),
-                    new TypeReference<>() {});
+            Map<String, Flag<?>> flagsJson;
+            try {
+                flagsJson = objectMapper.readValue(
+                        Paths.get("spec/specification/assets/gherkin/test-flags.json")
+                                .toFile(),
+                        new TypeReference<>() {});
 
-        } catch (IOException e) {
-            throw new RuntimeException(e);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+            flags = Collections.unmodifiableMap(flagsJson);
         }
 
-        return flagsJson;
+        return flags;
     }
 }

src/test/java/dev/openfeature/sdk/testutils/TestFlagsUtils.java

@@ -19,7 +19,7 @@ public CelContextEvaluator(String expression) {
             CelRuntime celRuntime =
                     CelRuntimeFactory.standardCelRuntimeBuilder().build();
             CelCompiler celCompiler = CelCompilerFactory.standardCelCompilerBuilder()
-                    .addVar("customer", SimpleType.STRING)
+                    .addVar("customer", SimpleType.BOOL)
                     .addVar("email", SimpleType.STRING)
                     .addVar("dummy", SimpleType.STRING)
                     .setResultType(SimpleType.STRING)
@@ -36,6 +36,7 @@ public CelContextEvaluator(String expression) {
     @Override
     @SuppressWarnings("unchecked")
     public T evaluate(Flag flag, EvaluationContext evaluationContext) {
+        try {
             Map<String, Object> objectMap = new HashMap<>();
             // Provide defaults for all declared variables to prevent runtime errors.
             objectMap.put("email", "");
@@ -46,7 +47,6 @@ public T evaluate(Flag flag, EvaluationContext evaluationContext) {
                 // Evaluate with context, overriding defaults.
                 objectMap.putAll(evaluationContext.asObjectMap());
             }
-            }
 
             Object result = program.eval(objectMap);
 

src/test/java/dev/openfeature/sdk/testutils/jackson/CelContextEvaluator.java

@@ -1,13 +1,12 @@
 package dev.openfeature.sdk.testutils.jackson;
 
 import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
-import dev.openfeature.sdk.MutableStructure;
 import dev.openfeature.sdk.Value;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -27,29 +26,24 @@ public Map<String, Object> deserialize(JsonParser p, DeserializationContext ctxt
             JsonNode variantNode = field.getValue();
 
             // Convert the variant value to OpenFeature Value
-            Object variantValue = null;
-            try {
-                variantValue = convertToValue(variantNode);
-            } catch (InstantiationException e) {
-                throw new RuntimeException(e);
-            }
+            Object variantValue = convertToValue(p, variantNode);
             variants.put(variantKey, variantValue);
         }
 
         return variants;
     }
 
-    private Object convertToValue(JsonNode node) throws InstantiationException {
+    private Object convertToValue(JsonParser p, JsonNode node) throws JsonProcessingException {
         // If the node has a "value" property, use that
         if (node.isObject() && node.has("value")) {
-            return convertJsonNodeToValue(node.get("value"));
+            return convertJsonNodeToValue(p, node.get("value"));
         }
 
         // Otherwise, treat the entire node as the value
-        return convertJsonNodeToValue(node);
+        return convertJsonNodeToValue(p, node);
     }
 
-    private Object convertJsonNodeToValue(JsonNode node) throws InstantiationException {
+    private Object convertJsonNodeToValue(JsonParser p, JsonNode node) throws JsonProcessingException {
         if (node.isNull()) {
             return null;
         } else if (node.isBoolean()) {
@@ -61,24 +55,9 @@ private Object convertJsonNodeToValue(JsonNode node) throws InstantiationExcepti
         } else if (node.isTextual()) {
             return node.asText();
         } else if (node.isArray()) {
-            List<Object> list = new ArrayList<>();
-            for (JsonNode item : node) {
-                list.add(convertJsonNodeToValue(item));
-            }
-            return list;
+            return Value.objectToValue(p.getCodec().treeToValue(node, List.class));
         } else if (node.isObject()) {
-            Map<String, Value> map = new HashMap<>();
-            Iterator<Map.Entry<String, JsonNode>> fields = node.fields();
-            while (fields.hasNext()) {
-                Map.Entry<String, JsonNode> field = fields.next();
-                Object o = convertJsonNodeToValue(field.getValue());
-                if (o instanceof Value) {
-                    map.put(field.getKey(), (Value) o);
-                } else {
-                    map.put(field.getKey(), new Value(o));
-                }
-            }
-            return new Value(new MutableStructure(map));
+            return Value.objectToValue(p.getCodec().treeToValue(node, Object.class));
         }
 
         throw new IllegalArgumentException("Unsupported JSON node type: " + node.getNodeType());