fixes for supporting non-gui application access provisioning

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

diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/AppContactUsServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/AppContactUsServiceImplTest.java
index 3777f8a..e5b7431 100644 (file)
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/AppContactUsServiceImplTest.java
+++ b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/AppContactUsServiceImplTest.java
@@ -49,11 +49,13 @@ import javax.servlet.http.HttpServletResponse;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.InjectMocks;
+import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.onap.portalapp.portal.domain.AppContactUs;
 import org.onap.portalapp.portal.domain.EPApp;
+import org.onap.portalapp.portal.domain.EpAppType;
 import org.onap.portalapp.portal.ecomp.model.AppCategoryFunctionsItem;
 import org.onap.portalapp.portal.ecomp.model.AppContactUsItem;
 import org.onap.portalapp.portal.framework.MockitoTestSuite;
@@ -66,16 +68,10 @@ public class AppContactUsServiceImplTest {
 
        
      @Mock
-        DataAccessService dataAccessService = new DataAccessServiceImpl();
+        DataAccessService dataAccessService ;
     
      @Mock
-     AppContactUsService AppContactUsService = new AppContactUsServiceImpl();
-     
-     @Before
-       public void setup() {
-               MockitoAnnotations.initMocks(this);
-       }
-       
+     AppContactUsService AppContactUsService ;
      @InjectMocks
      AppContactUsServiceImpl appContactUsServiceImpl = new AppContactUsServiceImpl();
 
@@ -83,6 +79,13 @@ public class AppContactUsServiceImplTest {
 
        HttpServletRequest mockedRequest = mockitoTestSuite.getMockedRequest();
        HttpServletResponse mockedResponse = mockitoTestSuite.getMockedResponse();
+     
+     @Before
+       public void setup() {
+               MockitoAnnotations.initMocks(this);
+       }
+       
+   
        NullPointerException nullPointerException = new NullPointerException();
        
        
@@ -90,23 +93,23 @@ public class AppContactUsServiceImplTest {
                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.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(true);
                app.setEnabled(false);
                app.setUebKey("test");
                app.setUebSecret("test");
                app.setUebTopicName("test");
-               app.setAppType(1);
+               app.setAppType(EpAppType.GUI);
                return app;
        }
        @Test
@@ -140,6 +143,7 @@ public class AppContactUsServiceImplTest {
                assertEquals(expectedcontactUsItemList, contactUsItemList);             
        }
        
+       
        @Test
        public void getAppCategoryFunctionsTest() throws Exception
        {
@@ -172,13 +176,39 @@ public class AppContactUsServiceImplTest {
                appContactUsServiceImpl.saveAppContactUs(contactUsModelList);
        }
        
+       @Test
+       public void saveAppContacts()throws Exception {
+               
+               List<AppContactUsItem> contactUsModelList = new ArrayList<>();
+               AppContactUsItem appContactUsItem= new AppContactUsItem();
+               appContactUsItem.setAppId((long) 1);
+               contactUsModelList.add(appContactUsItem);
+               HashMap<String, Object> map = new HashMap<String, Object>();
+               
+               Mockito.when(dataAccessService.getDomainObject(AppContactUs.class,
+                                               appContactUsItem.getAppId(), map)).thenReturn(appContactUsItem);
+               
+               Mockito.when(dataAccessService.getDomainObject(EPApp.class, appContactUsItem.getAppId(), map)).thenReturn(getApp());
+               appContactUsServiceImpl.saveAppContactUs(contactUsModelList);
+       }
+       
        @Test(expected = java.lang.NullPointerException.class)
-       public void deleteContactUsTest() throws Exception
+       public void deleteContactUs_error_Test() throws Exception
        {
                HashMap<String, Object> map = new HashMap<String, Object>();
                AppContactUs contactUs = new AppContactUs();
                Mockito.when((AppContactUs) dataAccessService.getDomainObject(AppContactUs.class, 1, map)).thenReturn(contactUs);
                appContactUsServiceImpl.deleteContactUs((long) 1);
        }
+       @Test(expected=Exception.class)
+       public void deleteContactUsTest()throws Exception {
+               HashMap<String, Object> map = new HashMap<String, Object>();
+               
+               AppContactUs contactUs = new AppContactUs();
+               contactUs.setId(1l);
+               Mockito.when(dataAccessService.getDomainObject(AppContactUs.class,
+                               contactUs.getId(), map)).thenReturn(contactUs);
+               appContactUsServiceImpl.deleteContactUs(        contactUs.getId());
+       }
        
 }