Resubmitting KeyProperty code change since tests failed

[portal.git] / ecomp-portal-BE-common / src / test / java / org / onap / portalapp / portal / service / MicroserviceServiceImplTest.java

diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/MicroserviceServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/MicroserviceServiceImplTest.java
index ae81315..bc8d454 100644 (file)
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/MicroserviceServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/MicroserviceServiceImplTest.java
@@ -58,6 +58,8 @@ import org.onap.portalapp.portal.domain.MicroserviceData;
 import org.onap.portalapp.portal.domain.MicroserviceParameter;
 import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
 import org.onap.portalsdk.core.onboarding.util.CipherUtil;
+import org.onap.portalsdk.core.onboarding.util.KeyConstants;
+import org.onap.portalsdk.core.onboarding.util.KeyProperties;
 import org.onap.portalsdk.core.service.DataAccessService;
 import org.onap.portalsdk.core.service.DataAccessServiceImpl;
 import org.onap.portalsdk.core.util.SystemProperties;
@@ -66,7 +68,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({Criterion.class, Restrictions.class, CipherUtil.class, EPCommonSystemProperties.class, SystemProperties.class, Restrictions.class})
+@PrepareForTest({Criterion.class, Restrictions.class, CipherUtil.class, EPCommonSystemProperties.class, SystemProperties.class, KeyProperties.class, KeyConstants.class})
 public class MicroserviceServiceImplTest {
        
        private static final String TEST="test";
@@ -150,6 +152,8 @@ public class MicroserviceServiceImplTest {
                PowerMockito.mockStatic(CipherUtil.class);
                PowerMockito.mockStatic(Restrictions.class);
                PowerMockito.mockStatic(Criterion.class);
+               PowerMockito.mockStatic(KeyProperties.class);
+               PowerMockito.mockStatic(KeyConstants.class);
                List<MicroserviceParameter> microserviceParameters = new ArrayList<>();
                MicroserviceData microserviceData = new MicroserviceData();
                MicroserviceParameter microserviceParameter = new MicroserviceParameter();
@@ -168,8 +172,7 @@ public class MicroserviceServiceImplTest {
                Criterion serviceIdCriterion = Restrictions.eq("serviceId", 1l);
                restrictionsList2.add(serviceIdCriterion);
                Mockito.when((List<MicroserviceParameter>) dataAccessService.getList(MicroserviceParameter.class, null, restrictionsList2, null)).thenReturn(microserviceParameters);
-               Mockito.when(CipherUtil.decryptPKC("xyz",
-                               SystemProperties.getProperty(SystemProperties.Decryption_Key))).thenReturn("abc");
+               Mockito.when(CipherUtil.decryptPKC("xyz",KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY))).thenReturn("abc");
                List<MicroserviceData> actual = microserviceServiceImpl.getMicroserviceData();
                assertNotNull(actual);
        }
@@ -181,6 +184,8 @@ public class MicroserviceServiceImplTest {
                PowerMockito.mockStatic(CipherUtil.class);
                PowerMockito.mockStatic(Restrictions.class);
                PowerMockito.mockStatic(Criterion.class);
+               PowerMockito.mockStatic(KeyProperties.class);
+               PowerMockito.mockStatic(KeyConstants.class);
                List<MicroserviceParameter> microserviceParameters = new ArrayList<>();
                MicroserviceData microserviceData = new MicroserviceData();
                MicroserviceParameter microserviceParameter = new MicroserviceParameter();
@@ -199,8 +204,7 @@ public class MicroserviceServiceImplTest {
                Criterion serviceIdCriterion = Restrictions.eq("serviceId", 1l);
                restrictionsList2.add(serviceIdCriterion);
                Mockito.when((List<MicroserviceParameter>) dataAccessService.getList(MicroserviceParameter.class, null, restrictionsList2, null)).thenReturn(microserviceParameters);
-               Mockito.when(CipherUtil.decryptPKC("xyz",
-                               SystemProperties.getProperty(SystemProperties.Decryption_Key))).thenThrow(BadPaddingException.class);
+               Mockito.when(CipherUtil.decryptPKC("xyz",KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY))).thenThrow(BadPaddingException.class);
                List<MicroserviceData> actual = microserviceServiceImpl.getMicroserviceData();
                assertNotNull(actual);
        }
@@ -220,10 +224,10 @@ public class MicroserviceServiceImplTest {
                PowerMockito.mockStatic(CipherUtil.class);
                Criterion serviceIdCriterion = Restrictions.eq("serviceId", 1l);
                restrictionsList.add(serviceIdCriterion);
-               PowerMockito.mockStatic(SystemProperties.class);
-               Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(TEST);
+               PowerMockito.mockStatic(KeyProperties.class);
+               PowerMockito.mockStatic(KeyConstants.class);
+               Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(TEST);
                Mockito.when(CipherUtil.encryptPKC(TEST, TEST)).thenReturn(TEST);
-               
                Mockito.when((List<MicroserviceParameter>) dataAccessService.getList(MicroserviceParameter.class, null, restrictionsList, null)).thenReturn(microserviceParameters);
                microserviceServiceImpl.updateMicroservice(1l, buildData());