remove spymocks and replace their functionality using @import

puzzle · Jan 7, 2025 · 4872499 · 4872499
1 parent 4ae5f8c
commit 4872499
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/backend/src/test/java/ch/puzzle/okr/controller/AlignmentControllerIT.java b/backend/src/test/java/ch/puzzle/okr/controller/AlignmentControllerIT.java
@@ -20,6 +20,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
@@ -30,13 +31,13 @@
 @WithMockUser(value = "spring")
 @ExtendWith(MockitoExtension.class)
 @WebMvcTest(AlignmentController.class)
+@Import(AlignmentSelectionMapper.class)
 class AlignmentControllerIT {
     @Autowired
     private MockMvc mvc;
+
     @MockitoBean
     private AlignmentSelectionBusinessService alignmentSelectionBusinessService;
-    @MockitoSpyBean
-    private AlignmentSelectionMapper alignmentSelectionMapper;
 
     static String alignmentObjectiveName = "Objective 5";
     static List<AlignmentSelection> alignmentSelectionPuzzle = List

diff --git a/backend/src/test/java/ch/puzzle/okr/controller/CheckInControllerIT.java b/backend/src/test/java/ch/puzzle/okr/controller/CheckInControllerIT.java
@@ -24,6 +24,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithMockUser;
@@ -37,6 +38,7 @@
 @WithMockUser(value = "spring")
 @ExtendWith(MockitoExtension.class)
 @WebMvcTest(CheckInController.class)
+@Import(DeserializerHelper.class)
 class CheckInControllerIT {
     @Autowired
     private MockMvc mvc;
@@ -46,8 +48,6 @@ class CheckInControllerIT {
     private CheckInMapper checkInMapper;
     @MockitoBean
     private KeyResultBusinessService keyResultBusinessService;
-    @MockitoSpyBean
-    DeserializerHelper deserializerHelper;
 
     @BeforeEach
     void setUp() {

diff --git a/backend/src/test/java/ch/puzzle/okr/controller/KeyResultControllerIT.java b/backend/src/test/java/ch/puzzle/okr/controller/KeyResultControllerIT.java
@@ -35,6 +35,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithMockUser;
@@ -48,6 +49,7 @@
 @WithMockUser(value = "spring")
 @ExtendWith(MockitoExtension.class)
 @WebMvcTest(KeyResultController.class)
+@Import(DeserializerHelper.class)
 class KeyResultControllerIT {
 
     @MockitoBean
@@ -66,8 +68,6 @@ class KeyResultControllerIT {
     ObjectivePersistenceService objectivePersistenceService;
     @MockitoBean
     private KeyResultBusinessService keyResultBusinessService;
-    @MockitoSpyBean
-    DeserializerHelper deserializerHelper;
     @Autowired
     private MockMvc mvc;
 

diff --git a/backend/src/test/java/ch/puzzle/okr/controller/OverviewControllerIT.java b/backend/src/test/java/ch/puzzle/okr/controller/OverviewControllerIT.java
@@ -7,6 +7,7 @@
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 
+import ch.puzzle.okr.mapper.AlignmentSelectionMapper;
 import ch.puzzle.okr.mapper.OverviewMapper;
 import ch.puzzle.okr.models.overview.Overview;
 import ch.puzzle.okr.models.overview.OverviewId;
@@ -24,6 +25,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.context.annotation.Import;
 import org.springframework.http.MediaType;
 import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
@@ -34,14 +36,12 @@
 @WithMockUser(value = "spring")
 @ExtendWith(MockitoExtension.class)
 @WebMvcTest(OverviewController.class)
+@Import(OverviewMapper.class)
 class OverviewControllerIT {
     @Autowired
     private MockMvc mvc;
     @MockitoBean
     private OverviewAuthorizationService overviewAuthorizationService;
-    // Dashboard and OverviewMapper are required for testing
-    @MockitoSpyBean
-    private OverviewMapper overviewMapper;
 
     public static final String PUZZLE = "Puzzle";
     public static final String DESCRIPTION = "This is a description";