X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fresources%2FAAFAuthorizationFilterTest.java;h=ba11b0189808b5a8cebd1eceeb691f4e973820bf;hb=18eaae524174fac4f21d83c94bb8347a29d9f879;hp=73794cd4b45bed5354dd39df729ec2635eb367a4;hpb=a2a6ac2713087669effbad9abf00f60eabaa7b82;p=dmaap%2Fdbcapi.git

diff --git a/src/test/java/org/onap/dmaap/dbcapi/resources/AAFAuthorizationFilterTest.java b/src/test/java/org/onap/dmaap/dbcapi/resources/AAFAuthorizationFilterTest.java
index 73794cd..ba11b01 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/resources/AAFAuthorizationFilterTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/resources/AAFAuthorizationFilterTest.java
@@ -33,6 +33,7 @@ import static org.mockito.Mockito.when;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import com.sun.security.auth.UserPrincipal;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
 import javax.servlet.http.HttpServletRequest;
@@ -47,7 +48,6 @@ import org.onap.dmaap.dbcapi.model.Dmaap;
 import org.onap.dmaap.dbcapi.service.DmaapService;
 import org.onap.dmaap.dbcapi.util.DmaapConfig;
 import org.onap.dmaap.dbcapi.util.PermissionBuilder;
-import sun.security.acl.PrincipalImpl;
 
 @RunWith(MockitoJUnitRunner.class)
 public class AAFAuthorizationFilterTest {
@@ -107,7 +107,7 @@ public class AAFAuthorizationFilterTest {
     @Test
     public void doFilter_shouldSkipAuthorization_whenAAFnotUsed() throws Exception {
         //given
-        filter.setAafEnabled(false);
+        filter.setCadiEnabled(false);
 
         //when
         filter.doFilter(servletRequest,servletResponse,filterChain);
@@ -125,7 +125,7 @@ public class AAFAuthorizationFilterTest {
         String permission = "org.onap.dmaap-bc.api.topics|mr|GET";
         when(permissionBuilder.buildPermission(servletRequest)).thenReturn(permission);
         configureServletRequest(permission, user, true);
-        filter.setAafEnabled(true);
+        filter.setCadiEnabled(true);
 
         //when
         filter.doFilter(servletRequest,servletResponse,filterChain);
@@ -143,7 +143,7 @@ public class AAFAuthorizationFilterTest {
         String permission = "org.onap.dmaap-bc.api.topics|mr|GET";
         when(permissionBuilder.buildPermission(servletRequest)).thenReturn(permission);
         configureServletRequest(permission, user, false);
-        filter.setAafEnabled(true);
+        filter.setCadiEnabled(true);
 
         String errorMsgJson = "{\"code\":403,\"message\":\"User "+user+" does not have permission "
             + permission +"\",\"fields\":\"Authorization\",\"2xx\":false}";
@@ -162,11 +162,11 @@ public class AAFAuthorizationFilterTest {
     }
 
     private void configureServletRequest(String permission, String user, boolean isUserInRole) {
-        when(servletRequest.getUserPrincipal()).thenReturn(new PrincipalImpl(user));
+        when(servletRequest.getUserPrincipal()).thenReturn(new UserPrincipal(user));
         when(servletRequest.isUserInRole(permission)).thenReturn(isUserInRole);
     }
 
     private void configureAAFUsage(Boolean isUsed) {
-        doReturn(isUsed.toString()).when(dmaapConfig).getProperty(eq(AAFAuthorizationFilter.AAF_AUTHZ_FLAG), anyString());
+        doReturn(isUsed.toString()).when(dmaapConfig).getProperty(eq(AAFAuthorizationFilter.CADI_AUTHZ_FLAG), anyString());
     }
-}
\ No newline at end of file
+}