romanov73/ng-tracker
1
0
Fork 0
Code Issues 18 Pull Requests 4 Projects Releases Wiki Activity

Resolve "Генерация таймлайна для проекта" #212

Merged
a.vasin merged 1 commits from 101-projecgt-timeline into dev 2019-06-05 08:55:16 +04:00
Conversation 35 Commits 1 Files Changed 2 +2 -2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bdff81d25e - Show all commits

2
src/test/java/ru/ulstu/project/service/ProjectServiceTest.java
View File

@ -99,7 +99,7 @@ public class ProjectServiceTest {
public void create() throws IOException { public void create() throws IOException {
when(deadlineService.saveOrCreate(new ArrayList<>())).thenReturn(deadlines); when(deadlineService.saveOrCreate(new ArrayList<>())).thenReturn(deadlines);
when(projectRepository.save(new Project())).thenReturn(project); when(projectRepository.save(new Project())).thenReturn(project);
eventService.createFromObject(new Project(), Collections.emptyList()); eventService.createFromObject(new Project(), Collections.emptyList(), false, "проекта");
projectDto.setTitle(TITLE); projectDto.setTitle(TITLE);
projectDto.setDeadlines(deadlines); projectDto.setDeadlines(deadlines);

2
src/test/java/ru/ulstu/students/service/TaskServiceTest.java
View File

@ -136,7 +136,7 @@ public class TaskServiceTest {
when(tagService.saveOrCreate(new ArrayList<>())).thenReturn(tags); when(tagService.saveOrCreate(new ArrayList<>())).thenReturn(tags);
when(deadlineService.saveOrCreate(new ArrayList<>())).thenReturn(deadlines); when(deadlineService.saveOrCreate(new ArrayList<>())).thenReturn(deadlines);
when(taskRepository.save(new Task())).thenReturn(task); when(taskRepository.save(new Task())).thenReturn(task);
eventService.createFromObject(new Task(), Collections.emptyList()); eventService.createFromObject(new Task(), Collections.emptyList(), true, "задачи");
taskDto.setTags(tags); taskDto.setTags(tags);
taskDto.setDeadlines(deadlines); taskDto.setDeadlines(deadlines);