Skip to content

Commit 44f827a

Browse files
clean SpringBootTest
1 parent aff60c2 commit 44f827a

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

src/test/java/org/gridsuite/voltageinit/server/VoltageInitControllerTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@
5858
import org.springframework.cloud.stream.binder.test.TestChannelBinderConfiguration;
5959
import org.springframework.http.MediaType;
6060
import org.springframework.messaging.Message;
61+
import org.springframework.test.annotation.DirtiesContext;
62+
import org.springframework.test.annotation.DirtiesContext.ClassMode;
6163
import org.springframework.test.context.ContextConfiguration;
6264
import org.springframework.test.context.ContextHierarchy;
6365
import org.springframework.test.web.servlet.MockMvc;
@@ -86,8 +88,9 @@
8688
* @author Etienne Homer <etienne.homer at rte-france.com>
8789
*/
8890
@ExtendWith({ MockitoExtension.class })
89-
@AutoConfigureMockMvc
9091
@SpringBootTest
92+
@AutoConfigureMockMvc
93+
@DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
9194
@ContextHierarchy({@ContextConfiguration(classes = {VoltageInitApplication.class, TestChannelBinderConfiguration.class})})
9295
class VoltageInitControllerTest {
9396
private static final UUID NETWORK_UUID = UUID.fromString("7928181c-7977-4592-ba19-88027e4254e4");
@@ -253,8 +256,6 @@ public MockResponse dispatch(RecordedRequest request) {
253256

254257
@AfterEach
255258
public void tearDown() throws Exception {
256-
mockMvc.perform(delete("/" + VERSION + "/results"))
257-
.andExpect(status().isOk());
258259
server.shutdown();
259260
}
260261

src/test/java/org/gridsuite/voltageinit/server/VoltageInitParametersTest.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,15 @@
3434
import org.gridsuite.voltageinit.server.service.parameters.FilterService;
3535
import org.gridsuite.voltageinit.server.service.parameters.VoltageInitParametersService;
3636
import org.gridsuite.voltageinit.server.util.VoltageLimitParameterType;
37-
import org.junit.jupiter.api.AfterEach;
3837
import org.junit.jupiter.api.BeforeEach;
3938
import org.junit.jupiter.api.Test;
4039
import org.springframework.beans.factory.annotation.Autowired;
4140
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
4241
import org.springframework.boot.test.context.SpringBootTest;
4342
import org.springframework.boot.test.mock.mockito.MockBean;
4443
import org.springframework.http.MediaType;
44+
import org.springframework.test.annotation.DirtiesContext;
45+
import org.springframework.test.annotation.DirtiesContext.ClassMode;
4546
import org.springframework.test.web.servlet.MockMvc;
4647
import org.springframework.test.web.servlet.MvcResult;
4748
import org.springframework.transaction.annotation.Transactional;
@@ -58,6 +59,7 @@
5859
* @author Ayoub LABIDI <ayoub.labidi at rte-france.com>
5960
*/
6061
@SpringBootTest
62+
@DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
6163
@AutoConfigureMockMvc
6264
@Transactional
6365
class VoltageInitParametersTest {
@@ -117,13 +119,6 @@ public void setup() {
117119
equipmentsList2.add(new FilterEquipments(FILTER_UUID_2, FILTER_2, identifiableAttributes2, List.of()));
118120
given(filterService.exportFilters(List.of(FILTER_UUID_1), NETWORK_UUID, VARIANT_ID_1)).willReturn(equipmentsList1);
119121
given(filterService.exportFilters(List.of(FILTER_UUID_2), NETWORK_UUID, VARIANT_ID_1)).willReturn(equipmentsList2);
120-
121-
parametersRepository.deleteAll();
122-
}
123-
124-
@AfterEach
125-
public void tearOff() {
126-
parametersRepository.deleteAll();
127122
}
128123

129124
@Test

0 commit comments

Comments
 (0)