Fixed health check issue

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

diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppCatalogControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppCatalogControllerTest.java
index 7b09982..8b1fc82 100644 (file)
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppCatalogControllerTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/AppCatalogControllerTest.java
@@ -33,7 +33,7 @@
  *
  * ============LICENSE_END============================================
  *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * 
  */
 package org.onap.portalapp.portal.controller;
 
@@ -59,6 +59,7 @@ import org.onap.portalapp.portal.controller.AppCatalogController;
 import org.onap.portalapp.portal.core.MockEPUser;
 import org.onap.portalapp.portal.domain.EPApp;
 import org.onap.portalapp.portal.domain.EPUser;
+import org.onap.portalapp.portal.domain.EpAppType;
 import org.onap.portalapp.portal.ecomp.model.AppCatalogItem;
 import org.onap.portalapp.portal.framework.MockitoTestSuite;
 import org.onap.portalapp.portal.service.AdminRolesService;
@@ -245,23 +246,23 @@ public class AppCatalogControllerTest 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);
 
                Mockito.when(appService.getApp(persRequest.getAppId())).thenReturn(app);
 
@@ -277,5 +278,62 @@ public class AppCatalogControllerTest extends MockitoTestSuite {
                assertEquals(expectedFieldValidator, actualFieldValidator);
 
        }
+       
+       @Test
+       public void putAppCatalogSelectionTestWithException() throws IOException {
+
+               AppCatalogPersonalization persRequest = new AppCatalogPersonalization();
+               persRequest.setAppId((long) 1);
+               persRequest.setPending(false);
+               persRequest.setSelect(false);
+
+               EPUser user = mockUser.mockEPUser();
+
+               FieldsValidator expectedFieldValidator = new FieldsValidator();
+
+               FieldsValidator actualFieldValidator = new FieldsValidator();
+               List<FieldName> fields = new ArrayList<>();
+               ;
+
+               expectedFieldValidator.setHttpStatusCode((long) 200);
+               expectedFieldValidator.setFields(fields);
+               expectedFieldValidator.setErrorCode(null);
+
+               EPApp app = new EPApp();
+
+               app.setName("Test");
+               app.setImageUrl("test");
+               app.setAppDescription("test");
+               app.setAppNotes("test");
+               app.setLandingPage("test");
+               app.setId((long) 1);
+               app.setAppRestEndpoint("test");
+               app.setAlternateLandingPage("test");
+               app.setName("test");
+               app.setMlAppName("test");
+               app.setMlAppAdminId("test");
+               app.setAppBasicAuthUsername("test");
+               app.setAppBasicAuthPassword("test");
+               app.setOpen(false);
+               app.setEnabled(false);
+               app.setUebKey("test");
+               app.setUebSecret("test");
+               app.setUebTopicName("test");
+               app.setAppType(EpAppType.GUI);
+
+               Mockito.when(appService.getApp(persRequest.getAppId())).thenReturn(app);
+
+               HttpSession session = mockedRequest.getSession();
+               session.setAttribute(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME), user);
+
+               Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user);
+               Mockito.doNothing().when(persUserAppService).setPersUserAppValue(user, null, persRequest.getSelect(),
+                               persRequest.getPending());
+
+               actualFieldValidator = appCatalogController.putAppCatalogSelection(mockedRequest, persRequest, mockedResponse);
+
+               assertEquals(expectedFieldValidator, actualFieldValidator);
+
+       }
 
 }