From: adheli.tavares <adheli.tavares@est.tech>
Date: Tue, 12 Nov 2024 12:12:20 +0000 (+0000)
Subject: Fix unit tests failing after 3pp uplift
X-Git-Tag: 4.0.1~2^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2216bc294d2df0a317b3a062d5fbc57c5050d2de;p=policy%2Fxacml-pdp.git

Fix unit tests failing after 3pp uplift

Issue-ID: POLICY-5073
Change-Id: If1fe391d578035b717fa7a428c284fd1aafb68db
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>
---

diff --git a/main/src/test/java/org/onap/policy/pdpx/main/startstop/TestMain.java b/main/src/test/java/org/onap/policy/pdpx/main/startstop/TestMain.java
index 80e6f707..b9b8b9e4 100644
--- a/main/src/test/java/org/onap/policy/pdpx/main/startstop/TestMain.java
+++ b/main/src/test/java/org/onap/policy/pdpx/main/startstop/TestMain.java
@@ -29,6 +29,7 @@ import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.onap.policy.common.parameters.ParameterService;
 import org.onap.policy.pdpx.main.CommonRest;
 import org.onap.policy.pdpx.main.PolicyXacmlPdpException;
 
@@ -46,6 +47,7 @@ class TestMain extends CommonRest {
      */
     @BeforeAll
     public static void setUpBeforeClass() throws Exception {
+        ParameterService.clear();
         CommonRest.setUpBeforeClass();
 
         // don't want the common "main" running
diff --git a/main/src/test/java/org/onap/policy/pdpx/main/startstop/TestXacmlPdpActivator.java b/main/src/test/java/org/onap/policy/pdpx/main/startstop/TestXacmlPdpActivator.java
index bdcbd99c..2db620de 100644
--- a/main/src/test/java/org/onap/policy/pdpx/main/startstop/TestXacmlPdpActivator.java
+++ b/main/src/test/java/org/onap/policy/pdpx/main/startstop/TestXacmlPdpActivator.java
@@ -30,6 +30,7 @@ import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.onap.policy.common.parameters.ParameterService;
 import org.onap.policy.pdpx.main.CommonRest;
 import org.onap.policy.pdpx.main.parameters.CommonTestData;
 import org.onap.policy.pdpx.main.parameters.XacmlPdpParameterGroup;
@@ -52,6 +53,7 @@ public class TestXacmlPdpActivator extends CommonRest {
      */
     @BeforeAll
     public static void setUpBeforeClass() throws Exception {
+        ParameterService.clear();
         CommonRest.setUpBeforeClass();
 
         final String[] xacmlPdpConfigParameters = {"-c", CommonRest.CONFIG_FILE};