fixes for supporting non-gui application access provisioning

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

diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppsControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppsControllerTest.java
index f622fac..bd824e4 100644 (file)
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppsControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppsControllerTest.java
@@ -65,6 +65,7 @@ import org.onap.portalapp.portal.domain.AppsResponse;
 import org.onap.portalapp.portal.domain.EPApp;
 import org.onap.portalapp.portal.domain.EPUser;
 import org.onap.portalapp.portal.domain.EcompApp;
+import org.onap.portalapp.portal.domain.EpAppType;
 import org.onap.portalapp.portal.domain.UserRole;
 import org.onap.portalapp.portal.domain.UserRoles;
 import org.onap.portalapp.portal.framework.MockitoTestSuite;
@@ -214,23 +215,23 @@ public class AppsControllerTest extends MockitoTestSuite{
 
                app.setName("Test");
                app.setImageUrl("test");
-               app.setDescription("test");
-               app.setNotes("test");
-               app.setUrl("test");
+               app.setAppDescription("test");
+               app.setAppNotes("test");
+               app.setLandingPage("test");
                app.setId((long) 1);
                app.setAppRestEndpoint("test");
-               app.setAlternateUrl("test");
+               app.setAlternateLandingPage("test");
                app.setName("test");
                app.setMlAppName("test");
                app.setMlAppAdminId("test");
-               app.setUsername("test");
-               app.setAppPassword("test");
+               app.setAppBasicAuthUsername("test");
+               app.setAppBasicAuthPassword("test");
                app.setOpen(false);
                app.setEnabled(false);
                app.setUebKey("test");
                app.setUebSecret("test");
                app.setUebTopicName("test");
-               app.setAppType(1);
+               app.setAppType(EpAppType.GUI);
 
                expectedApps.add(app);
 
@@ -263,23 +264,23 @@ public class AppsControllerTest extends MockitoTestSuite{
 
                app.setName("Test");
                app.setImageUrl("test");
-               app.setDescription("test");
-               app.setNotes("test");
-               app.setUrl("test");
+               app.setAppDescription("test");
+               app.setAppNotes("test");
+               app.setLandingPage("test");
                app.setId((long) 1);
                app.setAppRestEndpoint("test");
-               app.setAlternateUrl("test");
+               app.setAlternateLandingPage("test");
                app.setName("test");
                app.setMlAppName("test");
                app.setMlAppAdminId("test");
-               app.setUsername("test");
-               app.setAppPassword("test");
+               app.setAppBasicAuthUsername("test");
+               app.setAppBasicAuthPassword("test");
                app.setOpen(false);
                app.setEnabled(false);
                app.setUebKey("test");
                app.setUebSecret("test");
                app.setUebTopicName("test");
-               app.setAppType(1);
+               app.setAppType(EpAppType.GUI);
 
                expectedApps.add(app);
 
@@ -824,14 +825,14 @@ public class AppsControllerTest extends MockitoTestSuite{
                EPUser user = mockUser.mockEPUser();
                Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
                OnboardingApp OnboardingApp = new OnboardingApp();
-               OnboardingApp.isCentralAuth = true;
-               OnboardingApp.nameSpace = "test1";
+               OnboardingApp.setRolesInAAF(true);
+               OnboardingApp.setNameSpace("test1");
                FieldsValidator expectedFieldValidator = new FieldsValidator();
                expectedFieldValidator.setHttpStatusCode((long) 200);
                expectedFieldValidator.setFields(null);
                expectedFieldValidator.setErrorCode(null);
                EPApp OnboardingApp1 = new EPApp();
-               OnboardingApp1.setCentralAuth(false);
+               OnboardingApp1.setRolesInAAF(false);
                OnboardingApp1.setNameSpace("test"); 
                Mockito.when(appService.getApp(Matchers.anyLong())).thenReturn(OnboardingApp1);
                Mockito.when(adminRolesService.isSuperAdmin(user)).thenReturn(true);
@@ -849,8 +850,8 @@ public class AppsControllerTest extends MockitoTestSuite{
                EPUser user = mockUser.mockEPUser();
                Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
                OnboardingApp onboardingApp = new OnboardingApp();
-               onboardingApp.isCentralAuth = true;
-               onboardingApp.nameSpace = "com.test1";
+               onboardingApp.setRolesInAAF(true);
+               onboardingApp.setNameSpace("com.test1");
                EPApp app = new EPApp();
                app.setNameSpace("com.test ");
                FieldsValidator expectedFieldValidator = new FieldsValidator();
@@ -876,10 +877,10 @@ public class AppsControllerTest extends MockitoTestSuite{
                EPUser user = mockUser.mockEPUser();
                Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
                OnboardingApp onboardingApp = new OnboardingApp();
-               onboardingApp.isCentralAuth = false;
-               onboardingApp.nameSpace = "com.test1";
+               onboardingApp.setRolesInAAF(false);
+               onboardingApp.setNameSpace("com.test1");
                EPApp app = new EPApp();
-               app.setCentralAuth(false);
+               app.setRolesInAAF(false);
                app.setNameSpace("com.test ");
                FieldsValidator expectedFieldValidator = new FieldsValidator();
                expectedFieldValidator.setHttpStatusCode((long) 404);
@@ -902,8 +903,8 @@ public class AppsControllerTest extends MockitoTestSuite{
                EPUser user = mockUser.mockEPUser();
                Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
                OnboardingApp onboardingApp = new OnboardingApp();
-               onboardingApp.isCentralAuth = true;
-               onboardingApp.nameSpace = "com.test1";
+               onboardingApp.setRolesInAAF(true);
+               onboardingApp.setNameSpace("com.test1");
                EPApp app = new EPApp();
                app.setNameSpace("com.test ");
                FieldsValidator expectedFieldValidator = new FieldsValidator();
@@ -1074,11 +1075,11 @@ public class AppsControllerTest extends MockitoTestSuite{
                EPApp app = new EPApp();
                app.setName("Test");
                app.setImageUrl("test");
-               app.setDescription("test");
-               app.setNotes("test");
-               app.setUrl("test");
+               app.setAppDescription("test");
+               app.setAppNotes("test");
+               app.setLandingPage("test");
                app.setId((long) 1);
-               app.setAppType(1);
+               app.setAppType(EpAppType.GUI);
                app.setImageUrl("www.ecomp.com");
                app.setThumbnail(new byte[] {1, 6, 3});
                Mockito.when(appService.getApp((long) 1)).thenReturn(app);
@@ -1093,11 +1094,11 @@ public class AppsControllerTest extends MockitoTestSuite{
                EPApp app = new EPApp();
                app.setName("Test");
                app.setImageUrl("test");
-               app.setDescription("test");
-               app.setNotes("test");
-               app.setUrl("test");
+               app.setAppDescription("test");
+               app.setAppNotes("test");
+               app.setLandingPage("test");
                app.setId((long) 1);
-               app.setAppType(1);
+               app.setAppType(EpAppType.GUI);
                app.setImageUrl("www.ecomp.png");
                app.setThumbnail(new byte[] {1, 6, 3});
                Mockito.when(appService.getApp((long) 1)).thenReturn(app);