X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-os%2Fsrc%2Ftest%2Fjava%2Forg%2Fopenecomp%2Fportalapp%2Fportal%2Fcontroller%2FDashboardSearchResultControllerTest.java;fp=ecomp-portal-BE-common-test%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fportalapp%2Fportal%2Ftest%2Fcontroller%2FDashboardSearchResultControllerTest.java;h=b2a6c431d944087cbef141862fc02394446c35a7;hb=51d83152697da4f2ef2242471ee43f36e6b64300;hp=6da954158ff67de00cbb4d4051ef0433ccb2a670;hpb=1b29c0944a7eba1c88cfd25c94e4dd7ed0f82dc7;p=portal.git diff --git a/ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/DashboardSearchResultControllerTest.java b/ecomp-portal-BE-os/src/test/java/org/openecomp/portalapp/portal/controller/DashboardSearchResultControllerTest.java similarity index 73% rename from ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/DashboardSearchResultControllerTest.java rename to ecomp-portal-BE-os/src/test/java/org/openecomp/portalapp/portal/controller/DashboardSearchResultControllerTest.java index 6da95415..b2a6c431 100644 --- a/ecomp-portal-BE-common-test/src/main/java/org/openecomp/portalapp/portal/test/controller/DashboardSearchResultControllerTest.java +++ b/ecomp-portal-BE-os/src/test/java/org/openecomp/portalapp/portal/controller/DashboardSearchResultControllerTest.java @@ -1,4 +1,41 @@ -package org.openecomp.portalapp.portal.test.controller; +/*- + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the “License”); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the “License”); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * ECOMP is a trademark and service mark of AT&T Intellectual Property. + */ +package org.openecomp.portalapp.portal.controller; import static org.junit.Assert.assertEquals; @@ -16,55 +53,61 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; -import org.openecomp.portalapp.portal.controller.DashboardSearchResultController; import org.openecomp.portalapp.portal.domain.EPUser; import org.openecomp.portalapp.portal.ecomp.model.PortalRestResponse; import org.openecomp.portalapp.portal.ecomp.model.PortalRestStatusEnum; import org.openecomp.portalapp.portal.ecomp.model.SearchResultItem; +import org.openecomp.portalapp.portal.framework.MockEPUser; +import org.openecomp.portalapp.portal.framework.MockitoTestSuite; import org.openecomp.portalapp.portal.service.DashboardSearchService; -import org.openecomp.portalapp.portal.service.DashboardSearchServiceImpl; -import org.openecomp.portalapp.portal.test.core.MockEPUser; import org.openecomp.portalapp.portal.transport.CommonWidget; import org.openecomp.portalapp.portal.transport.CommonWidgetMeta; -import org.openecomp.portalapp.test.framework.MockitoTestSuite; import org.openecomp.portalapp.util.EPUserUtils; public class DashboardSearchResultControllerTest { @Mock - DashboardSearchService searchService = new DashboardSearchServiceImpl(); - - @InjectMocks - DashboardSearchResultController dashboardSearchResultController = new DashboardSearchResultController(); + DashboardSearchService searchService; @Before public void setup() { MockitoAnnotations.initMocks(this); } + @InjectMocks + DashboardSearchResultController dashboardSearchResultController = new DashboardSearchResultController(); + MockitoTestSuite mockitoTestSuite = new MockitoTestSuite(); HttpServletRequest mockedRequest = mockitoTestSuite.getMockedRequest(); HttpServletResponse mockedResponse = mockitoTestSuite.getMockedResponse(); NullPointerException nullPointerException = new NullPointerException(); - - @Mock - EPUserUtils ePUserUtils = new EPUserUtils(); - MockEPUser mockUser = new MockEPUser(); @Test public void getWidgetDataTest() { - String resourceType = "test"; PortalRestResponse ecpectedPortalRestResponse = new PortalRestResponse(); ecpectedPortalRestResponse.setMessage("success"); - ecpectedPortalRestResponse.setResponse(null); + ecpectedPortalRestResponse.setResponse(new CommonWidgetMeta()); ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.OK); - Mockito.when(searchService.getWidgetData(resourceType)).thenReturn(null); - PortalRestResponse acutualPoratlRestResponse = dashboardSearchResultController - .getWidgetData(mockedRequest, resourceType); - assertEquals(acutualPoratlRestResponse, ecpectedPortalRestResponse); + CommonWidgetMeta commonWidgetMeta = new CommonWidgetMeta(); + Mockito.when(searchService.getWidgetData("test")).thenReturn(commonWidgetMeta); + PortalRestResponse actualPortalRestResponse = dashboardSearchResultController + .getWidgetData(mockedRequest, "test"); + assertEquals(ecpectedPortalRestResponse.getStatus(), actualPortalRestResponse.getStatus()); + } + @Test + public void saveWidgetDataBulkIfCatrgoryNullTest() { + PortalRestResponse ecpectedPortalRestResponse = new PortalRestResponse(); + ecpectedPortalRestResponse.setMessage("ERROR"); + ecpectedPortalRestResponse.setResponse("Category cannot be null or empty"); + ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.ERROR); + CommonWidgetMeta commonWidgetMeta = new CommonWidgetMeta(); + commonWidgetMeta.setCategory(null); + PortalRestResponse actualPortalRestResponse = dashboardSearchResultController + .saveWidgetDataBulk(commonWidgetMeta); + assertEquals(ecpectedPortalRestResponse, actualPortalRestResponse); } @Test @@ -73,230 +116,115 @@ public class DashboardSearchResultControllerTest { ecpectedPortalRestResponse.setMessage("success"); ecpectedPortalRestResponse.setResponse(null); ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.OK); - CommonWidgetMeta commonWidgetMeta = new CommonWidgetMeta(); commonWidgetMeta.setCategory("test"); + List items = new ArrayList<>(); - List commonWidgetList = new ArrayList(); CommonWidget commonWidget = new CommonWidget(); commonWidget.setId((long) 1); - commonWidget.setCategory("test"); - commonWidget.setHref("test_href"); - commonWidget.setTitle("test_title"); - commonWidget.setContent("test_content"); - commonWidget.setEventDate(null); - commonWidget.setSortOrder(1); - - commonWidgetList.add(commonWidget); - - commonWidgetMeta.setItems(commonWidgetList); - - Mockito.when(searchService.saveWidgetDataBulk(commonWidgetMeta)).thenReturn(null); - + commonWidget.setEventDate("2017-06-06"); + items.add(commonWidget); + commonWidgetMeta.setItems(items); PortalRestResponse actualPortalRestResponse = dashboardSearchResultController .saveWidgetDataBulk(commonWidgetMeta); - assertEquals(actualPortalRestResponse, ecpectedPortalRestResponse); + assertEquals(ecpectedPortalRestResponse, actualPortalRestResponse); } @Test - public void saveWidgetDataBulkIfCategoryNullTest() { + public void saveWidgetDataBulkExceptionTest() { PortalRestResponse ecpectedPortalRestResponse = new PortalRestResponse(); - ecpectedPortalRestResponse.setMessage("java.text.ParseException: Unparseable date: \"1\""); + ecpectedPortalRestResponse.setMessage("java.text.ParseException: Unparseable date: \"date\""); ecpectedPortalRestResponse.setResponse(null); ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.ERROR); - CommonWidgetMeta commonWidgetMeta = new CommonWidgetMeta(); commonWidgetMeta.setCategory("test"); + List items = new ArrayList<>(); - List commonWidgetList = new ArrayList(); CommonWidget commonWidget = new CommonWidget(); - commonWidget.setId(null); - commonWidget.setCategory(null); - commonWidget.setHref(null); - commonWidget.setTitle(null); - commonWidget.setContent("test_content"); - commonWidget.setEventDate("1"); - commonWidget.setSortOrder(1); - commonWidgetList.add(commonWidget); - commonWidgetMeta.setItems(commonWidgetList); - - Mockito.when(searchService.saveWidgetDataBulk(commonWidgetMeta)).thenReturn(null); - + commonWidget.setId((long) 1); + commonWidget.setEventDate("date"); + items.add(commonWidget); + commonWidgetMeta.setItems(items); PortalRestResponse actualPortalRestResponse = dashboardSearchResultController .saveWidgetDataBulk(commonWidgetMeta); - assertEquals(actualPortalRestResponse, ecpectedPortalRestResponse); + assertEquals(ecpectedPortalRestResponse, actualPortalRestResponse); } @Test - public void saveWidgetDataTest() { + public void saveWidgetDataIfCatagoryNullTest() { PortalRestResponse ecpectedPortalRestResponse = new PortalRestResponse(); - ecpectedPortalRestResponse.setMessage("success"); - ecpectedPortalRestResponse.setResponse(null); - ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.OK); + ecpectedPortalRestResponse.setMessage("ERROR"); + ecpectedPortalRestResponse.setResponse("Cateogry cannot be null or empty"); + ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.ERROR); CommonWidget commonWidget = new CommonWidget(); - commonWidget.setId((long) 1); - commonWidget.setCategory("test"); - commonWidget.setHref("test_href"); - commonWidget.setTitle("test_title"); - commonWidget.setContent("test_content"); - commonWidget.setEventDate(null); - commonWidget.setSortOrder(1); - - Mockito.when(searchService.saveWidgetData(commonWidget)).thenReturn(null); - + commonWidget.setCategory(null); PortalRestResponse actualPortalRestResponse = dashboardSearchResultController .saveWidgetData(commonWidget); - assertEquals(actualPortalRestResponse, ecpectedPortalRestResponse); - + assertEquals(ecpectedPortalRestResponse, actualPortalRestResponse); } @Test - public void saveWidgetDataExceptionTest() { + public void saveWidgetDataTest() { PortalRestResponse ecpectedPortalRestResponse = new PortalRestResponse(); - ecpectedPortalRestResponse.setMessage("ERROR"); - ecpectedPortalRestResponse.setResponse("Cateogry cannot be null or empty"); - ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.ERROR); + ecpectedPortalRestResponse.setMessage("success"); + ecpectedPortalRestResponse.setResponse(null); + ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.OK); CommonWidget commonWidget = new CommonWidget(); + commonWidget.setCategory("test"); commonWidget.setId((long) 1); - commonWidget.setCategory(""); - commonWidget.setHref("test_href"); - commonWidget.setTitle("test_title"); - commonWidget.setContent("test_content"); - commonWidget.setEventDate(null); - commonWidget.setSortOrder(1); - - Mockito.when(searchService.saveWidgetData(commonWidget)).thenReturn(null); - + commonWidget.setEventDate("2017-06-06"); PortalRestResponse actualPortalRestResponse = dashboardSearchResultController .saveWidgetData(commonWidget); - assertEquals(actualPortalRestResponse, ecpectedPortalRestResponse); - + assertEquals(ecpectedPortalRestResponse, actualPortalRestResponse); } @Test - public void saveWidgetDataDateErrorTest() { + public void saveWidgetDataExceptionTest() { PortalRestResponse ecpectedPortalRestResponse = new PortalRestResponse(); - ecpectedPortalRestResponse.setMessage("java.text.ParseException: Unparseable date: \"1\""); + ecpectedPortalRestResponse.setMessage("java.text.ParseException: Unparseable date: \"date\""); ecpectedPortalRestResponse.setResponse(null); ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.ERROR); CommonWidget commonWidget = new CommonWidget(); - commonWidget.setId((long) 1); commonWidget.setCategory("test"); - commonWidget.setHref("test_href"); - commonWidget.setTitle("test_title"); - commonWidget.setContent("test_content"); - commonWidget.setEventDate("1"); - commonWidget.setSortOrder(1); - - Mockito.when(searchService.saveWidgetData(commonWidget)).thenReturn(null); - + commonWidget.setId((long) 1); + commonWidget.setEventDate("date"); PortalRestResponse actualPortalRestResponse = dashboardSearchResultController .saveWidgetData(commonWidget); - assertEquals(actualPortalRestResponse, ecpectedPortalRestResponse); - + assertEquals(ecpectedPortalRestResponse, actualPortalRestResponse); } - - public void deleteWidgetDataTest() { + + @Test + public void deleteWidgetDataTest() + { PortalRestResponse ecpectedPortalRestResponse = new PortalRestResponse(); ecpectedPortalRestResponse.setMessage("success"); ecpectedPortalRestResponse.setResponse(null); ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.OK); CommonWidget commonWidget = new CommonWidget(); - commonWidget.setId((long) 1); - commonWidget.setCategory("test"); - commonWidget.setHref("test_href"); - commonWidget.setTitle("test_title"); - commonWidget.setContent("test_content"); - commonWidget.setEventDate(null); - commonWidget.setSortOrder(1); - Mockito.when(searchService.deleteWidgetData(commonWidget)).thenReturn(null); - + Mockito.when(searchService.deleteWidgetData(commonWidget)).thenReturn("test"); PortalRestResponse actualPortalRestResponse = dashboardSearchResultController .deleteWidgetData(commonWidget); - System.out.println(actualPortalRestResponse); - assertEquals(actualPortalRestResponse, ecpectedPortalRestResponse); + assertEquals(ecpectedPortalRestResponse.getStatus(), actualPortalRestResponse.getStatus()); } - + @Test - public void searchPortalIfUserIsNull() { + public void searchPortalIfUserIsTest() + { EPUser user = null; Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user); String searchString = "test"; - PortalRestResponse>> expectedResult = new PortalRestResponse>>(); expectedResult.setMessage("searchPortal: User object is null? - check logs"); expectedResult.setResponse(new HashMap>()); expectedResult.setStatus(PortalRestStatusEnum.ERROR); PortalRestResponse>> actualResult = dashboardSearchResultController .searchPortal(mockedRequest, searchString); - assertEquals(expectedResult, actualResult); - } + System.out.println(actualResult); - @Test - public void searchPortalIfSearchStringNullTest() { - EPUser user = mockUser.mockEPUser(); - ; - Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user); - String searchString = null; - - PortalRestResponse>> expectedResult = new PortalRestResponse>>(); - expectedResult.setMessage("searchPortal: String string is null"); - expectedResult.setResponse(new HashMap>()); - expectedResult.setStatus(PortalRestStatusEnum.ERROR); - - PortalRestResponse>> actualResult = dashboardSearchResultController - .searchPortal(mockedRequest, searchString); assertEquals(expectedResult, actualResult); } - - @Test - public void searchPortalIfSearchTest() { - EPUser user = mockUser.mockEPUser(); - ; - Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user); - String searchString = "test"; - List searchResultItemList = new ArrayList(); - SearchResultItem searchResultItem = new SearchResultItem(); - - searchResultItem.setId((long) 1); - searchResultItem.setCategory("test"); - searchResultItem.setName("test_name"); - searchResultItem.setTarget("test_target"); - searchResultItem.setUuid("test_UUId"); - searchResultItemList.add(searchResultItem); - Map> expectedResultMap = new HashMap>(); - expectedResultMap.put(searchString, searchResultItemList); - - PortalRestResponse>> expectedResult = new PortalRestResponse>>(); - expectedResult.setMessage("success"); - expectedResult.setResponse(expectedResultMap); - expectedResult.setStatus(PortalRestStatusEnum.OK); - - Mockito.when(searchService.searchResults(user.getLoginId(), searchString)).thenReturn(expectedResultMap); - PortalRestResponse>> actualResult = dashboardSearchResultController - .searchPortal(mockedRequest, searchString); - assertEquals(expectedResult, actualResult); - - } - - @Test - public void searchPortalIfSearchExcptionTest() { - EPUser user = mockUser.mockEPUser(); - ; - Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user); - String searchString = "test"; - - PortalRestResponse>> expectedResult = new PortalRestResponse>>(); - expectedResult.setMessage("null - check logs."); - expectedResult.setResponse(new HashMap>()); - expectedResult.setStatus(PortalRestStatusEnum.ERROR); - - Mockito.when(searchService.searchResults(user.getLoginId(), searchString)).thenThrow(nullPointerException); - PortalRestResponse>> actualResult = dashboardSearchResultController - .searchPortal(mockedRequest, searchString); - assertEquals(expectedResult, actualResult); - } - + + @Test public void getActiveUsersTest() { List expectedActiveUsers = new ArrayList(); @@ -362,5 +290,70 @@ public class DashboardSearchResultControllerTest { assertEquals(actualResult, expectedResult); } + + @Test + public void searchPortalIfSearchStringNullTest() { + EPUser user = mockUser.mockEPUser(); + ; + Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user); + String searchString = null; + + PortalRestResponse>> expectedResult = new PortalRestResponse>>(); + expectedResult.setMessage("searchPortal: String string is null"); + expectedResult.setResponse(new HashMap>()); + expectedResult.setStatus(PortalRestStatusEnum.ERROR); + + PortalRestResponse>> actualResult = dashboardSearchResultController + .searchPortal(mockedRequest, searchString); + assertEquals(expectedResult, actualResult); + } + + @Test + public void searchPortalIfSearchTest() { + EPUser user = mockUser.mockEPUser(); + ; + Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user); + String searchString = "test"; + List searchResultItemList = new ArrayList(); + SearchResultItem searchResultItem = new SearchResultItem(); + + searchResultItem.setId((long) 1); + searchResultItem.setCategory("test"); + searchResultItem.setName("test_name"); + searchResultItem.setTarget("test_target"); + searchResultItem.setUuid("test_UUId"); + searchResultItemList.add(searchResultItem); + Map> expectedResultMap = new HashMap>(); + expectedResultMap.put(searchString, searchResultItemList); + + PortalRestResponse>> expectedResult = new PortalRestResponse>>(); + expectedResult.setMessage("success"); + expectedResult.setResponse(expectedResultMap); + expectedResult.setStatus(PortalRestStatusEnum.OK); + + Mockito.when(searchService.searchResults(user.getLoginId(), searchString)).thenReturn(expectedResultMap); + PortalRestResponse>> actualResult = dashboardSearchResultController + .searchPortal(mockedRequest, searchString); + assertEquals(expectedResult, actualResult); + + } + + @Test + public void searchPortalIfSearchExcptionTest() { + EPUser user = mockUser.mockEPUser(); + ; + Mockito.when(EPUserUtils.getUserSession(mockedRequest)).thenReturn(user); + String searchString = "test"; + + PortalRestResponse>> expectedResult = new PortalRestResponse>>(); + expectedResult.setMessage("null - check logs."); + expectedResult.setResponse(new HashMap>()); + expectedResult.setStatus(PortalRestStatusEnum.ERROR); + + Mockito.when(searchService.searchResults(user.getLoginId(), searchString)).thenThrow(nullPointerException); + PortalRestResponse>> actualResult = dashboardSearchResultController + .searchPortal(mockedRequest, searchString); + assertEquals(expectedResult, actualResult); + } }