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=27ce3484d6e7c88e3c8c40b832d6b79643a00b07;hb=ffd9af970318c1f5a0bad46d7aad5d4611414aae;hp=c04f50e44123a2bb480446fa00cbb27d569c2387;hpb=1a7472103bde3d850f1f410a7d2ae5b249aef92e;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 c04f50e4..27ce3484 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
@@ -41,7 +41,6 @@
 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;
 
@@ -52,6 +51,7 @@ import java.util.List;
 import javax.transaction.Transactional;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.onap.portal.dao.fn.FnLanguageDao;
 import org.onap.portal.domain.db.ep.EpMicroserviceParameter;
 import org.onap.portal.domain.db.ep.EpWidgetCatalog;
 import org.onap.portal.domain.db.ep.EpWidgetCatalogParameter;
@@ -62,6 +62,7 @@ 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;
@@ -70,20 +71,25 @@ 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",
+       private final UsernamePasswordAuthenticationToken principal = new UsernamePasswordAuthenticationToken("demo",
                "demo123");
        @Autowired
-       WidgetsCatalogController widgetsCatalogController;
+       private WidgetsCatalogController widgetsCatalogController;
        @Autowired
-       FnLanguageService fnLanguageService;
+       private FnUserService fnUserService;
        @Autowired
-       EpWidgetCatalogParameterService epWidgetCatalogParameterService;
+       private FnLanguageService fnLanguageService;
        @Autowired
-       EpMicroserviceParameterService epMicroserviceParameterService;
+       private EpWidgetCatalogParameterService epWidgetCatalogParameterService;
        @Autowired
-       EpWidgetCatalogService epWidgetCatalogService;
+       private EpMicroserviceParameterService epMicroserviceParameterService;
+       @Autowired
+       private EpWidgetCatalogService epWidgetCatalogService;
+       @Autowired
+       private FnLanguageDao fnLanguageDao;
 
        @Test
        public void getUserWidgetCatalog() {
@@ -128,7 +134,6 @@ public class WidgetsCatalogControllerTest {
        }
 
        @Test
-       @Transactional
        public void getUserParameterById() {
               //Given
               EpWidgetCatalog widget = EpWidgetCatalog.builder()
@@ -140,10 +145,11 @@ public class WidgetsCatalogControllerTest {
               EpMicroserviceParameter parameter = new EpMicroserviceParameter();
               epMicroserviceParameterService.save(parameter);
               FnLanguage language = FnLanguage.builder().languageAlias("TS").languageName("TEST").build();
-              fnLanguageService.save(principal, language);
+              fnLanguageService.save(language);
               FnUser user = buildFnUser();
               language.setFnUsers(new HashSet<>(Collections.singleton(user)));
               user.setLanguageId(language);
+              fnUserService.saveFnUser(user);
               EpWidgetCatalogParameter data =  EpWidgetCatalogParameter.builder()
                       .widgetId(widget).userId(user).paramId(parameter).userValue("TestData").build();
               //When
@@ -155,7 +161,6 @@ public class WidgetsCatalogControllerTest {
        }
 
        @Test
-       @Transactional
        public void deleteUserParameterById() {
               //Given
               EpWidgetCatalog widget = EpWidgetCatalog.builder()
@@ -166,11 +171,10 @@ public class WidgetsCatalogControllerTest {
               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)));
+              FnLanguage language = fnLanguageDao.getByLanguageAlias("EN");
               user.setLanguageId(language);
+              fnUserService.saveFnUser(user);
               EpWidgetCatalogParameter data =  EpWidgetCatalogParameter.builder()
                       .widgetId(widget).userId(user).paramId(parameter).userValue("TestData").build();
               //When
@@ -189,10 +193,74 @@ 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(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(language);
+              FnUser user = buildFnUser();
+              language.setFnUsers(new HashSet<>(Collections.singleton(user)));
+              user.setLanguageId(language);
+              fnUserService.saveFnUser(user);
+
+              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(){
@@ -202,6 +270,7 @@ public class WidgetsCatalogControllerTest {
                       .modifiedDate(LocalDateTime.now())
                       .createdDate(LocalDateTime.now())
                       .isInternalYn(true)
+                      .isSystemUser(true)
                       .guest(false)
                       .build();
        }