X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-BE%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fportal%2Fcontroller%2FWidgetsCatalogControllerTest.java;h=1eb88012472b1a7d048db230e4d3b28eefc86402;hb=refs%2Fchanges%2F01%2F98501%2F2;hp=8c2adc9d9ddf29d8d770d7c1e74d106e445427c1;hpb=e90cfa3b65b9879d22fc4522f45a22f1014e224e;p=portal.git diff --git a/portal-BE/src/test/java/org/onap/portal/controller/WidgetsCatalogControllerTest.java b/portal-BE/src/test/java/org/onap/portal/controller/WidgetsCatalogControllerTest.java index 8c2adc9d..1eb88012 100644 --- a/portal-BE/src/test/java/org/onap/portal/controller/WidgetsCatalogControllerTest.java +++ b/portal-BE/src/test/java/org/onap/portal/controller/WidgetsCatalogControllerTest.java @@ -1,28 +1,69 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal + * =================================================================== + * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * Modifications Copyright (c) 2019 Samsung + * =================================================================== + * + * 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============================================ + * + * + */ + package org.onap.portal.controller; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.time.LocalDateTime; import java.util.Collections; import java.util.HashSet; import java.util.List; +import javax.servlet.http.HttpServletRequest; import javax.transaction.Transactional; -import org.hibernate.Hibernate; import org.junit.Test; import org.junit.runner.RunWith; -import org.onap.portal.dao.fn.EpWidgetCatalogDao; import org.onap.portal.domain.db.ep.EpMicroserviceParameter; import org.onap.portal.domain.db.ep.EpWidgetCatalog; import org.onap.portal.domain.db.ep.EpWidgetCatalogParameter; import org.onap.portal.domain.db.fn.FnLanguage; import org.onap.portal.domain.db.fn.FnUser; import org.onap.portal.domain.dto.ecomp.WidgetCatalog; +import org.onap.portal.framework.MockitoTestSuite; import org.onap.portal.service.ep.EpMicroserviceParameterService; import org.onap.portal.service.ep.EpWidgetCatalogParameterService; import org.onap.portal.service.ep.EpWidgetCatalogService; import org.onap.portal.service.fn.FnLanguageService; -import org.onap.portal.service.fn.FnUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -31,22 +72,21 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) @SpringBootTest +@Transactional @TestPropertySource(locations = "classpath:test.properties") public class WidgetsCatalogControllerTest { private UsernamePasswordAuthenticationToken principal = new UsernamePasswordAuthenticationToken("demo", "demo123"); @Autowired - WidgetsCatalogController widgetsCatalogController; - @Autowired - FnLanguageService fnLanguageService; + private WidgetsCatalogController widgetsCatalogController; @Autowired - FnUserService fnUserService; + private FnLanguageService fnLanguageService; @Autowired - EpWidgetCatalogParameterService epWidgetCatalogParameterService; + private EpWidgetCatalogParameterService epWidgetCatalogParameterService; @Autowired - EpMicroserviceParameterService epMicroserviceParameterService; + private EpMicroserviceParameterService epMicroserviceParameterService; @Autowired - EpWidgetCatalogService epWidgetCatalogService; + private EpWidgetCatalogService epWidgetCatalogService; @Test public void getUserWidgetCatalog() { @@ -91,11 +131,9 @@ public class WidgetsCatalogControllerTest { } @Test - @Transactional public void getUserParameterById() { //Given EpWidgetCatalog widget = EpWidgetCatalog.builder() - .widgetId(54L) .wdgName("Name") .wdgFileLoc("loc") .allUserFlag(true) @@ -120,6 +158,30 @@ public class WidgetsCatalogControllerTest { @Test public void deleteUserParameterById() { + //Given + EpWidgetCatalog widget = EpWidgetCatalog.builder() + .wdgName("Name") + .wdgFileLoc("loc") + .allUserFlag(true) + .build(); + epWidgetCatalogService.save(widget); + EpMicroserviceParameter parameter = new EpMicroserviceParameter(); + epMicroserviceParameterService.save(parameter); + FnLanguage language = FnLanguage.builder().languageAlias("TS").languageName("TEST").build(); + fnLanguageService.save(principal, language); + FnUser user = buildFnUser(); + language.setFnUsers(new HashSet<>(Collections.singleton(user))); + user.setLanguageId(language); + EpWidgetCatalogParameter data = EpWidgetCatalogParameter.builder() + .widgetId(widget).userId(user).paramId(parameter).userValue("TestData").build(); + //When + assertEquals(0, widgetsCatalogController.getUserParameterById(parameter.getId()).size()); + epWidgetCatalogParameterService.saveUserParameter(data); + //Then assert + assertEquals(1, widgetsCatalogController.getUserParameterById(parameter.getId()).size()); + assertTrue(widgetsCatalogController.deleteUserParameterById(parameter.getId())); + assertEquals(0, widgetsCatalogController.getUserParameterById(parameter.getId()).size()); + } @Test @@ -128,10 +190,72 @@ public class WidgetsCatalogControllerTest { @Test public void saveWidgetParameter() { + //Given + EpWidgetCatalog widget = EpWidgetCatalog.builder() + .wdgName("Name") + .wdgFileLoc("loc") + .allUserFlag(true) + .build(); + epWidgetCatalogService.save(widget); + EpMicroserviceParameter parameter = new EpMicroserviceParameter(); + epMicroserviceParameterService.save(parameter); + FnLanguage language = FnLanguage.builder().languageAlias("TS").languageName("TEST").build(); + fnLanguageService.save(principal, language); + FnUser user = buildFnUser(); + language.setFnUsers(new HashSet<>(Collections.singleton(user))); + user.setLanguageId(language); + EpWidgetCatalogParameter data = EpWidgetCatalogParameter.builder() + .widgetId(widget).userId(user).paramId(parameter).userValue("TestData").build(); + + //When + widgetsCatalogController.saveWidgetParameter(principal, data); + //Then + EpWidgetCatalogParameter actual = epWidgetCatalogParameterService.getById(data.getId()); + + assertEquals("TestData", actual.getUserValue()); + + } + + @Test + public void saveWidgetParameterOldParamTest() { + //Given + EpWidgetCatalog widget = EpWidgetCatalog.builder() + .wdgName("Name") + .wdgFileLoc("loc") + .allUserFlag(true) + .build(); + epWidgetCatalogService.save(widget); + EpMicroserviceParameter parameter = new EpMicroserviceParameter(); + epMicroserviceParameterService.save(parameter); + FnLanguage language = FnLanguage.builder().languageAlias("TS").languageName("TEST").build(); + fnLanguageService.save(principal, language); + FnUser user = buildFnUser(); + language.setFnUsers(new HashSet<>(Collections.singleton(user))); + user.setLanguageId(language); + EpWidgetCatalogParameter old = EpWidgetCatalogParameter.builder() + .widgetId(widget).userId(user).paramId(parameter).userValue("TestData").build(); + + //When + widgetsCatalogController.saveWidgetParameter(principal, old); + + EpWidgetCatalogParameter newWidgetParameter = EpWidgetCatalogParameter.builder() + .widgetId(widget).userId(user).paramId(parameter).userValue("TestData2").build(); + + widgetsCatalogController.saveWidgetParameter(principal, newWidgetParameter); + + EpWidgetCatalogParameter oldOne = epWidgetCatalogParameterService.getById(old.getId()); + + //Then + assertEquals("TestData2", oldOne.getUserValue()); + } @Test public void getUploadFlag() { + String expected = ""; + String actual = widgetsCatalogController.getUploadFlag(); + + assertEquals(expected, actual); } private FnUser buildFnUser(){ @@ -141,6 +265,7 @@ public class WidgetsCatalogControllerTest { .modifiedDate(LocalDateTime.now()) .createdDate(LocalDateTime.now()) .isInternalYn(true) + .isSystemUser(true) .guest(false) .build(); }