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.util.Collections;
import java.util.HashSet;
import java.util.List;
-import javax.servlet.http.HttpServletRequest;
import javax.transaction.Transactional;
import org.junit.Test;
import org.junit.runner.RunWith;
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.microserviceParameter.EpMicroserviceParameterService;
+import org.onap.portal.service.widgetCatalogParameter.EpWidgetCatalogParameterService;
+import org.onap.portal.service.widgetCatalog.EpWidgetCatalogService;
+import org.onap.portal.service.language.FnLanguageService;
+import org.onap.portal.service.user.FnUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@Transactional
@TestPropertySource(locations = "classpath:test.properties")
public class WidgetsCatalogControllerTest {
- private UsernamePasswordAuthenticationToken principal = new UsernamePasswordAuthenticationToken("demo",
+ private final UsernamePasswordAuthenticationToken principal = new UsernamePasswordAuthenticationToken("demo",
"demo123");
@Autowired
private WidgetsCatalogController widgetsCatalogController;
@Autowired
+ private FnUserService fnUserService;
+ @Autowired
private FnLanguageService fnLanguageService;
@Autowired
private EpWidgetCatalogParameterService epWidgetCatalogParameterService;
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
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 = fnLanguageService.getByLanguageAlias("EN");
user.setLanguageId(language);
+ fnUserService.saveFnUser(user);
EpWidgetCatalogParameter data = EpWidgetCatalogParameter.builder()
.widgetId(widget).userId(user).paramId(parameter).userValue("TestData").build();
//When
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);
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 old = EpWidgetCatalogParameter.builder()
.widgetId(widget).userId(user).paramId(parameter).userValue("TestData").build();
.modifiedDate(LocalDateTime.now())
.createdDate(LocalDateTime.now())
.isInternalYn(true)
+ .isSystemUser(true)
.guest(false)
.build();
}