Merge "Fix unit test failure in ONAP-PDP-REST"
diff --git a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/auth/test/AuthenticationServiceTest.java b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/auth/test/AuthenticationServiceTest.java
index 0795526..4f03221 100644
--- a/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/auth/test/AuthenticationServiceTest.java
+++ b/ONAP-PDP-REST/src/test/java/org/onap/policy/pdp/rest/auth/test/AuthenticationServiceTest.java
@@ -24,11 +24,15 @@
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
+
+import com.att.research.xacml.util.XACMLProperties;
+
import java.io.UnsupportedEncodingException;
import java.util.Base64;
import javax.servlet.ServletRequest;
import org.junit.Test;
import org.onap.policy.pdp.rest.restauth.AuthenticationService;
+import org.onap.policy.rest.XacmlRestProperties;
public class AuthenticationServiceTest {
private final String testCred = "python:test";
@@ -40,10 +44,13 @@
String systemKey = "xacml.properties";
// Set the system property temporarily
- String oldProperty = System.getProperty(systemKey);
+ final String oldProperty = System.getProperty(systemKey);
System.setProperty(systemKey, "xacml.pdp.properties");
- ServletRequest request = mock(ServletRequest.class);
+ XACMLProperties.setProperty("enable_aaf", "false");
+ XACMLProperties.setProperty(XacmlRestProperties.PROP_PEP_IDFILE, "client.properties");
+ ServletRequest request = mock(ServletRequest.class);
+ AuthenticationService.getEnvironment();
assertTrue(AuthenticationService.checkPermissions(null, basicCred, "getConfig", "DEVL", request));
// Restore the original system property