Fix tests (mock) for SupervisionControllerTest.java

Signed-off-by: Slimane AMAR <[email protected]>

src/test/java/org/gridsuite/study/server/SupervisionControllerTest.java

@@ -69,7 +69,7 @@ class SupervisionControllerTest {
     private static final UUID STUDY_UUID = UUID.randomUUID();
     private static final UUID NODE_UUID = UUID.randomUUID();
 
-    @MockBean
+    @Autowired
     private NetworkModificationTreeService networkModificationTreeService;
 
     @MockBean
@@ -87,9 +87,6 @@ class SupervisionControllerTest {
     @SpyBean
     private RootNetworkService rootNetworkService;
 
-    @Autowired
-    private StudyService studyService;
-
     @Autowired
     private RestClient restClient;
 
@@ -125,15 +122,13 @@ void setup() {
         Network network = new XMLImporter().importData(dataSource, new NetworkFactoryImpl(), null);
         network.getIdentifiables().forEach(idable -> equipmentInfosService.addEquipmentInfos(toEquipmentInfos(idable)));
 
-        //TODO: removing it still works, check if it's normal
-//        when(networkModificationTreeService.getVariantId(NODE_UUID, any())).thenReturn(VariantManagerConstants.INITIAL_VARIANT_ID);
-        when(networkModificationTreeService.getStudyTree(STUDY_UUID, null)).thenReturn(RootNode.builder().studyId(STUDY_UUID).id(NODE_UUID).build());
         when(networkConversionService.checkStudyIndexationStatus(NETWORK_UUID)).thenReturn(true);
     }
 
     @AfterEach
     void tearDown() {
         equipmentInfosService.deleteAllByNetworkUuid(NETWORK_UUID);
+        studyRepository.findAll().forEach(s -> networkModificationTreeService.doDeleteTree(s.getId()));
         studyRepository.deleteAll();
     }