Merge pull request #498 from MTES-MCT/mockito-beans

chore: fix deprecated MockBean in favour of MockitoBean after bumpt t…
MTES-MCT · Jan 14, 2025 · a012aff · a012aff
2 parents b2c3634 + 0d3d347
commit a012aff
Show file tree

Hide file tree

Showing 46 changed files with 347 additions and 353 deletions.
diff --git a/backend/src/test/kotlin/fr/gouv/gmampa/rapportnav/domain/use_cases/auth/TokenServiceTests.kt b/backend/src/test/kotlin/fr/gouv/gmampa/rapportnav/domain/use_cases/auth/TokenServiceTests.kt
@@ -7,48 +7,45 @@ import fr.gouv.dgampa.rapportnav.domain.use_cases.auth.TokenService
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
-import org.mockito.InjectMocks
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.beans.factory.annotation.Qualifier
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.security.oauth2.jwt.JwtDecoder
 import org.springframework.security.oauth2.jwt.JwtEncoder
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 import org.springframework.test.context.junit.jupiter.SpringExtension
 
 @ExtendWith(SpringExtension::class)
 @SpringBootTest(classes = [TokenService::class])
-class TokenServiceTests  {
+class TokenServiceTests {
 
-    @MockBean
-    private lateinit var jwtDecoder: JwtDecoder;
+    @MockitoBean
+    private lateinit var jwtDecoder: JwtDecoder
 
-    @MockBean
-    private lateinit var jwtEncoder: JwtEncoder;
+    @MockitoBean
+    private lateinit var jwtEncoder: JwtEncoder
 
-    @MockBean
-    private lateinit var userRepository: IUserRepository;
+    @MockitoBean
+    private lateinit var userRepository: IUserRepository
 
 
-    private val user:User = User(
+    private val user: User = User(
         id = 3,
         firstName = "Jean",
         lastName = "Dupont",
         email = "jean.dupont@mer.gouv.fr",
         password = "MyBeautifulPassword",
         serviceId = 6,
         roles = listOf(RoleTypeEnum.USER_ULAM)
-    );
+    )
 
 
     @Test
     fun `execute should have roles with claim user id and user role`() {
-        val tokenService = TokenService(jwtDecoder, jwtEncoder, userRepository);
-        val claims = tokenService.getClaims(user);
-        assertThat(claims).isNotNull();
+        val tokenService = TokenService(jwtDecoder, jwtEncoder, userRepository)
+        val claims = tokenService.getClaims(user)
+        assertThat(claims).isNotNull()
 
-        assertThat(claims.getClaim<Int>("userId")).isEqualTo(user.id);
-        assertThat(claims.getClaim<List<RoleTypeEnum>>("roles")).isEqualTo(user.roles);
+        assertThat(claims.getClaim<Int>("userId")).isEqualTo(user.id)
+        assertThat(claims.getClaim<List<RoleTypeEnum>>("roles")).isEqualTo(user.roles)
     }
 
 }

diff --git a/...c/test/kotlin/fr/gouv/gmampa/rapportnav/domain/use_cases/mission/GetEnvMissionByIdTest.kt b/...c/test/kotlin/fr/gouv/gmampa/rapportnav/domain/use_cases/mission/GetEnvMissionByIdTest.kt
@@ -20,13 +20,13 @@ import org.junit.jupiter.api.Test
 import org.mockito.Mockito.*
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.cache.CacheManager
 import org.springframework.cache.annotation.EnableCaching
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.test.context.ContextConfiguration
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 import java.util.*
 
 @SpringBootTest(classes = [GetEnvMissionById::class])
@@ -48,16 +48,16 @@ class GetEnvMissionByIdTest {
     @Autowired
     private lateinit var cacheManager: CacheManager
 
-    @MockBean
+    @MockitoBean
     private lateinit var getEnvMissions: GetEnvMissions
 
-    @MockBean
+    @MockitoBean
     private lateinit var monitorEnvApiRepo: IEnvMissionRepository
 
-    @MockBean
+    @MockitoBean
     private lateinit var attachControlsToActionControl: AttachControlsToActionControl
 
-    @MockBean
+    @MockitoBean
     private lateinit var getFakeActionData: FakeActionData
 
     private val envControlActionId: UUID = UUID.randomUUID()

diff --git a/.../src/test/kotlin/fr/gouv/gmampa/rapportnav/domain/use_cases/mission/GetEnvMissionsTest.kt b/.../src/test/kotlin/fr/gouv/gmampa/rapportnav/domain/use_cases/mission/GetEnvMissionsTest.kt
@@ -9,13 +9,13 @@ import org.junit.jupiter.api.Test
 import org.mockito.Mockito.*
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.cache.CacheManager
 import org.springframework.cache.annotation.EnableCaching
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.test.context.ContextConfiguration
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 
 @SpringBootTest(classes = [GetEnvMissions::class])
 @ContextConfiguration(classes = [GetEnvMissionsTest.TestConfig::class])
@@ -36,7 +36,7 @@ class GetEnvMissionsTest {
     @Autowired
     private lateinit var cacheManager: CacheManager
 
-    @MockBean
+    @MockitoBean
     private lateinit var envMissionRepository: IEnvMissionRepository
 
     private val mockEnvMissions = listOf(

diff --git a/...otlin/fr/gouv/gmampa/rapportnav/domain/use_cases/mission/GetFishActionsByMissionIdTest.kt b/...otlin/fr/gouv/gmampa/rapportnav/domain/use_cases/mission/GetFishActionsByMissionIdTest.kt
@@ -12,13 +12,13 @@ import org.junit.jupiter.api.Test
 import org.mockito.Mockito.*
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.cache.CacheManager
 import org.springframework.cache.annotation.EnableCaching
 import org.springframework.cache.concurrent.ConcurrentMapCacheManager
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.test.context.ContextConfiguration
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 
 @SpringBootTest(classes = [GetFishActionsByMissionId::class])
 @ContextConfiguration(classes = [GetFishActionsByMissionIdTest.TestConfig::class])
@@ -39,14 +39,14 @@ class GetFishActionsByMissionIdTest {
     @Autowired
     private lateinit var cacheManager: CacheManager
 
-    @MockBean
+    @MockitoBean
     private lateinit var fishActionRepo: IFishActionRepository
 
-    @MockBean
+    @MockitoBean
     private lateinit var attachControlsToActionControl: AttachControlsToActionControl
 
-    @MockBean
-    private lateinit  var getFakeActionData: FakeActionData
+    @MockitoBean
+    private lateinit var getFakeActionData: FakeActionData
 
     private val mockFishMissionActions = listOf(
         FishActionControlMock.create(id = 1),

diff --git a/...c/test/kotlin/fr/gouv/gmampa/rapportnav/domain/use_cases/mission/GetNavMissionByIdTest.kt b/...c/test/kotlin/fr/gouv/gmampa/rapportnav/domain/use_cases/mission/GetNavMissionByIdTest.kt
@@ -13,15 +13,15 @@ import org.junit.jupiter.api.Test
 import org.mockito.Mockito
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 
 @SpringBootTest(classes = [GetNavMissionById::class])
 class GetNavMissionByIdTest {
 
     @Autowired
     private lateinit var getMissionNavById: GetNavMissionById
 
-    @MockBean
+    @MockitoBean
     private lateinit var getServiceByControlUnit: GetServiceByControlUnit
 
     private val controlUnits: List<LegacyControlUnitEntity> = listOf(
@@ -33,46 +33,46 @@ class GetNavMissionByIdTest {
         )
     )
 
-    @MockBean
-    private lateinit var navActionControlRepository: INavActionControlRepository;
+    @MockitoBean
+    private lateinit var navActionControlRepository: INavActionControlRepository
 
-    @MockBean
-    private lateinit var navStatusRepository: INavActionStatusRepository;
+    @MockitoBean
+    private lateinit var navStatusRepository: INavActionStatusRepository
 
-    @MockBean
-    private lateinit var navFreeNoteRepository: INavActionFreeNoteRepository;
+    @MockitoBean
+    private lateinit var navFreeNoteRepository: INavActionFreeNoteRepository
 
-    @MockBean
-    private lateinit var attachControlsToActionControl: AttachControlsToActionControl;
+    @MockitoBean
+    private lateinit var attachControlsToActionControl: AttachControlsToActionControl
 
-    @MockBean
-    private lateinit var getMissionGeneralInfoByMissionId: GetMissionGeneralInfoByMissionId;
+    @MockitoBean
+    private lateinit var getMissionGeneralInfoByMissionId: GetMissionGeneralInfoByMissionId
 
-    @MockBean
-    private lateinit var getAgentsCrewByMissionId: GetAgentsCrewByMissionId;
+    @MockitoBean
+    private lateinit var getAgentsCrewByMissionId: GetAgentsCrewByMissionId
 
-    @MockBean
-    private lateinit var navRescueRepository: INavActionRescueRepository;
+    @MockitoBean
+    private lateinit var navRescueRepository: INavActionRescueRepository
 
-    @MockBean
-    private lateinit var navNauticalEventRepository: INavActionNauticalEventRepository;
+    @MockitoBean
+    private lateinit var navNauticalEventRepository: INavActionNauticalEventRepository
 
-    @MockBean
-    private lateinit var navVigimerRepository: INavActionVigimerRepository;
+    @MockitoBean
+    private lateinit var navVigimerRepository: INavActionVigimerRepository
 
-    @MockBean
-    private lateinit var navAntiPollutionRepository: INavActionAntiPollutionRepository;
+    @MockitoBean
+    private lateinit var navAntiPollutionRepository: INavActionAntiPollutionRepository
 
-    @MockBean
-    private lateinit var navBAAEMRepository: INavActionBAAEMRepository;
+    @MockitoBean
+    private lateinit var navBAAEMRepository: INavActionBAAEMRepository
 
-    @MockBean
-    private lateinit var navPublicOrderRepository: INavActionPublicOrderRepository;
+    @MockitoBean
+    private lateinit var navPublicOrderRepository: INavActionPublicOrderRepository
 
-    @MockBean
-    private lateinit var navRepresentationRepository: INavActionRepresentationRepository;
+    @MockitoBean
+    private lateinit var navRepresentationRepository: INavActionRepresentationRepository
 
-    @MockBean
+    @MockitoBean
     private lateinit var navIllegalImmigrationRepository: INavActionIllegalImmigrationRepository
 
     private val serviceEntities: List<ServiceEntity> = listOf(
@@ -85,17 +85,17 @@ class GetNavMissionByIdTest {
             name = "SecondService",
             controlUnits = listOf(3, 4)
         )
-    );
+    )
 
     @Test
     fun `execute should have services in nav mission entity`() {
-        Mockito.`when`(getServiceByControlUnit.execute(controlUnits)).thenReturn(serviceEntities);
+        Mockito.`when`(getServiceByControlUnit.execute(controlUnits)).thenReturn(serviceEntities)
         val response = getMissionNavById.execute(2, controlUnits)
 
-        assertThat(response).isNotNull();
-        assertThat(response.services).isNotNull();
-        assertThat(response.services?.size).isEqualTo(2);
-        assertThat(response.services?.map { service -> service.id }).containsAll(listOf(3, 4));
+        assertThat(response).isNotNull()
+        assertThat(response.services).isNotNull()
+        assertThat(response.services?.size).isEqualTo(2)
+        assertThat(response.services?.map { service -> service.id }).containsAll(listOf(3, 4))
     }
 
 }
diff --git a/...src/test/kotlin/fr/gouv/gmampa/rapportnav/domain/use_cases/mission/PatchEnvMissionTest.kt b/...src/test/kotlin/fr/gouv/gmampa/rapportnav/domain/use_cases/mission/PatchEnvMissionTest.kt
@@ -10,28 +10,28 @@ import org.junit.jupiter.api.Test
 import org.mockito.Mockito
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
-import org.springframework.boot.test.mock.mockito.MockBean
+import org.springframework.test.context.bean.override.mockito.MockitoBean
 
 @SpringBootTest(classes = [PatchEnvMission::class])
 class PatchEnvMissionTest {
     @Autowired
     private lateinit var patchEnvMission: PatchEnvMission
 
-    @MockBean
+    @MockitoBean
     private lateinit var envRepository: IEnvMissionRepository
 
     @Test
     fun `execute update env mission with ObservationByUnit`() {
-        val missionId = 761;
-        val observationsByUnit = "MyBeautifulObservation";
-        val mission = EnvMissionMock.create(observationsByUnit = observationsByUnit);
-        val missionEnvEntity = PatchMissionInput(observationsByUnit = observationsByUnit);
+        val missionId = 761
+        val observationsByUnit = "MyBeautifulObservation"
+        val mission = EnvMissionMock.create(observationsByUnit = observationsByUnit)
+        val missionEnvEntity = PatchMissionInput(observationsByUnit = observationsByUnit)
 
-        Mockito.`when`(envRepository.patchMission(missionId, missionEnvEntity)).thenReturn(mission);
+        Mockito.`when`(envRepository.patchMission(missionId, missionEnvEntity)).thenReturn(mission)
         val response =
-            patchEnvMission.execute(MissionEnvInput(missionId = missionId, observationsByUnit = observationsByUnit));
-        assertThat(response).isNotNull();
-        assertThat(response?.observationsByUnit).isEqualTo(observationsByUnit);
+            patchEnvMission.execute(MissionEnvInput(missionId = missionId, observationsByUnit = observationsByUnit))
+        assertThat(response).isNotNull()
+        assertThat(response?.observationsByUnit).isEqualTo(observationsByUnit)
 
     }
 }