Commit 2e187479 authored by Georgi Cholev's avatar Georgi Cholev
Browse files

Convert test initialization to pure @BeforeAll

parent 68f1f7ee
Showing with 69 additions and 20 deletions
+69 -20
package student.management.core.services_test;
import org.junit.jupiter.api.BeforeAll;
import student.management.core.services.CourseService;
import student.management.core.services.GradeService;
import student.management.core.services.StudentService;
import student.management.core.services.TeacherService;
import student.management.core.services.impl.CourseServiceImpl;
import student.management.data.repositories.CourseRepository;
import student.management.models.dtos.create_dto.CourseCreateDto;
import student.management.models.dtos.response_dto.CourseResponseDto;
import student.management.models.entities.Course;
import static org.mockito.Mockito.mock;
public class CourseServiceTest {
private static CourseRepository mockedCourseRepository;
private static GradeService mockedGradeService;
private static StudentService mockedStudentService;
private static TeacherService mockedTeacherService;
private static CourseService courseService;
private static CourseCreateDto courseCreateDto;
private static Course course;
private static CourseResponseDto courseResponseDto;
@BeforeAll
static void setUp() {
mockedCourseRepository = mock(CourseRepository.class);
mockedGradeService = mock(GradeService.class);
mockedStudentService = mock(StudentService.class);
mockedTeacherService = mock(TeacherService.class);
courseService = new CourseServiceImpl(mockedCourseRepository, mockedTeacherService,
mockedStudentService, mockedGradeService);
courseCreateDto = new CourseCreateDto("Math", 120);
course = new Course(courseCreateDto);
courseResponseDto = new CourseResponseDto(course);
}
}
......@@ -26,9 +26,8 @@ import static student.management.core.constants.Messages.NULL_ENTITY;
public class GradeServiceTest {
private final GradeRepository mockedGradeRepository = mock(GradeRepository.class);
private final GradeService gradeService = new GradeServiceImpl(mockedGradeRepository);
private static GradeRepository mockedGradeRepository;
private static GradeService gradeService;
private static GradeCreateDto gradeCreateDto;
private static Grade grade;
......@@ -36,6 +35,9 @@ public class GradeServiceTest {
@BeforeAll
static void setUp() {
mockedGradeRepository = mock(GradeRepository.class);
gradeService = new GradeServiceImpl(mockedGradeRepository);
gradeCreateDto = new GradeCreateDto(4.5);
grade = new Grade(gradeCreateDto);
gradeResponseDto = new GradeResponseDto(grade.getId(), grade.getValue());
......
......@@ -5,9 +5,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import org.junit.jupiter.params.provider.ValueSource;
import student.management.core.constants.Messages;
import student.management.core.exceptions.InvalidEntityArgumentsException;
import student.management.core.exceptions.UnidentifiableEntityException;
import student.management.core.services.GradeService;
......@@ -40,11 +38,11 @@ import static student.management.core.constants.Messages.TEACHER_WITH_NAME_DEGRE
public class StudentServiceTest {
private final StudentRepository mockedStudentRepository;
private static StudentRepository mockedStudentRepository;
private final GradeService mockedGradeService;
private static GradeService mockedGradeService;
private final StudentService studentService;
private static StudentService studentService;
private static StudentCreateDto studentCreateDto;
private static Student student;
......@@ -52,14 +50,12 @@ public class StudentServiceTest {
private static Grade grade;
StudentServiceTest() {
@BeforeAll
static void setUp() {
mockedStudentRepository = mock(StudentRepository.class);
mockedGradeService = mock(GradeService.class);
studentService = new StudentServiceImpl(mockedStudentRepository, mockedGradeService);
}
@BeforeAll
static void setUp() {
studentCreateDto = new StudentCreateDto("Pepi", 15);
student = new Student(studentCreateDto);
studentResponseDto = new StudentResponseDto(student);
......@@ -71,7 +67,6 @@ public class StudentServiceTest {
student.setGrades(new HashSet<>());
}
@Test
@DisplayName("Get by Id returns expected Student")
void getGradeById_ReturnsExpected() throws UnidentifiableEntityException {
......@@ -94,7 +89,7 @@ public class StudentServiceTest {
assertThrows(
UnidentifiableEntityException.class,
() -> this.studentService.findById(-1L),
() -> studentService.findById(-1L),
String.format(STUDENT_NOT_FOUND_FORMAT, -1L));
}
......@@ -102,7 +97,7 @@ public class StudentServiceTest {
@DisplayName("Create Student returns expected Dto")
void createStudent_ReturnsExpectedDto() throws InvalidEntityArgumentsException {
StudentResponseDto actualDto = this.studentService.create(studentCreateDto);
StudentResponseDto actualDto = studentService.create(studentCreateDto);
assertEquals(studentResponseDto.getId() + 1, actualDto.getId());
assertEquals(studentResponseDto.getName(), actualDto.getName());
......
......@@ -24,8 +24,8 @@ import static student.management.core.constants.Messages.TEACHER_WITH_NAME_DEGRE
class TeacherServiceTest {
private final TeacherRepository mockedTeacherRepository = mock(TeacherRepository.class);
private final TeacherService teacherService = new TeacherServiceImpl(mockedTeacherRepository);
private static TeacherRepository mockedTeacherRepository = mock(TeacherRepository.class);
private static TeacherService teacherService = new TeacherServiceImpl(mockedTeacherRepository);
private static TeacherCreateDto teacherCreateDto;
private static Teacher teacher;
......@@ -33,6 +33,9 @@ class TeacherServiceTest {
@BeforeAll
static void setUp() {
mockedTeacherRepository = mock(TeacherRepository.class);
teacherService = new TeacherServiceImpl(mockedTeacherRepository);
teacherCreateDto = new TeacherCreateDto("Anna", "BSc");
teacher = new Teacher(teacherCreateDto);
teacherResponseDto = new TeacherResponseDto(teacher);
......@@ -45,7 +48,7 @@ class TeacherServiceTest {
.when(mockedTeacherRepository)
.findById(anyLong());
Teacher byId = this.teacherService.findById(0L);
Teacher byId = teacherService.findById(0L);
assertSame(teacher.getId(), byId.getId());
assertSame(teacher.getName(), byId.getName());
......@@ -61,7 +64,7 @@ class TeacherServiceTest {
assertThrows(
UnidentifiableEntityException.class,
() -> this.teacherService.findById(-1L),
() -> teacherService.findById(-1L),
String.format(TEACHER_NOT_FOUND_FORMAT, -1L));
}
......@@ -69,7 +72,7 @@ class TeacherServiceTest {
@DisplayName("Create Teacher returns expected Dto")
void createTeacher_ReturnsExpectedDto() throws InvalidEntityArgumentsException {
TeacherResponseDto actualDto = this.teacherService.create(teacherCreateDto);
TeacherResponseDto actualDto = teacherService.create(teacherCreateDto);
assertEquals(teacherResponseDto.getId() + 1, actualDto.getId());
assertEquals(teacherResponseDto.getName(), actualDto.getName());
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment