From 1759f340c8dc308a724f602c62cc04094047fc32 Mon Sep 17 00:00:00 2001 From: Anton Romanov Date: Mon, 8 Jul 2019 15:17:12 +0400 Subject: [PATCH] fix tests --- src/main/java/ru/ulstu/activity/grant/model/GrantDto.java | 4 ++++ .../service => conference}/ConferenceServiceTest.java | 7 +++++-- .../activity/grant/service => grant}/GrantServiceTest.java | 6 ++++-- .../project/service => project}/ProjectServiceTest.java | 6 +++--- .../students/service => students}/TaskServiceTest.java | 3 ++- 5 files changed, 18 insertions(+), 8 deletions(-) rename src/test/java/{ru/ulstu/activity/conference/service => conference}/ConferenceServiceTest.java (97%) rename src/test/java/{ru/ulstu/activity/grant/service => grant}/GrantServiceTest.java (97%) rename src/test/java/{ru/ulstu/activity/project/service => project}/ProjectServiceTest.java (97%) rename src/test/java/{ru/ulstu/activity/students/service => students}/TaskServiceTest.java (98%) diff --git a/src/main/java/ru/ulstu/activity/grant/model/GrantDto.java b/src/main/java/ru/ulstu/activity/grant/model/GrantDto.java index fc48a2e..1d808a3 100644 --- a/src/main/java/ru/ulstu/activity/grant/model/GrantDto.java +++ b/src/main/java/ru/ulstu/activity/grant/model/GrantDto.java @@ -70,6 +70,10 @@ public class GrantDto extends ActivityDto { this.papers = papers; } + public GrantDto(Integer id) { + super(id); + } + public GrantDto(Grant grant) { super(grant.getId()); this.title = grant.getTitle(); diff --git a/src/test/java/ru/ulstu/activity/conference/service/ConferenceServiceTest.java b/src/test/java/conference/ConferenceServiceTest.java similarity index 97% rename from src/test/java/ru/ulstu/activity/conference/service/ConferenceServiceTest.java rename to src/test/java/conference/ConferenceServiceTest.java index f2be56c..b89902e 100644 --- a/src/test/java/ru/ulstu/activity/conference/service/ConferenceServiceTest.java +++ b/src/test/java/conference/ConferenceServiceTest.java @@ -1,4 +1,4 @@ -package ru.ulstu.activity.conference.service; +package conference; import org.junit.Before; import org.junit.Test; @@ -12,6 +12,9 @@ import ru.ulstu.activity.conference.model.ConferenceDto; import ru.ulstu.activity.conference.model.ConferenceFilterDto; import ru.ulstu.activity.conference.model.ConferenceUser; import ru.ulstu.activity.conference.repository.ConferenceRepository; +import ru.ulstu.activity.conference.service.ConferenceNotificationService; +import ru.ulstu.activity.conference.service.ConferenceService; +import ru.ulstu.activity.conference.service.ConferenceUserService; import ru.ulstu.activity.deadline.model.Deadline; import ru.ulstu.activity.deadline.service.DeadlineService; import ru.ulstu.activity.paper.model.Paper; @@ -160,7 +163,7 @@ public class ConferenceServiceTest { @Test public void create() throws IOException { - when(paperService.findPaperById(ID)).thenReturn(paperWithId); + when(paperService.findById(ID)).thenReturn(paperWithId); when(paperService.create(new Paper())).thenReturn(paperWithoutId); when(deadlineService.saveOrCreate(new ArrayList<>())).thenReturn(deadlines); when(conferenceUserService.saveOrCreate(new ArrayList<>())).thenReturn(conferenceUsers); diff --git a/src/test/java/ru/ulstu/activity/grant/service/GrantServiceTest.java b/src/test/java/grant/GrantServiceTest.java similarity index 97% rename from src/test/java/ru/ulstu/activity/grant/service/GrantServiceTest.java rename to src/test/java/grant/GrantServiceTest.java index d8c2c78..5cb632c 100644 --- a/src/test/java/ru/ulstu/activity/grant/service/GrantServiceTest.java +++ b/src/test/java/grant/GrantServiceTest.java @@ -1,4 +1,4 @@ -package ru.ulstu.activity.grant.service; +package grant; import org.apache.commons.lang3.StringUtils; import org.junit.Before; @@ -13,6 +13,8 @@ import ru.ulstu.activity.deadline.service.DeadlineService; import ru.ulstu.activity.grant.model.Grant; import ru.ulstu.activity.grant.model.GrantDto; import ru.ulstu.activity.grant.repository.GrantRepository; +import ru.ulstu.activity.grant.service.GrantNotificationService; +import ru.ulstu.activity.grant.service.GrantService; import ru.ulstu.activity.paper.model.Paper; import ru.ulstu.activity.paper.model.PaperDto; import ru.ulstu.activity.paper.service.PaperService; @@ -188,7 +190,7 @@ public class GrantServiceTest { @Test public void findById() { when(grantRepository.getOne(ID)).thenReturn(grantWithId); - Grant findGrant = grantService.findGrantById(ID); + Grant findGrant = grantService.findById(ID); assertEquals(grantWithId.getId(), findGrant.getId()); } diff --git a/src/test/java/ru/ulstu/activity/project/service/ProjectServiceTest.java b/src/test/java/project/ProjectServiceTest.java similarity index 97% rename from src/test/java/ru/ulstu/activity/project/service/ProjectServiceTest.java rename to src/test/java/project/ProjectServiceTest.java index 04b1282..2f59c2f 100644 --- a/src/test/java/ru/ulstu/activity/project/service/ProjectServiceTest.java +++ b/src/test/java/project/ProjectServiceTest.java @@ -1,4 +1,4 @@ -package ru.ulstu.activity.project.service; +package project; import org.junit.Before; import org.junit.Test; @@ -15,6 +15,7 @@ import ru.ulstu.activity.grant.service.GrantService; import ru.ulstu.activity.project.model.Project; import ru.ulstu.activity.project.model.ProjectDto; import ru.ulstu.activity.project.repository.ProjectRepository; +import ru.ulstu.activity.project.service.ProjectService; import ru.ulstu.activity.timeline.service.EventService; import ru.ulstu.user.model.User; import ru.ulstu.user.service.UserService; @@ -85,8 +86,7 @@ public class ProjectServiceTest { user.setFirstName(NAME); List grants = new ArrayList<>(); - GrantDto grant = new GrantDto(); - grant.setId(ID); + GrantDto grant = new GrantDto(ID); grants.add(grant); } diff --git a/src/test/java/ru/ulstu/activity/students/service/TaskServiceTest.java b/src/test/java/students/TaskServiceTest.java similarity index 98% rename from src/test/java/ru/ulstu/activity/students/service/TaskServiceTest.java rename to src/test/java/students/TaskServiceTest.java index 10a2cb5..1bdae87 100644 --- a/src/test/java/ru/ulstu/activity/students/service/TaskServiceTest.java +++ b/src/test/java/students/TaskServiceTest.java @@ -1,4 +1,4 @@ -package ru.ulstu.activity.students.service; +package students; import org.junit.Before; import org.junit.Test; @@ -15,6 +15,7 @@ import ru.ulstu.activity.students.model.TaskDto; import ru.ulstu.activity.students.model.TaskFilterDto; import ru.ulstu.activity.students.repository.SchedulerRepository; import ru.ulstu.activity.students.repository.TaskRepository; +import ru.ulstu.activity.students.service.TaskService; import ru.ulstu.activity.tags.model.Tag; import ru.ulstu.activity.tags.service.TagService; import ru.ulstu.activity.timeline.service.EventService;