Fixed bugs

Author: gmsdelmundo

README.md

@@ -50,7 +50,7 @@ There are different test suites that can be run depending on the environment and
 | `UID2_OPERATOR_E2E_CLIENT_API_SECRET_BEFORE_OPTOUT_CUTOFF`  | **Optout cutoff tests** - The API secret before the optout policy cutoff for a client to communicate with Operator |
 | `UID2_OPERATOR_E2E_CLIENT_API_KEY_SHARING_RECIPIENT`        | **Sharing tests** - The API key with SHARER role for a client to communicate with Operator                         |
 | `UID2_OPERATOR_E2E_CLIENT_API_SECRET_SHARING_RECIPIENT`     | **Sharing tests** - The API with SHARER role secret for a client to communicate with Operator                      |
-| `UID2_OPERATOR_E2E_CLIENT_API_KEY_SHARING_NON_RECIPIENT`    | **Sharing tests** - The API key without SHARER role for a client to communicate with Operator                      |
+| `UID2_OPERATOR_E2E_CLIENT_API_KEY_NON_SHARING_RECIPIENT`    | **Sharing tests** - The API key without SHARER role for a client to communicate with Operator                      |
 | `UID2_OPERATOR_E2E_CLIENT_API_SECRET_NON_SHARING_RECIPIENT` | **Sharing tests** - The API without SHARER role secret for a client to communicate with Operator                   |
 | `UID2_OPERATOR_E2E_CSTG_SUBSCRIPTION_ID`                    | **CSTG tests** - The subscription ID                                                                               |
 | `UID2_OPERATOR_E2E_CSTG_SERVER_PUBLIC_KEY`                  | **CSTG tests** - The server public key                                                                             |

src/test/java/app/LocalApps.java

@@ -5,14 +5,14 @@
 import java.util.Set;
 
 public final class LocalApps extends Apps {
+    // TODO: Add optout
     public LocalApps() {
         super(Set.of(
                 new Localstack("http://localhost", 5001, "Local - Localstack"),
                 new Admin("http://localhost", 8089, "Local - Admin"),
                 new Core("http://localhost", 8088, "Local - Core"),
                 new Operator("http://localhost", 8888, "Local - Public Operator", Operator.Type.PUBLIC),
                 new Operator("http://localhost", 8180, "Local - Private Operator", Operator.Type.PRIVATE),
-                new Optout("http://localhost", 8081, "Local - Optout"),
                 new Prometheus("http://localhost", 9085, "Local - Validator Prometheus")
         ));
     }

src/test/java/app/component/Optout.java

@@ -31,7 +31,7 @@ public static final class Operator {
             public static final String CLIENT_API_KEY_SHARING_RECIPIENT = "UID2_OPERATOR_E2E_CLIENT_API_KEY_SHARING_RECIPIENT";
             public static final String CLIENT_API_SECRET_SHARING_RECIPIENT = "UID2_OPERATOR_E2E_CLIENT_API_SECRET_SHARING_RECIPIENT";
 
-            public static final String CLIENT_API_KEY_NON_SHARING_RECIPIENT = "UID2_OPERATOR_E2E_CLIENT_API_KEY_SHARING_NON_RECIPIENT";
+            public static final String CLIENT_API_KEY_NON_SHARING_RECIPIENT = "UID2_OPERATOR_E2E_CLIENT_API_KEY_NON_SHARING_RECIPIENT";
             public static final String CLIENT_API_SECRET_NON_SHARING_RECIPIENT = "UID2_OPERATOR_E2E_CLIENT_API_SECRET_NON_SHARING_RECIPIENT";
 
             // Local only - CSTG

src/test/java/common/Const.java

@@ -15,7 +15,7 @@ public final class EnvUtil {
 
     static {
         try {
-            String args = getEnv(Const.Config.ARGS_JSON);
+            String args = getEnv(Const.Config.ARGS_JSON, false);
 
             if (StringUtils.isNotBlank(args)) {
                 TypeReference<HashMap<String, String>> typeRef = new TypeReference<>() {
@@ -31,17 +31,21 @@ public final class EnvUtil {
     private EnvUtil() {
     }
 
-    public static String getEnv(String env) {
+    public static String getEnv(String env, boolean required) {
         String value = System.getenv(env);
         if (StringUtils.isBlank(value)) {
             value = ARGS.get(env);
         }
 
-        if (StringUtils.isBlank(value)) {
+        if (StringUtils.isBlank(value) && required) {
             LOGGER.error(() -> "Missing environment variable: " + env);
             System.exit(1);
         }
 
         return value;
     }
+
+    public static String getEnv(String env) {
+        return getEnv(env, true);
+    }
 }

src/test/java/common/EnvUtil.java

@@ -12,7 +12,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-@EnabledIf("helper.EnabledCondition#isLocal")
+@EnabledIf("common.EnabledCondition#isLocal")
 public class CoreRefreshTest {
     @ParameterizedTest(name = "Refresh test - UrlPath: {1} - JsonPath: {2}")
     @MethodSource({"suite.core.TestData#refreshArgs", "suite.core.TestData#refreshArgsEncrypted"})

src/test/java/suite/core/CoreRefreshTest.java

@@ -12,7 +12,7 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-@EnabledIf("helper.EnabledCondition#isLocal")
+@EnabledIf("common.EnabledCondition#isLocal")
 public class CoreTest {
     @ParameterizedTest(name = "/attest - {0}")
     @MethodSource({

src/test/java/suite/core/CoreTest.java

@@ -17,7 +17,7 @@
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
-@EnabledIf("helper.EnabledCondition#isLocal")
+@EnabledIf("common.EnabledCondition#isLocal")
 public class V2ApiOperatorLocalOnlyTest {
     @ParameterizedTest(name = "{index} ==> Sender {0} encrypts with {1}, recipient {2} decrypts with {3}, expected result is {4}")
     @MethodSource({