Reorganised Core tests

Author: gmsdelmundo

src/test/java/app/GitHubTestPipelineApps.java

@@ -1,17 +1,20 @@
 package app;
 
+import app.component.App;
+import common.Const;
+import common.EnabledCondition;
 import common.EnvUtil;
 import app.component.Core;
 import app.component.Operator;
 
 import java.util.Set;
 
 public class GitHubTestPipelineApps extends Apps {
-    private static final String OPERATOR_URL = EnvUtil.getEnv("UID2_E2E_PIPELINE_OPERATOR_URL");
-    private static final Operator.Type OPERATOR_TYPE = Operator.Type.valueOf(EnvUtil.getEnv("UID2_E2E_PIPELINE_OPERATOR_TYPE"));
-    private static final Operator.CloudProvider OPERATOR_CLOUD_PROVIDER = Operator.CloudProvider.valueOf(EnvUtil.getEnv("UID2_E2E_PIPELINE_OPERATOR_CLOUD_PROVIDER"));
+    private static final String CORE_URL = EnvUtil.getEnv(Const.Config.Pipeline.CORE_URL);
 
-    private static final String CORE_URL = EnvUtil.getEnv("UID2_E2E_CORE_URL");
+    private static final String OPERATOR_URL = EnvUtil.getEnv(Const.Config.Pipeline.OPERATOR_URL);
+    private static final Operator.Type OPERATOR_TYPE = Operator.Type.valueOf(EnvUtil.getEnv(Const.Config.Pipeline.OPERATOR_TYPE));
+    private static final Operator.CloudProvider OPERATOR_CLOUD_PROVIDER = Operator.CloudProvider.valueOf(EnvUtil.getEnv(Const.Config.Pipeline.OPERATOR_CLOUD_PROVIDER));
     private static final String OPERATOR_NAME = OPERATOR_TYPE == Operator.Type.PUBLIC
             ? "GitHub Test Pipeline - Public Operator"
             : "GitHub Test Pipeline - Private %s Operator".formatted(OPERATOR_CLOUD_PROVIDER.toString());

src/test/java/common/Const.java

@@ -39,5 +39,14 @@ public static final class Core {
             public static final String CORE_URL = "UID2_CORE_E2E_CORE_URL";
             public static final String OPTOUT_URL = "UID2_CORE_E2E_OPTOUT_URL";
         }
+
+        // Args used for pipeline setup
+        public static final class Pipeline {
+            public static final String CORE_URL = "UID2_PIPELINE_E2E_CORE_URL";
+
+            public static final String OPERATOR_URL = "UID2_PIPELINE_E2E_OPERATOR_URL";
+            public static final String OPERATOR_TYPE = "UID2_PIPELINE_E2E_OPERATOR_TYPE";
+            public static final String OPERATOR_CLOUD_PROVIDER = "UID2_PIPELINE_E2E_OPERATOR_CLOUD_PROVIDER";
+        }
     }
 }

src/test/java/suite/E2ECoreTestSuite.java

@@ -0,0 +1,16 @@
+package suite;
+
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+import suite.basic.BasicTest;
+import suite.core.CoreRefreshTest;
+import suite.core.CoreTest;
+
+@Suite
+@SelectClasses({
+        BasicTest.class,
+        CoreTest.class,
+        CoreRefreshTest.class
+})
+public class E2ECoreTestSuite {
+}

src/test/java/suite/E2ELocalFullTestSuite.java

@@ -11,6 +11,7 @@
 import suite.operator.V2ApiOperatorTest;
 import suite.optout.OptoutTest;
 import suite.validator.V0ApiValidatorTest;
+import suite.validator.V1ApiValidatorTest;
 import suite.validator.V2ApiValidatorTest;
 
 @Suite
@@ -24,7 +25,7 @@
         V2ApiOperatorPublicOnlyTest.class,
         OptoutTest.class,
         V0ApiValidatorTest.class,
-        V1ApiOperatorTest.class,
+        V1ApiValidatorTest.class,
         V2ApiValidatorTest.class
 })
 public class E2ELocalFullTestSuite {

src/test/java/suite/E2EPublicOperatorTestSuite.java

@@ -14,8 +14,6 @@
 @Suite
 @SelectClasses({
         BasicTest.class,
-        CoreTest.class,
-        CoreRefreshTest.class,
         V0ApiOperatorTest.class,
         V1ApiOperatorTest.class,
         V2ApiOperatorTest.class,