Merge "Resubmitting KeyProperty code change since tests failed"

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

diff --git a/ecomp-portal-BE-os/src/test/java/org/onap/portalapp/portal/service/RemoteWebServiceCallServiceImplTest.java b/ecomp-portal-BE-os/src/test/java/org/onap/portalapp/portal/service/RemoteWebServiceCallServiceImplTest.java
index 88ccf5d..1f34645 100644 (file)
--- a/ecomp-portal-BE-os/src/test/java/org/onap/portalapp/portal/service/RemoteWebServiceCallServiceImplTest.java
+++ b/ecomp-portal-BE-os/src/test/java/org/onap/portalapp/portal/service/RemoteWebServiceCallServiceImplTest.java
@@ -57,6 +57,8 @@ import org.onap.portalapp.portal.domain.EPApp;
 import org.onap.portalapp.portal.framework.MockitoTestSuite;
 import org.onap.portalapp.service.RemoteWebServiceCallServiceImpl;
 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.util.SystemProperties;
 import org.powermock.api.mockito.PowerMockito;
@@ -64,7 +66,7 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({ CipherUtil.class , SystemProperties.class})
+@PrepareForTest({ CipherUtil.class , SystemProperties.class, KeyProperties.class, KeyConstants.class})
 public class RemoteWebServiceCallServiceImplTest {
        
 
@@ -93,17 +95,17 @@ public class RemoteWebServiceCallServiceImplTest {
        public void verifyRESTCredentialTest() throws Exception
        {
                PowerMockito.mockStatic(CipherUtil.class);
-               PowerMockito.mockStatic(SystemProperties.class);
+               PowerMockito.mockStatic(KeyProperties.class);
+               PowerMockito.mockStatic(KeyConstants.class);
                String criteria= " where ueb_key = 'requestUebKey'";
                List<EPApp> appList = new ArrayList<>();
                EPApp app = new EPApp();
-               app.setAppPassword("password");
+               app.setAppBasicAuthPassword("password");
                appList.add(app);
                Mockito.when(dataAccessService.getList(EPApp.class, criteria.toString(), null, null)).thenReturn(appList);
                String secretKey = null;
-               Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(secretKey);
-               Mockito.when(CipherUtil.decryptPKC("password",
-                               secretKey == null ? null : secretKey)).thenReturn("pwd");
+               Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(secretKey);
+               Mockito.when(CipherUtil.decryptPKC("password",secretKey == null ? null : secretKey)).thenReturn("pwd");
                assertFalse(remoteWebServiceCallServiceImpl.verifyRESTCredential(secretKey,"requestUebKey","requestAppName","requestPassword"));
        }
        
@@ -111,18 +113,18 @@ public class RemoteWebServiceCallServiceImplTest {
        public void verifyRESTCredentialExceptionTest() throws Exception
        {
                PowerMockito.mockStatic(CipherUtil.class);
-               PowerMockito.mockStatic(SystemProperties.class);
+               PowerMockito.mockStatic(KeyProperties.class);
+               PowerMockito.mockStatic(KeyConstants.class);
                String criteria= " where ueb_key = 'requestUebKey'";
                List<EPApp> appList = new ArrayList<>();
                EPApp app = new EPApp();
-               app.setAppPassword("password");
-               app.setUsername("requestAppName");
+               app.setAppBasicAuthPassword("password");
+               app.setAppBasicAuthUsername("requestAppName");
                appList.add(app);
                Mockito.when(dataAccessService.getList(EPApp.class, criteria.toString(), null, null)).thenReturn(appList);
                String secretKey = null;
-               Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(secretKey);
-               Mockito.when(CipherUtil.decryptPKC("password",
-                               secretKey == null ? null : secretKey)).thenReturn("pwd");
+               Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(secretKey);
+               Mockito.when(CipherUtil.decryptPKC("password",secretKey == null ? null : secretKey)).thenReturn("pwd");
                assertTrue(remoteWebServiceCallServiceImpl.verifyRESTCredential(secretKey,"requestUebKey","requestAppName","pwd"));
        }
        
@@ -131,17 +133,18 @@ public class RemoteWebServiceCallServiceImplTest {
        {
                PowerMockito.mockStatic(CipherUtil.class);
                PowerMockito.mockStatic(SystemProperties.class);
+               PowerMockito.mockStatic(KeyProperties.class);
+               PowerMockito.mockStatic(KeyConstants.class);
                String criteria= " where ueb_key = 'requestUebKey'";
                List<EPApp> appList = new ArrayList<>();
                EPApp app = new EPApp();
-               app.setAppPassword("password");
-               app.setUsername("requestAppName");
+               app.setAppBasicAuthPassword("password");
+               app.setAppBasicAuthUsername("requestAppName");
                appList.add(app);
                Mockito.when(dataAccessService.getList(EPApp.class, criteria.toString(), null, null)).thenReturn(null);
                String secretKey = null;
-               Mockito.when(SystemProperties.getProperty(SystemProperties.Decryption_Key)).thenReturn(secretKey);
-               Mockito.when(CipherUtil.decryptPKC("password",
-                               secretKey == null ? null : secretKey)).thenReturn("pwd");
+               Mockito.when(KeyProperties.getProperty(KeyConstants.CIPHER_ENCRYPTION_KEY)).thenReturn(secretKey);
+               Mockito.when(CipherUtil.decryptPKC("password",secretKey == null ? null : secretKey)).thenReturn("pwd");
                assertFalse(remoteWebServiceCallServiceImpl.verifyRESTCredential(secretKey,"requestUebKey","requestAppName","pwd"));
        }
        
@@ -160,8 +163,8 @@ public class RemoteWebServiceCallServiceImplTest {
 //             String criteria= " where ueb_key = 'requestUebKey'";
                List<EPApp> appList = new ArrayList<>();
                EPApp app = new EPApp();
-               app.setAppPassword("password");
-               app.setUsername("requestAppName");
+               app.setAppBasicAuthPassword("password");
+               app.setAppBasicAuthUsername("requestAppName");
                appList.add(app);
                Mockito.when(dataAccessService.getList(EPApp.class, criteria.toString(), null, null)).thenReturn(null);
                assertFalse(remoteWebServiceCallServiceImpl.verifyAppKeyCredential("test"));
@@ -175,8 +178,8 @@ public class RemoteWebServiceCallServiceImplTest {
                String criteria= " where ueb_key = 'test'";
                List<EPApp> appList = new ArrayList<>();
                EPApp app = new EPApp();
-               app.setAppPassword("password");
-               app.setUsername("requestAppName");
+               app.setAppBasicAuthPassword("password");
+               app.setAppBasicAuthUsername("requestAppName");
                appList.add(app);
                Mockito.when(dataAccessService.getList(EPApp.class, criteria.toString(), null, null)).thenReturn(appList);
                assertTrue(remoteWebServiceCallServiceImpl.verifyAppKeyCredential("test"));