Merge pull request #64 from IABTechLab/gdm-UID2-5040-e2e

gmsdelmundo · web-flow · commit 25fc2012716f · 2025-03-24T13:21:41.000+08:00
Refactored util classes
diff --git a/src/test/java/app/AppsMap.java b/src/test/java/app/AppsMap.java
@@ -1,6 +1,6 @@
 package app;
 
-import app.common.EnvUtil;
+import common.EnvUtil;
 import app.component.App;
 
 import java.lang.reflect.InvocationTargetException;
diff --git a/src/test/java/app/GitHubTestPipelineApps.java b/src/test/java/app/GitHubTestPipelineApps.java
@@ -1,6 +1,6 @@
 package app;
 
-import app.common.EnvUtil;
+import common.EnvUtil;
 import app.component.Core;
 import app.component.Operator;
 
diff --git a/src/test/java/app/component/App.java b/src/test/java/app/component/App.java
@@ -1,6 +1,6 @@
 package app.component;
 
-import app.common.HttpClient;
+import common.HttpClient;
 
 public abstract class App {
     private final String host;
diff --git a/src/test/java/app/component/Core.java b/src/test/java/app/component/Core.java
@@ -1,8 +1,8 @@
 package app.component;
 
-import app.common.EnvUtil;
-import app.common.HttpClient;
-import app.common.Mapper;
+import common.EnvUtil;
+import common.HttpClient;
+import common.Mapper;
 import com.fasterxml.jackson.databind.JsonNode;
 
 import java.util.HashMap;
diff --git a/src/test/java/app/component/Localstack.java b/src/test/java/app/component/Localstack.java
@@ -1,6 +1,6 @@
 package app.component;
 
-import app.common.HttpClient;
+import common.HttpClient;
 
 public class Localstack extends App {
     public Localstack(String host, Integer port, String name) {
diff --git a/src/test/java/app/component/Operator.java b/src/test/java/app/component/Operator.java
@@ -1,8 +1,8 @@
 package app.component;
 
-import app.common.EnvUtil;
-import app.common.HttpClient;
-import app.common.Mapper;
+import common.EnvUtil;
+import common.HttpClient;
+import common.Mapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
diff --git a/src/test/java/app/component/Optout.java b/src/test/java/app/component/Optout.java
@@ -1,9 +1,9 @@
 package app.component;
 
 
-import app.common.EnvUtil;
-import app.common.HttpClient;
-import app.common.Mapper;
+import common.EnvUtil;
+import common.HttpClient;
+import common.Mapper;
 import com.fasterxml.jackson.databind.JsonNode;
 
 public class Optout extends App {
diff --git a/src/test/java/app/component/Prometheus.java b/src/test/java/app/component/Prometheus.java
@@ -1,6 +1,6 @@
 package app.component;
 
-import app.common.HttpClient;
+import common.HttpClient;
 
 public class Prometheus extends App {
     public Prometheus(String host, Integer port, String name) {
diff --git a/src/test/java/app/component/Validator.java b/src/test/java/app/component/Validator.java
@@ -1,6 +1,6 @@
 package app.component;
 
-import app.common.HttpClient;
+import common.HttpClient;
 import com.uid2.client.*;
 import okhttp3.*;
 
diff --git a/src/test/java/common/EnabledCondition.java b/src/test/java/common/EnabledCondition.java
@@ -1,6 +1,4 @@
-package helper;
-
-import app.common.EnvUtil;
+package common;
 
 public final class EnabledCondition {
     private static final String ENV = EnvUtil.getEnv("UID2_E2E_ENV");
diff --git a/src/test/java/common/EnvUtil.java b/src/test/java/common/EnvUtil.java
@@ -1,4 +1,4 @@
-package app.common;
+package common;
 
 import org.apache.commons.lang3.StringUtils;
 import org.junit.platform.commons.logging.Logger;
diff --git a/src/test/java/common/HttpClient.java b/src/test/java/common/HttpClient.java
@@ -1,4 +1,4 @@
-package app.common;
+package common;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import okhttp3.*;
diff --git a/src/test/java/common/JsonAssert.java b/src/test/java/common/JsonAssert.java
@@ -1,4 +1,4 @@
-package helper;
+package common;
 
 import com.fasterxml.jackson.databind.JsonNode;
 
diff --git a/src/test/java/common/Mapper.java b/src/test/java/common/Mapper.java
@@ -1,4 +1,4 @@
-package app.common;
+package common;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
diff --git a/src/test/java/suite/core/CoreRefreshTest.java b/src/test/java/suite/core/CoreRefreshTest.java
@@ -3,7 +3,7 @@
 import app.component.Core;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import helper.JsonAssert;
+import common.JsonAssert;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
diff --git a/src/test/java/suite/core/CoreTest.java b/src/test/java/suite/core/CoreTest.java
@@ -1,6 +1,6 @@
 package suite.core;
 
-import app.common.HttpClient;
+import common.HttpClient;
 import app.component.Core;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.uid2.shared.attest.JwtService;
diff --git a/src/test/java/suite/operator/TestData.java b/src/test/java/suite/operator/TestData.java
@@ -1,7 +1,7 @@
 package suite.operator;
 
 import app.AppsMap;
-import app.common.EnvUtil;
+import common.EnvUtil;
 import app.component.Operator;
 import com.uid2.client.DecryptionStatus;
 import org.junit.jupiter.params.provider.Arguments;
diff --git a/src/test/java/suite/operator/V0ApiOperatorTest.java b/src/test/java/suite/operator/V0ApiOperatorTest.java
@@ -1,11 +1,11 @@
 package suite.operator;
 
-import app.common.HttpClient;
-import app.common.Mapper;
+import common.HttpClient;
+import common.Mapper;
 import app.component.Operator;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import helper.JsonAssert;
+import common.JsonAssert;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 
diff --git a/src/test/java/suite/operator/V1ApiOperatorTest.java b/src/test/java/suite/operator/V1ApiOperatorTest.java
@@ -1,7 +1,7 @@
 package suite.operator;
 
-import app.common.HttpClient;
-import app.common.Mapper;
+import common.HttpClient;
+import common.Mapper;
 import app.component.Operator;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.junit.jupiter.params.ParameterizedTest;
diff --git a/src/test/java/suite/operator/V2ApiOperatorPublicOnlyTest.java b/src/test/java/suite/operator/V2ApiOperatorPublicOnlyTest.java
@@ -1,7 +1,7 @@
 package suite.operator;
 
-import app.common.HttpClient;
-import app.common.Mapper;
+import common.HttpClient;
+import common.Mapper;
 import app.component.Operator;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.uid2.client.DecryptionResponse;
diff --git a/src/test/java/suite/operator/V2ApiOperatorTest.java b/src/test/java/suite/operator/V2ApiOperatorTest.java
@@ -1,7 +1,7 @@
 package suite.operator;
 
-import app.common.EnvUtil;
-import app.common.Mapper;
+import common.EnvUtil;
+import common.Mapper;
 import app.component.Operator;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.uid2.client.*;
diff --git a/src/test/java/suite/optout/OptoutTest.java b/src/test/java/suite/optout/OptoutTest.java
@@ -1,6 +1,6 @@
 package suite.optout;
 
-import app.common.Mapper;
+import common.Mapper;
 import app.component.Operator;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.uid2.client.IdentityTokens;
diff --git a/src/test/java/suite/optout/TestData.java b/src/test/java/suite/optout/TestData.java
@@ -1,7 +1,7 @@
 package suite.optout;
 
 import app.AppsMap;
-import app.common.EnvUtil;
+import common.EnvUtil;
 import app.component.Operator;
 import org.junit.jupiter.params.provider.Arguments;
 
diff --git a/src/test/java/suite/validator/V0ApiValidatorTest.java b/src/test/java/suite/validator/V0ApiValidatorTest.java
@@ -1,6 +1,6 @@
 package suite.validator;
 
-import app.common.HttpClient;
+import common.HttpClient;
 import app.component.Operator;
 import app.component.Prometheus;
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/src/test/java/suite/validator/V1ApiValidatorTest.java b/src/test/java/suite/validator/V1ApiValidatorTest.java
@@ -1,6 +1,6 @@
 package suite.validator;
 
-import app.common.HttpClient;
+import common.HttpClient;
 import app.component.Operator;
 import app.component.Prometheus;
 import com.fasterxml.jackson.databind.JsonNode;
diff --git a/src/test/java/suite/validator/V2ApiValidatorTest.java b/src/test/java/suite/validator/V2ApiValidatorTest.java
@@ -1,6 +1,6 @@
 package suite.validator;
 
-import app.common.HttpClient;
+import common.HttpClient;
 import app.component.Operator;
 import app.component.Prometheus;
 import com.uid2.client.IdentityTokens;
diff --git a/src/test/java/suite/validator/ValidatorTestBase.java b/src/test/java/suite/validator/ValidatorTestBase.java
@@ -1,6 +1,6 @@
 package suite.validator;
 
-import app.common.HttpClient;
+import common.HttpClient;
 import app.component.Prometheus;
 
 import java.math.BigDecimal;
