test: WIP Fixing tests

Author: fabriziodemaria

openfeature-provider-local/src/test/java/com/spotify/confidence/JavaResolveTest.java

@@ -179,7 +179,6 @@ public void testInvalidSecret() {
                 resolveWithContext(
                     List.of("flags/asd"),
                     "foo",
-                    "bar",
                     Struct.newBuilder().build(),
                     true,
                     "invalid-secret"))
@@ -189,19 +188,17 @@ public void testInvalidSecret() {
   @Test
   public void testInvalidFlag() {
     final var response =
-        resolveWithContext(List.of("flags/asd"), "foo", "bar", Struct.newBuilder().build(), false);
+        resolveWithContext(List.of("flags/asd"), "foo", Struct.newBuilder().build(), false);
     assertThat(response.getResolvedFlagsList()).isEmpty();
     assertThat(response.getResolveId()).isNotEmpty();
   }
 
   @Test
   public void testResolveFlag() {
     final var response =
-        resolveWithContext(List.of(flag1), "foo", "bar", Struct.newBuilder().build(), true);
+        resolveWithContext(List.of(flag1), "foo", Struct.newBuilder().build(), true);
     assertThat(response.getResolveId()).isNotEmpty();
-    final Struct expectedValue =
-        // expanded with nulls to match schema
-        variantOn.getValue().toBuilder().putFields("extra", Values.ofNull()).build();
+    final Struct expectedValue = variantOn.getValue();
 
     assertEquals(variantOn.getName(), response.getResolvedFlags(0).getVariant());
     assertEquals(expectedValue, response.getResolvedFlags(0).getValue());
@@ -211,11 +208,9 @@ public void testResolveFlag() {
   @Test
   public void testResolveFlagWithEncryptedResolveToken() {
     final var response =
-        resolveWithContext(List.of(flag1), "foo", "bar", Struct.newBuilder().build(), false);
+        resolveWithContext(List.of(flag1), "foo", Struct.newBuilder().build(), false);
     assertThat(response.getResolveId()).isNotEmpty();
-    final Struct expectedValue =
-        // expanded with nulls to match schema
-        variantOn.getValue().toBuilder().putFields("extra", Values.ofNull()).build();
+    final Struct expectedValue = variantOn.getValue();
 
     assertEquals(variantOn.getName(), response.getResolvedFlags(0).getVariant());
     assertEquals(expectedValue, response.getResolvedFlags(0).getValue());
@@ -255,15 +250,14 @@ public void testTooLongKey() {
         .isThrownBy(
             () ->
                 resolveWithContext(
-                    List.of(flag1), "a".repeat(101), "bar", Struct.newBuilder().build(), false))
+                    List.of(flag1), "a".repeat(101), Struct.newBuilder().build(), false))
         .withMessageContaining("Targeting key is too larger, max 100 characters.");
   }
 
   @Test
   public void testResolveIntegerTargetingKeyTyped() {
     final var response =
-        resolveWithNumericTargetingKey(
-            List.of(flag1), 1234567890, "bar", Struct.newBuilder().build(), true);
+        resolveWithNumericTargetingKey(List.of(flag1), 1234567890, Struct.newBuilder().build());
 
     assertThat(response.getResolvedFlagsList()).hasSize(1);
     assertEquals(ResolveReason.RESOLVE_REASON_MATCH, response.getResolvedFlags(0).getReason());
@@ -272,8 +266,7 @@ public void testResolveIntegerTargetingKeyTyped() {
   @Test
   public void testResolveDecimalUsername() {
     final var response =
-        resolveWithNumericTargetingKey(
-            List.of(flag1), 3.14159d, "bar", Struct.newBuilder().build(), true);
+        resolveWithNumericTargetingKey(List.of(flag1), 3.14159d, Struct.newBuilder().build());
 
     assertThat(response.getResolvedFlagsList()).hasSize(1);
     assertEquals(

openfeature-provider-local/src/test/java/com/spotify/confidence/ResolveTest.java

@@ -58,12 +58,7 @@ protected static void setup() {}
   protected void setUp() {}
 
   protected ResolveFlagsResponse resolveWithContext(
-      List<String> flags,
-      String username,
-      String structFieldName,
-      Struct struct,
-      boolean apply,
-      String secret) {
+      List<String> flags, String username, Struct struct, boolean apply, String secret) {
     try {
       return resolverServiceFactory
           .create(secret)
@@ -72,8 +67,7 @@ protected ResolveFlagsResponse resolveWithContext(
                   .addAllFlags(flags)
                   .setClientSecret(secret)
                   .setEvaluationContext(
-                      Structs.of(
-                          "targeting_key", Values.of(username), structFieldName, Values.of(struct)))
+                      Structs.of("targeting_key", Values.of(username), "bar", Values.of(struct)))
                   .setApply(apply)
                   .build())
           .get();
@@ -83,32 +77,22 @@ protected ResolveFlagsResponse resolveWithContext(
   }
 
   protected ResolveFlagsResponse resolveWithNumericTargetingKey(
-      List<String> flags,
-      Number targetingKey,
-      String structFieldName,
-      Struct struct,
-      boolean apply) {
+      List<String> flags, Number targetingKey, Struct struct) {
     try {
       final var builder =
           ResolveFlagsRequest.newBuilder()
               .addAllFlags(flags)
               .setClientSecret(secret.getSecret())
-              .setApply(apply);
+              .setApply(true);
 
       if (targetingKey instanceof Double || targetingKey instanceof Float) {
         builder.setEvaluationContext(
             Structs.of(
-                "targeting_key",
-                Values.of(targetingKey.doubleValue()),
-                structFieldName,
-                Values.of(struct)));
+                "targeting_key", Values.of(targetingKey.doubleValue()), "bar", Values.of(struct)));
       } else {
         builder.setEvaluationContext(
             Structs.of(
-                "targeting_key",
-                Values.of(targetingKey.longValue()),
-                structFieldName,
-                Values.of(struct)));
+                "targeting_key", Values.of(targetingKey.longValue()), "bar", Values.of(struct)));
       }
 
       return resolverServiceFactory.create(secret.getSecret()).resolveFlags(builder.build()).get();
@@ -118,7 +102,7 @@ protected ResolveFlagsResponse resolveWithNumericTargetingKey(
   }
 
   protected ResolveFlagsResponse resolveWithContext(
-      List<String> flags, String username, String structFieldName, Struct struct, boolean apply) {
-    return resolveWithContext(flags, username, structFieldName, struct, apply, secret.getSecret());
+      List<String> flags, String username, Struct struct, boolean apply) {
+    return resolveWithContext(flags, username, struct, apply, secret.getSecret());
   }
 }

openfeature-provider-local/src/test/java/com/spotify/confidence/TestBase.java

@@ -65,7 +65,6 @@ public void close() {}
     assertTrue(objectEvaluation.getValue().isStructure());
     final var structure = objectEvaluation.getValue().asStructure();
     assertEquals("on", structure.getValue("data").asString());
-    assertTrue(structure.getValue("extra").isNull());
   }
 
   @Test