From e409b61dba897667c4824e23b79d4b04205b19e7 Mon Sep 17 00:00:00 2001
From: Dominika Zemanovicova <xzemanov@fi.muni.cz>
Date: Sun, 16 Apr 2023 19:00:50 +0200
Subject: [PATCH] Fix ExerciseFacadeTest
---
.../exercise/ExerciseFacadeTest.java | 65 +++++++++----------
1 file changed, 29 insertions(+), 36 deletions(-)
diff --git a/application/module-exercise/src/test/java/org/fuseri/moduleexercise/exercise/ExerciseFacadeTest.java b/application/module-exercise/src/test/java/org/fuseri/moduleexercise/exercise/ExerciseFacadeTest.java
index d53519ac..0be6f377 100644
--- a/application/module-exercise/src/test/java/org/fuseri/moduleexercise/exercise/ExerciseFacadeTest.java
+++ b/application/module-exercise/src/test/java/org/fuseri/moduleexercise/exercise/ExerciseFacadeTest.java
@@ -1,8 +1,7 @@
package org.fuseri.moduleexercise.exercise;
-import org.fuseri.model.dto.common.Result;
-import org.fuseri.model.dto.exercise.ExerciseDto;
import org.fuseri.model.dto.exercise.ExerciseCreateDto;
+import org.fuseri.model.dto.exercise.ExerciseDto;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
@@ -22,85 +21,79 @@ import static org.mockito.Mockito.when;
@SpringBootTest
@AutoConfigureMockMvc
-public class ExerciseFacadeTest {
-
- private final ExerciseDto exerciseDto = new ExerciseDto();
-
- private final ExerciseCreateDto exerciseCreateDto = new ExerciseCreateDto("name","desc",2,1);
-
- private final Exercise exercise = new Exercise();
+class ExerciseFacadeTest {
@Autowired
- ExerciseFacade facade;
+ ExerciseFacade exerciseFacade;
@MockBean
- ExerciseService service;
+ ExerciseService exerciseService;
@MockBean
- ExerciseMapper mapper;
+ ExerciseMapper exerciseMapper;
+ private final ExerciseDto exerciseDto = new ExerciseDto();
+
+ private final ExerciseCreateDto exerciseCreateDto = new ExerciseCreateDto("name", "desc", 2, 1);
+ private final Exercise exercise = new Exercise();
@Test
void create() {
+ when(exerciseMapper.fromCreateDto(exerciseCreateDto)).thenReturn(exercise);
+ when(exerciseService.create(exercise)).thenReturn(exercise);
+ when(exerciseMapper.toDto(exercise)).thenReturn(exerciseDto);
- when(mapper.fromCreateDto(exerciseCreateDto)).thenReturn(exercise);
- when(service.create(exercise)).thenReturn(exercise);
- when(mapper.toDto(exercise)).thenReturn(exerciseDto);
-
- ExerciseDto actualDto = facade.create(exerciseCreateDto);
+ ExerciseDto actualDto = exerciseFacade.create(exerciseCreateDto);
assertEquals(exerciseDto, actualDto);
-
}
@Test
void testFindById() {
- Long id = 0L;
+ long id = 1L;
- when(service.find(id)).thenReturn(exercise);
- when(mapper.toDto(exercise)).thenReturn(exerciseDto);
+ when(exerciseService.find(id)).thenReturn(exercise);
+ when(exerciseMapper.toDto(exercise)).thenReturn(exerciseDto);
- ExerciseDto actualDto = facade.find(id);
+ ExerciseDto actualDto = exerciseFacade.find(id);
assertNotNull(actualDto);
assertEquals(exerciseDto, actualDto);
}
-
@Test
void testFindAll() {
int page = 0;
Pageable pageable = PageRequest.of(0, 10);
Page<Exercise> exercisePage = new PageImpl<>(List.of(exercise), pageable, 0);
- Result<ExerciseDto> expectedPageDto = new Result<>();
-
+ Page<ExerciseDto> expectedPageDto = new PageImpl<>(List.of(exerciseDto));
- when(service.findAll(page)).thenReturn(exercisePage);
- when(mapper.toResult(exercisePage)).thenReturn(expectedPageDto);
+ when(exerciseService.findAll(page)).thenReturn(exercisePage);
+ when(exerciseMapper.toDtoPage(exercisePage)).thenReturn(expectedPageDto);
- Result<ExerciseDto> actualPageDto = facade.findAll(page);
+ Page<ExerciseDto> actualPageDto = exerciseFacade.findAll(page);
assertEquals(expectedPageDto, actualPageDto);
}
@Test
void update() {
- Long id = 1L;
- when(mapper.fromCreateDto(exerciseCreateDto)).thenReturn(exercise);
- when(service.update(exercise)).thenReturn(exercise);
- when(mapper.toDto(exercise)).thenReturn(exerciseDto);
+ long id = 1L;
+ when(exerciseMapper.fromCreateDto(exerciseCreateDto)).thenReturn(exercise);
+ when(exerciseService.update(id, exercise)).thenReturn(exercise);
+ when(exerciseMapper.toDto(exercise)).thenReturn(exerciseDto);
- ExerciseDto actualDto = facade.update(id, exerciseCreateDto);
+ ExerciseDto actualDto = exerciseFacade.update(id, exerciseCreateDto);
assertEquals(exerciseDto, actualDto);
}
@Test
void testDelete() {
- Long id = 1L;
- facade.delete(id);
- verify(service).delete(id);
+ long id = 1L;
+ exerciseFacade.delete(id);
+ verify(exerciseService).delete(id);
}
}
--
GitLab