Skip to content

Commit 6319c1b

Browse files
AAJELLALAAJELLAL
committed
Clean upd tests.
Signed-off-by: AAJELLAL <[email protected]>
1 parent 7afb451 commit 6319c1b

File tree

3 files changed

+0
-107
lines changed

3 files changed

+0
-107
lines changed

‎src/test/java/org/gridsuite/securityanalysis/server/FindContingenciesTest.java‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,12 @@
66
*/
77
package org.gridsuite.securityanalysis.server;
88

9-
import com.github.tomakehurst.wiremock.WireMockServer;
10-
import com.powsybl.commons.report.ReportNode;
119
import com.powsybl.iidm.network.Network;
1210
import com.powsybl.iidm.network.ThreeSides;
1311
import com.powsybl.iidm.network.VariantManagerConstants;
1412
import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory;
15-
import com.powsybl.network.store.client.NetworkStoreService;
16-
import com.powsybl.network.store.client.PreloadingStrategy;
1713
import com.powsybl.network.store.iidm.impl.NetworkFactoryImpl;
1814
import com.powsybl.security.LimitViolationType;
19-
import com.powsybl.ws.commons.computation.service.ReportService;
20-
import com.powsybl.ws.commons.computation.service.UuidGeneratorService;
2115
import org.gridsuite.securityanalysis.server.dto.ContingencyResultDTO;
2216
import org.gridsuite.securityanalysis.server.dto.ResourceFilterDTO;
2317
import org.gridsuite.securityanalysis.server.dto.SecurityAnalysisStatus;
@@ -36,10 +30,8 @@
3630
import org.junit.jupiter.params.ParameterizedTest;
3731
import org.junit.jupiter.params.provider.Arguments;
3832
import org.junit.jupiter.params.provider.MethodSource;
39-
import org.mockito.MockitoAnnotations;
4033
import org.springframework.beans.factory.annotation.Autowired;
4134
import org.springframework.boot.test.context.SpringBootTest;
42-
import org.springframework.boot.test.mock.mockito.MockBean;
4335
import org.springframework.data.domain.Page;
4436
import org.springframework.data.domain.PageRequest;
4537
import org.springframework.data.domain.Pageable;
@@ -50,27 +42,19 @@
5042
import java.util.UUID;
5143
import java.util.stream.Stream;
5244

53-
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
5445
import static com.vladmihalcea.sql.SQLStatementCountValidator.assertSelectCount;
5546
import static com.vladmihalcea.sql.SQLStatementCountValidator.reset;
5647
import static org.assertj.core.api.Assertions.assertThat;
5748
import static org.gridsuite.securityanalysis.server.SecurityAnalysisProviderMock.*;
5849
import static org.junit.jupiter.api.Assertions.assertEquals;
5950
import static org.junit.jupiter.api.Assertions.assertThrows;
60-
import static org.mockito.ArgumentMatchers.any;
61-
import static org.mockito.BDDMockito.given;
62-
import static org.mockito.Mockito.doNothing;
6351

