6 files changed, 21 insertions, 36 deletions
diff --git a/openecomp-be/backend/openecomp-sdc-security-util/src/test/AuthenticationCookieUtilsTest.java b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/AuthenticationCookieUtilsTest.java
index 34d349a2b4..402803479f 100644
--- a/openecomp-be/backend/openecomp-sdc-security-util/src/test/AuthenticationCookieUtilsTest.java
+++ b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/AuthenticationCookieUtilsTest.java
@@ -18,14 +18,16 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.sdc.security;
-
 import org.junit.Test;
-import org.onap.sdc.security.filters.SampleFilter;
 
 import javax.servlet.http.Cookie;
 
 import java.io.IOException;
+import org.openecomp.sdc.securityutil.AuthenticationCookie;
+import org.openecomp.sdc.securityutil.AuthenticationCookieUtils;
+import org.openecomp.sdc.securityutil.CipherUtilException;
+import org.openecomp.sdc.securityutil.ISessionValidationFilterConfiguration;
+import org.openecomp.sdc.securityutil.filters.SampleFilter;
 
 import static org.junit.Assert.*;
 
@@ -38,7 +40,8 @@ public class AuthenticationCookieUtilsTest {
     public void vaildateThatCookieCurrentSessionTimeIncreased() throws IOException, CipherUtilException {
         // original cookie, pojo and servlet cookie
         AuthenticationCookie authenticationCookieOriginal = new AuthenticationCookie("kuku");
-        Cookie cookieWithOriginalTime = new Cookie(filterCfg.getCookieName(), AuthenticationCookieUtils.getEncryptedCookie(authenticationCookieOriginal,filterCfg ));
+        Cookie cookieWithOriginalTime = new Cookie(filterCfg.getCookieName(), AuthenticationCookieUtils
+            .getEncryptedCookie(authenticationCookieOriginal,filterCfg ));
         // cookie with increased time, pojo and servlet cookie
         Cookie cookieWithIncreasedTime = AuthenticationCookieUtils.updateSessionTime(cookieWithOriginalTime, filterCfg);
         AuthenticationCookie authenticationCookieIncreasedTime = AuthenticationCookieUtils.getAuthenticationCookie(cookieWithIncreasedTime, filterCfg);
@@ -58,17 +61,4 @@ public class AuthenticationCookieUtilsTest {
         assertTrue(authenticationCookieOriginal.equals(decriptedAndDeserializedAuthenticationCookie));
     }
 
-
-
-//    @Test
-//    public void getEncryptedCookie() {
-//    }
-//
-//    @Test
-//    public void getAuthenticationCookie() {
-//    }
-//
-//    @Test
-//    public void isSessionExpired() {
-//    }
 }
diff --git a/openecomp-be/backend/openecomp-sdc-security-util/src/test/CipherUtilTest.java b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/CipherUtilTest.java
index 6d539b6391..888c888d42 100644
--- a/openecomp-be/backend/openecomp-sdc-security-util/src/test/CipherUtilTest.java
+++ b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/CipherUtilTest.java
@@ -18,15 +18,12 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.sdc.security;
-
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.RandomStringUtils;
 import org.junit.Test;
+import org.openecomp.sdc.securityutil.CipherUtil;
+import org.openecomp.sdc.securityutil.CipherUtilException;
 
-import java.util.Random;
-
-import static org.apache.commons.codec.binary.Base64.encodeBase64String;
 import static org.junit.Assert.*;
 
 public class CipherUtilTest {
diff --git a/openecomp-be/backend/openecomp-sdc-security-util/src/test/PasswordsTest.java b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/PasswordsTest.java
index 4ead127ad2..d3ba3bbe4e 100644
--- a/openecomp-be/backend/openecomp-sdc-security-util/src/test/PasswordsTest.java
+++ b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/PasswordsTest.java
@@ -18,11 +18,9 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.sdc.security;
-
 import org.junit.Test;
+import org.openecomp.sdc.securityutil.Passwords;
 
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
diff --git a/openecomp-be/backend/openecomp-sdc-security-util/src/test/RepresentationUtilsTest.java b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/RepresentationUtilsTest.java
index 5d7798da56..5960c82130 100644
--- a/openecomp-be/backend/openecomp-sdc-security-util/src/test/RepresentationUtilsTest.java
+++ b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/RepresentationUtilsTest.java
@@ -18,13 +18,13 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.sdc.security;
-
 import org.junit.Test;
 
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
+import org.openecomp.sdc.securityutil.AuthenticationCookie;
+import org.openecomp.sdc.securityutil.RepresentationUtils;
 
 import static org.junit.Assert.assertTrue;
 
diff --git a/openecomp-be/backend/openecomp-sdc-security-util/src/test/SecurityUtilTest.java b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/SecurityUtilTest.java
index 9edce15a44..938f3c5e92 100644
--- a/openecomp-be/backend/openecomp-sdc-security-util/src/test/SecurityUtilTest.java
+++ b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/SecurityUtilTest.java
@@ -18,11 +18,10 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.sdc.security;
-
 import org.junit.Test;
 
 import java.util.Base64;
+import org.openecomp.sdc.securityutil.SecurityUtil;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
diff --git a/openecomp-be/backend/openecomp-sdc-security-util/src/test/SessionValidationFilterTest.java b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/SessionValidationFilterTest.java
index 9a1bb1c5c1..07151bc4d5 100644
--- a/openecomp-be/backend/openecomp-sdc-security-util/src/test/SessionValidationFilterTest.java
+++ b/openecomp-be/backend/openecomp-sdc-security-util/src/test/java/SessionValidationFilterTest.java
@@ -18,8 +18,6 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.sdc.security;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,8 +26,6 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.Spy;
 import org.mockito.junit.MockitoJUnitRunner;
-import org.onap.sdc.security.filters.ResponceWrapper;
-import org.onap.sdc.security.filters.SampleFilter;
 
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
@@ -38,13 +34,17 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import org.openecomp.sdc.securityutil.AuthenticationCookie;
+import org.openecomp.sdc.securityutil.AuthenticationCookieUtils;
+import org.openecomp.sdc.securityutil.CipherUtilException;
+import org.openecomp.sdc.securityutil.RepresentationUtils;
+import org.openecomp.sdc.securityutil.filters.ResponceWrapper;
+import org.openecomp.sdc.securityutil.filters.SampleFilter;
 
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.class)
-//@RunWith(PowerMockRunner.class)
-//@PrepareForTest(fullyQualifiedNames = "org.onap.sdc.security.*")
 public class SessionValidationFilterTest {
 
     @Mock
@@ -126,7 +126,8 @@ public class SessionValidationFilterTest {
         long startTime = authenticationCookie.getMaxSessionTime();
         long timeout = startTime - maxSessionTimeOut - 1000l;
         authenticationCookie.setMaxSessionTime(timeout);
-        Cookie cookie = new Cookie(sessionValidationFilter.getFilterConfiguration().getCookieName(), AuthenticationCookieUtils.getEncryptedCookie(authenticationCookie, sessionValidationFilter.getFilterConfiguration()));
+        Cookie cookie = new Cookie(sessionValidationFilter.getFilterConfiguration().getCookieName(), AuthenticationCookieUtils
+            .getEncryptedCookie(authenticationCookie, sessionValidationFilter.getFilterConfiguration()));
 
         when(request.getCookies()).thenReturn(new Cookie[]{cookie});
         sessionValidationFilter.doFilter(request, response, filterChain);