import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.onap.portal.dao.fn.FnLanguageDao;
-import org.onap.portal.dao.fn.FnUserDao;
import org.onap.portal.domain.db.fn.FnLanguage;
import org.onap.portal.domain.db.fn.FnUser;
import org.onap.portal.domain.db.fn.FnWidget;
import org.onap.portal.domain.dto.transport.OnboardingWidget;
import org.onap.portal.domain.dto.transport.WidgetCatalogPersonalization;
import org.onap.portal.framework.MockitoTestSuite;
-import org.onap.portal.service.WidgetService;
+import org.onap.portal.service.user.FnUserService;
+import org.onap.portal.service.widget.WidgetService;
+import org.onap.portal.service.language.FnLanguageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@Transactional
public class WidgetsControllerTest {
- private UsernamePasswordAuthenticationToken principal = new UsernamePasswordAuthenticationToken("demo",
+ private final UsernamePasswordAuthenticationToken principal = new UsernamePasswordAuthenticationToken("demo",
"demo123");
- MockitoTestSuite mockitoTestSuite = new MockitoTestSuite();
+ final MockitoTestSuite mockitoTestSuite = new MockitoTestSuite();
- HttpServletRequest request = mockitoTestSuite.getMockedRequest();
- HttpServletResponse response = mockitoTestSuite.getMockedResponse();
+ final HttpServletRequest request = mockitoTestSuite.getMockedRequest();
+ final HttpServletResponse response = mockitoTestSuite.getMockedResponse();
@Autowired
private WidgetsController widgetsController;
@Autowired
- private FnUserDao fnUserDao;
+ private WidgetService widgetService;
@Autowired
- private FnLanguageDao fnLanguageDao;
+ private FnLanguageService fnLanguageService;
@Autowired
- private WidgetService widgetService;
+ FnUserService fnUserService;
+ private FnLanguage language;
+ private FnUser questUser;
+ private FnUser notQuestUser;
+
+ @Before
+ public void init(){
+ this.language = getFnLanguage();
+ this.questUser = getQuestUser();
+ this.notQuestUser = getNotQuestUser();
+ }
- private FnLanguage language = getFnLanguage();
- private FnUser questUser = getQuestUser();
- private FnUser notQuestUser = getNotQuestUser();
@Test(expected = UsernameNotFoundException.class)
public void getOnboardingWidgetsNullUserTest() {
public void getOnboardingWidgetsQuestUserTest() {
UsernamePasswordAuthenticationToken questPrincipal = new UsernamePasswordAuthenticationToken("questUser",
"demo123");
- fnUserDao.save(questUser);
+ fnUserService.save(questUser);
List<OnboardingWidget> onboardingWidgets = widgetsController
.getOnboardingWidgets(questPrincipal, request, response);
assertNull(onboardingWidgets);
//Clean up
- fnUserDao.delete(questUser);
- fnLanguageDao.delete(language);
+ fnUserService.delete(questUser);
+ fnLanguageService.delete(language);
}
@Test
UsernamePasswordAuthenticationToken notQuestprincipal = new UsernamePasswordAuthenticationToken(
"notQuestUser",
"demo123");
- fnUserDao.save(notQuestUser);
+ fnUserService.save(notQuestUser);
List<OnboardingWidget> expected = new ArrayList<>();
when(request.getHeader("X-Widgets-Type")).thenReturn("managed");
.getOnboardingWidgets(notQuestprincipal, request, response);
assertEquals(expected, actual);
- fnUserDao.delete(notQuestUser);
+ fnUserService.delete(notQuestUser);
}
@Test
UsernamePasswordAuthenticationToken notQuestprincipal = new UsernamePasswordAuthenticationToken(
"notQuestUser",
"demo123");
- fnUserDao.save(notQuestUser);
+ fnUserService.save(notQuestUser);
when(request.getHeader("X-Widgets-Type")).thenReturn("test");
List<OnboardingWidget> actual = widgetsController
.getOnboardingWidgets(notQuestprincipal, request, response);
assertNull(actual);
- fnUserDao.delete(notQuestUser);
+ fnUserService.delete(notQuestUser);
}
@Test
public void putOnboardingWidgetSameWidget() {
//Given
- fnUserDao.save(notQuestUser);
+ fnUserService.save(notQuestUser);
when(request.getHeader("X-Widgets-Type")).thenReturn("managed");
OnboardingWidget onboardingWidget = OnboardingWidget.builder()
@Test
public void putOnboardingWidgetAOP() {
//Given
- fnUserDao.save(notQuestUser);
+ fnUserService.save(notQuestUser);
when(request.getHeader("X-Widgets-Type")).thenReturn("managed");
OnboardingWidget onboardingWidget = OnboardingWidget.builder()
@Test
public void putOnboardingWidgetAOPXSSTest() {
//Given
- fnUserDao.save(notQuestUser);
+ fnUserService.save(notQuestUser);
when(request.getHeader("X-Widgets-Type")).thenReturn("managed");
OnboardingWidget onboardingWidget = OnboardingWidget.builder()
@Test
public void postOnboardingWidgetXSS() {
//Given
- fnUserDao.save(notQuestUser);
+ fnUserService.save(notQuestUser);
when(request.getHeader("X-Widgets-Type")).thenReturn("managed");
OnboardingWidget onboardingWidget = OnboardingWidget.builder()
@Test
public void postOnboardingWidget() {
//Given
- fnUserDao.save(notQuestUser);
+ fnUserService.save(notQuestUser);
when(request.getHeader("X-Widgets-Type")).thenReturn("managed");
OnboardingWidget onboardingWidget = OnboardingWidget.builder()
@Test
public void deleteOnboardingWidgetSCFORBIDDEN() {
//Given
- fnUserDao.save(notQuestUser);
+ fnUserService.save(notQuestUser);
when(request.getHeader("X-Widgets-Type")).thenReturn("managed");
OnboardingWidget onboardingWidget = OnboardingWidget.builder()
.modifiedDate(LocalDateTime.now())
.isInternalYn(true)
.languageId(language)
+ .isSystemUser(true)
.guest(true)
.build();
}
.createdDate(LocalDateTime.now())
.modifiedDate(LocalDateTime.now())
.isInternalYn(true)
+ .isSystemUser(true)
.languageId(language)
.guest(false)
.build();
}
+
private FnLanguage getFnLanguage() {
- return FnLanguage.builder().languageName("Polish").languageAlias("Pl").build();
+ FnLanguage tmp = FnLanguage.builder().languageName("Polish").languageAlias("Pl").build();
+ fnLanguageService.save(tmp);
+ return tmp;
}
}
\ No newline at end of file