|
|
@ -7,11 +7,13 @@ import org.mockito.InjectMocks;
|
|
|
|
import org.mockito.Mock;
|
|
|
|
import org.mockito.Mock;
|
|
|
|
import org.mockito.runners.MockitoJUnitRunner;
|
|
|
|
import org.mockito.runners.MockitoJUnitRunner;
|
|
|
|
import org.springframework.data.domain.Sort;
|
|
|
|
import org.springframework.data.domain.Sort;
|
|
|
|
|
|
|
|
import ru.ulstu.core.util.DateUtils;
|
|
|
|
import ru.ulstu.deadline.model.Deadline;
|
|
|
|
import ru.ulstu.deadline.model.Deadline;
|
|
|
|
import ru.ulstu.deadline.service.DeadlineService;
|
|
|
|
import ru.ulstu.deadline.service.DeadlineService;
|
|
|
|
import ru.ulstu.students.model.Task;
|
|
|
|
import ru.ulstu.students.model.Task;
|
|
|
|
import ru.ulstu.students.model.TaskDto;
|
|
|
|
import ru.ulstu.students.model.TaskDto;
|
|
|
|
import ru.ulstu.students.model.TaskFilterDto;
|
|
|
|
import ru.ulstu.students.model.TaskFilterDto;
|
|
|
|
|
|
|
|
import ru.ulstu.students.repository.SchedulerRepository;
|
|
|
|
import ru.ulstu.students.repository.TaskRepository;
|
|
|
|
import ru.ulstu.students.repository.TaskRepository;
|
|
|
|
import ru.ulstu.tags.model.Tag;
|
|
|
|
import ru.ulstu.tags.model.Tag;
|
|
|
|
import ru.ulstu.tags.service.TagService;
|
|
|
|
import ru.ulstu.tags.service.TagService;
|
|
|
@ -21,9 +23,12 @@ import java.io.IOException;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.Collections;
|
|
|
|
import java.util.Collections;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.Date;
|
|
|
|
|
|
|
|
import java.util.HashSet;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
|
|
|
|
import java.util.Set;
|
|
|
|
|
|
|
|
|
|
|
|
import static org.junit.Assert.assertEquals;
|
|
|
|
import static org.junit.Assert.assertEquals;
|
|
|
|
|
|
|
|
import static org.junit.Assert.assertTrue;
|
|
|
|
import static org.mockito.Mockito.when;
|
|
|
|
import static org.mockito.Mockito.when;
|
|
|
|
|
|
|
|
|
|
|
|
@RunWith(MockitoJUnitRunner.class)
|
|
|
|
@RunWith(MockitoJUnitRunner.class)
|
|
|
@ -32,6 +37,9 @@ public class TaskServiceTest {
|
|
|
|
@Mock
|
|
|
|
@Mock
|
|
|
|
TaskRepository taskRepository;
|
|
|
|
TaskRepository taskRepository;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Mock
|
|
|
|
|
|
|
|
SchedulerRepository schedulerRepository;
|
|
|
|
|
|
|
|
|
|
|
|
@Mock
|
|
|
|
@Mock
|
|
|
|
private TagService tagService;
|
|
|
|
private TagService tagService;
|
|
|
|
|
|
|
|
|
|
|
@ -50,6 +58,7 @@ public class TaskServiceTest {
|
|
|
|
private final static String TITLE = "title";
|
|
|
|
private final static String TITLE = "title";
|
|
|
|
private final static String DESCR = "descr";
|
|
|
|
private final static String DESCR = "descr";
|
|
|
|
private final static String TAG = "tag";
|
|
|
|
private final static String TAG = "tag";
|
|
|
|
|
|
|
|
private final static Date YEAR = DateUtils.clearTime(DateUtils.addYears(new Date(), 0));
|
|
|
|
|
|
|
|
|
|
|
|
private List<Task> tasks;
|
|
|
|
private List<Task> tasks;
|
|
|
|
private List<Tag> tags;
|
|
|
|
private List<Tag> tags;
|
|
|
@ -61,6 +70,7 @@ public class TaskServiceTest {
|
|
|
|
private Tag tagNull;
|
|
|
|
private Tag tagNull;
|
|
|
|
private Deadline deadline;
|
|
|
|
private Deadline deadline;
|
|
|
|
private List<Deadline> deadlines;
|
|
|
|
private List<Deadline> deadlines;
|
|
|
|
|
|
|
|
private Set<Tag> repeatingTags;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Before
|
|
|
|
@Before
|
|
|
@ -83,12 +93,17 @@ public class TaskServiceTest {
|
|
|
|
deadline.setId(ID);
|
|
|
|
deadline.setId(ID);
|
|
|
|
deadlines.add(deadline);
|
|
|
|
deadlines.add(deadline);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
task.setDeadlines(deadlines);
|
|
|
|
|
|
|
|
|
|
|
|
tags = new ArrayList<>();
|
|
|
|
tags = new ArrayList<>();
|
|
|
|
tags.add(tag);
|
|
|
|
tags.add(tag);
|
|
|
|
|
|
|
|
|
|
|
|
tasks.add(task);
|
|
|
|
tasks.add(task);
|
|
|
|
taskDto = new TaskDto(task);
|
|
|
|
taskDto = new TaskDto(task);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
repeatingTags = new HashSet<>();
|
|
|
|
|
|
|
|
repeatingTags.add(tag);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
@Test
|
|
|
@ -132,35 +147,26 @@ public class TaskServiceTest {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
@Test
|
|
|
|
public void update() {
|
|
|
|
public void delete() throws IOException {
|
|
|
|
}
|
|
|
|
when(taskRepository.exists(ID)).thenReturn(true);
|
|
|
|
|
|
|
|
when(taskRepository.findOne(ID)).thenReturn(task);
|
|
|
|
@Test
|
|
|
|
when(schedulerRepository.findOneByTask(task)).thenReturn(null);
|
|
|
|
public void delete() {
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
|
|
|
public void save() {
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
|
|
|
public void copyMainPart() {
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
assertTrue(taskService.delete(ID));
|
|
|
|
public void copyTaskWithNewDates() {
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
|
|
|
public void copyTaskWithNewYear() {
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
@Test
|
|
|
|
public void generateYearTasks() {
|
|
|
|
public void generateYearTasks() {
|
|
|
|
|
|
|
|
when(taskService.checkRepeatingTags(false)).thenReturn(repeatingTags);
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
@Test
|
|
|
|
public void checkRepeatingTags() {
|
|
|
|
public void checkRepeatingTags() {
|
|
|
|
|
|
|
|
when(tagService.findById(ID)).thenReturn(tag);
|
|
|
|
|
|
|
|
when(taskRepository.findAllYear(DateUtils.clearTime(DateUtils.addYears(new Date(), -1)))).thenReturn(tasks);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
assertEquals(tag, taskService.checkRepeatingTags(false));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
@Test
|
|
|
|