6452
/**
6553
* @author Kevin Le Saulnier <kevin.lesaulnier at rte-france.com>
6654
*/
6755
@SpringBootTest // would be better with @DataJpaTest but does not work here
6856
@TestInstance(TestInstance.Lifecycle.PER_CLASS) // improve tests speed as we only read DB
6957
class FindContingenciesTest {
70-
71-
private static final UUID NETWORK_UUID = UUID.fromString("7928181c-7977-4592-ba19-88027e4254e4");
72-
private static final UUID RESULT_UUID = UUID.fromString("0c8de370-3e6c-4d72-b292-d355a97e0d5d");
73-
7458
@Autowired
7559
private SecurityAnalysisResultRepository securityAnalysisResultRepository;
7660

@@ -79,33 +63,13 @@ class FindContingenciesTest {
7963
@Autowired
8064
private SecurityAnalysisResultService securityAnalysisResultService;
8165

82-
@MockBean
83-
private NetworkStoreService networkStoreService;
84-
@MockBean
85-
private UuidGeneratorService uuidGeneratorService;
86-
87-
@MockBean
88-
private ReportService reportService;
89-
9066
@BeforeAll
9167
void setUp() {
92-
WireMockServer wireMockServer = new WireMockServer(wireMockConfig().dynamicPort());
93-
wireMockServer.start();
94-
MockitoAnnotations.initMocks(this);
95-
9668
// network store service mocking
9769
Network network = EurostagTutorialExample1Factory.create(new NetworkFactoryImpl());
9870
network.getVariantManager().cloneVariant(VariantManagerConstants.INITIAL_VARIANT_ID, VARIANT_1_ID);
9971
network.getVariantManager().cloneVariant(VariantManagerConstants.INITIAL_VARIANT_ID, VARIANT_2_ID);
10072
network.getVariantManager().cloneVariant(VariantManagerConstants.INITIAL_VARIANT_ID, VARIANT_3_ID);
101-
102-
given(networkStoreService.getNetwork(NETWORK_UUID, PreloadingStrategy.ALL_COLLECTIONS_NEEDED_FOR_BUS_VIEW)).willReturn(network);
103-
104-
// UUID service mocking to always generate the same result UUID
105-
given(uuidGeneratorService.generate()).willReturn(RESULT_UUID);
106-
107-
doNothing().when(reportService).sendReport(any(UUID.class), any(ReportNode.class));
108-
10973
resultEntity = SecurityAnalysisResultEntity.toEntity(network, UUID.randomUUID(), RESULT, SecurityAnalysisStatus.CONVERGED);
11074
securityAnalysisResultRepository.save(resultEntity);
11175
}

‎src/test/java/org/gridsuite/securityanalysis/server/FindPreContingencyLimitViolationTest.java‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,11 @@
66
*/
77
package org.gridsuite.securityanalysis.server;
88

9-
import com.github.tomakehurst.wiremock.WireMockServer;
10-
import com.powsybl.commons.report.ReportNode;
119
import com.powsybl.iidm.network.Network;
1210
import com.powsybl.iidm.network.ThreeSides;
1311
import com.powsybl.iidm.network.VariantManagerConstants;
1412
import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory;
15-
import com.powsybl.network.store.client.NetworkStoreService;
16-
import com.powsybl.network.store.client.PreloadingStrategy;
1713
import com.powsybl.network.store.iidm.impl.NetworkFactoryImpl;
18-
import com.powsybl.ws.commons.computation.service.ReportService;
19-
import com.powsybl.ws.commons.computation.service.UuidGeneratorService;
2014
import org.gridsuite.securityanalysis.server.dto.*;
2115
import org.gridsuite.securityanalysis.server.entities.*;
2216
import org.gridsuite.securityanalysis.server.repositories.SecurityAnalysisResultRepository;
@@ -28,36 +22,25 @@
2822
import org.junit.jupiter.params.ParameterizedTest;
2923
import org.junit.jupiter.params.provider.Arguments;
3024
import org.junit.jupiter.params.provider.MethodSource;
31-
import org.mockito.MockitoAnnotations;
3225
import org.springframework.beans.factory.annotation.Autowired;
3326
import org.springframework.boot.test.context.SpringBootTest;
34-
import org.springframework.boot.test.mock.mockito.MockBean;
3527
import org.springframework.data.domain.Sort;
3628

3729
import java.util.Comparator;
3830
import java.util.List;
3931
import java.util.UUID;
4032
import java.util.stream.Stream;
4133

42-
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
4334
import static com.vladmihalcea.sql.SQLStatementCountValidator.assertSelectCount;
4435
import static com.vladmihalcea.sql.SQLStatementCountValidator.reset;
4536
import static org.assertj.core.api.Assertions.assertThat;
4637
import static org.gridsuite.securityanalysis.server.SecurityAnalysisProviderMock.*;
47-
import static org.mockito.ArgumentMatchers.any;
48-
import static org.mockito.BDDMockito.given;
49-
import static org.mockito.Mockito.doNothing;
50-
5138
/**
5239
* @author Anis Touri <anis.touri at rte-france.com>
5340
*/
5441
@SpringBootTest // would be better with @DataJpaTest but does not work here
5542
@TestInstance(TestInstance.Lifecycle.PER_CLASS) // improve tests speed as we only read DB
5643
class FindPreContingencyLimitViolationTest {
57-
58-
private static final UUID NETWORK_UUID = UUID.fromString("7928181c-7977-4592-ba19-88027e4254e4");
59-
private static final UUID RESULT_UUID = UUID.fromString("0c8de370-3e6c-4d72-b292-d355a97e0d5d");
60-
6144
@Autowired
6245
private SecurityAnalysisResultRepository securityAnalysisResultRepository;
6346

@@ -66,32 +49,14 @@ class FindPreContingencyLimitViolationTest {
6649
@Autowired
6750
private SecurityAnalysisResultService securityAnalysisResultService;
6851

69-
@MockBean
70-
private NetworkStoreService networkStoreService;
71-
@MockBean
72-
private UuidGeneratorService uuidGeneratorService;
73-
@MockBean
74-
private ReportService reportService;
75-
7652
@BeforeAll
7753
void setUp() {
78-
WireMockServer wireMockServer = new WireMockServer(wireMockConfig().dynamicPort());
79-
wireMockServer.start();
80-
MockitoAnnotations.initMocks(this);
81-
8254
// network store service mocking
8355
Network network = EurostagTutorialExample1Factory.create(new NetworkFactoryImpl());
8456
network.getVariantManager().cloneVariant(VariantManagerConstants.INITIAL_VARIANT_ID, VARIANT_1_ID);
8557
network.getVariantManager().cloneVariant(VariantManagerConstants.INITIAL_VARIANT_ID, VARIANT_2_ID);
8658
network.getVariantManager().cloneVariant(VariantManagerConstants.INITIAL_VARIANT_ID, VARIANT_3_ID);
8759

88-
given(networkStoreService.getNetwork(NETWORK_UUID, PreloadingStrategy.ALL_COLLECTIONS_NEEDED_FOR_BUS_VIEW)).willReturn(network);
89-
90-
// UUID service mocking to always generate the same result UUID
91-
given(uuidGeneratorService.generate()).willReturn(RESULT_UUID);
92-
93-
doNothing().when(reportService).sendReport(any(UUID.class), any(ReportNode.class));
94-
9560
resultEntity = SecurityAnalysisResultEntity.toEntity(network, UUID.randomUUID(), PRECONTINGENCY_RESULT, SecurityAnalysisStatus.CONVERGED);
9661
securityAnalysisResultRepository.save(resultEntity);
9762
}

‎src/test/java/org/gridsuite/securityanalysis/server/FindSubjectLimitViolationsTest.java‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,12 @@
66
*/
77
package org.gridsuite.securityanalysis.server;
88

9-
import com.github.tomakehurst.wiremock.WireMockServer;
10-
import com.powsybl.commons.report.ReportNode;
119
import com.powsybl.iidm.network.Network;
1210
import com.powsybl.iidm.network.ThreeSides;
1311
import com.powsybl.iidm.network.VariantManagerConstants;
1412
import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory;
15-
import com.powsybl.network.store.client.NetworkStoreService;
16-
import com.powsybl.network.store.client.PreloadingStrategy;
1713
import com.powsybl.network.store.iidm.impl.NetworkFactoryImpl;
1814
import com.powsybl.security.LimitViolationType;
19-
import com.powsybl.ws.commons.computation.service.ReportService;
20-
import com.powsybl.ws.commons.computation.service.UuidGeneratorService;
2115
import org.gridsuite.securityanalysis.server.dto.ContingencyLimitViolationDTO;
2216
import org.gridsuite.securityanalysis.server.dto.ResourceFilterDTO;
2317
import org.gridsuite.securityanalysis.server.dto.SecurityAnalysisStatus;
@@ -33,10 +27,8 @@
3327
import org.junit.jupiter.params.ParameterizedTest;
3428
import org.junit.jupiter.params.provider.Arguments;
3529
import org.junit.jupiter.params.provider.MethodSource;
36-
import org.mockito.MockitoAnnotations;
3730
import org.springframework.beans.factory.annotation.Autowired;
3831
import org.springframework.boot.test.context.SpringBootTest;
39-
import org.springframework.boot.test.mock.mockito.MockBean;
4032
import org.springframework.data.domain.Page;
4133
import org.springframework.data.domain.PageRequest;
4234
import org.springframework.data.domain.Pageable;
@@ -47,27 +39,19 @@
4739
import java.util.UUID;
4840
import java.util.stream.Stream;
4941

50-
import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
5142
import static com.vladmihalcea.sql.SQLStatementCountValidator.assertSelectCount;
5243
import static com.vladmihalcea.sql.SQLStatementCountValidator.reset;
5344
import static org.assertj.core.api.Assertions.assertThat;
5445
import static org.gridsuite.securityanalysis.server.SecurityAnalysisProviderMock.*;
5546
import static org.junit.jupiter.api.Assertions.assertEquals;
5647
import static org.junit.jupiter.api.Assertions.assertThrows;
57-
import static org.mockito.ArgumentMatchers.any;
58-
import static org.mockito.BDDMockito.given;
59-
import static org.mockito.Mockito.doNothing;
6048

6149
/**
6250
* @author Kevin Le Saulnier <kevin.lesaulnier at rte-france.com>
6351
*/
6452
@SpringBootTest // would be better with @DataJpaTest but does not work here
6553
@TestInstance(TestInstance.Lifecycle.PER_CLASS) // improve tests speed as we only read DB
6654
class FindSubjectLimitViolationsTest {
67-
68-
private static final UUID NETWORK_UUID = UUID.fromString("7928181c-7977-4592-ba19-88027e4254e4");
69-
private static final UUID RESULT_UUID = UUID.fromString("0c8de370-3e6c-4d72-b292-d355a97e0d5d");
70-
7155
@Autowired
7256
private SecurityAnalysisResultRepository securityAnalysisResultRepository;
7357

@@ -76,33 +60,13 @@ class FindSubjectLimitViolationsTest {
7660
@Autowired
7761
private SecurityAnalysisResultService securityAnalysisResultService;
7862

79-
@MockBean
80-
private NetworkStoreService networkStoreService;
81-
@MockBean
82-
83-
private UuidGeneratorService uuidGeneratorService;
84-
@MockBean
85-
private ReportService reportService;
86-
8763
@BeforeAll
8864
void setUp() {
89-
WireMockServer wireMockServer = new WireMockServer(wireMockConfig().dynamicPort());
90-
wireMockServer.start();
91-
MockitoAnnotations.initMocks(this);
92-
9365
// network store service mocking
9466
Network network = EurostagTutorialExample1Factory.create(new NetworkFactoryImpl());
9567
network.getVariantManager().cloneVariant(VariantManagerConstants.INITIAL_VARIANT_ID, VARIANT_1_ID);
9668
network.getVariantManager().cloneVariant(VariantManagerConstants.INITIAL_VARIANT_ID, VARIANT_2_ID);
9769
network.getVariantManager().cloneVariant(VariantManagerConstants.INITIAL_VARIANT_ID, VARIANT_3_ID);
98-
99-
given(networkStoreService.getNetwork(NETWORK_UUID, PreloadingStrategy.ALL_COLLECTIONS_NEEDED_FOR_BUS_VIEW)).willReturn(network);
100-
101-
// UUID service mocking to always generate the same result UUID
102-
given(uuidGeneratorService.generate()).willReturn(RESULT_UUID);
103-
104-
doNothing().when(reportService).sendReport(any(UUID.class), any(ReportNode.class));
105-
10670
resultEntity = SecurityAnalysisResultEntity.toEntity(network, UUID.randomUUID(), RESULT, SecurityAnalysisStatus.CONVERGED);
10771
securityAnalysisResultRepository.save(resultEntity);
10872
}

0 commit comments

Comments
 (0)