X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PDP-REST%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpdp%2Frest%2Fauth%2Ftest%2FAuthenticationServiceTest.java;h=4f03221b71dcb943c663bd42b61780472b816cf1;hb=3948f989c9bb16fe3d5c0e46265ba4f4c7834815;hp=5641876757a495cd59e4e4e7c361fcaf85b38e40;hpb=4179c96ba6fcc5816f3e35130430b2955bc5cbbf;p=policy%2Fengine.git

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 564187675..4f03221b7 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
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP-PDP-REST
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Modifications Copyright (C) 2019 Samsung
  * ================================================================================
@@ -22,14 +22,20 @@
 
 package org.onap.policy.pdp.rest.auth.test;
 
-import static org.junit.Assert.assertEquals;
+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.pdp.rest.restauth.AuthenticationService;
+import org.onap.policy.rest.XacmlRestProperties;
 
 public class AuthenticationServiceTest {
-    private final String testCred = "testpdp:alpha456";
+    private final String testCred = "python:test";
     private final String testCredEncoded = new String(Base64.getEncoder().encode(testCred.getBytes()));
     private final String basicCred = "Basic " + testCredEncoded;
 
@@ -38,11 +44,14 @@ public class AuthenticationServiceTest {
         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");
+        XACMLProperties.setProperty("enable_aaf", "false");
+        XACMLProperties.setProperty(XacmlRestProperties.PROP_PEP_IDFILE, "client.properties");
 
-        AuthenticationService service = new AuthenticationService();
-        assertEquals(service.authenticate(basicCred), true);
+        ServletRequest request = mock(ServletRequest.class);
+        AuthenticationService.getEnvironment();
+        assertTrue(AuthenticationService.checkPermissions(null, basicCred, "getConfig", "DEVL", request));
 
         // Restore the original system property
         if (oldProperty != null) {