Skip to content

Commit 1cbef3c

Browse files
Tristan-WorkGHTristan-WorkGH
committed
Remove overused annotations in tests
1 parent e201a15 commit 1cbef3c

File tree

49 files changed

+253
-293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+253
-293
lines changed

‎src/test/java/org/gridsuite/modification/server/Impacts/ElementImpactTest.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,23 @@
1414
import org.gridsuite.modification.server.impacts.SimpleElementImpact;
1515
import org.gridsuite.modification.server.utils.TestUtils;
1616
import org.junit.Test;
17+
import org.junit.jupiter.api.Tag;
1718

1819
import java.io.IOException;
1920
import java.util.Collection;
2021
import java.util.HashSet;
2122
import java.util.List;
2223
import java.util.TreeSet;
2324

24-
import static org.gridsuite.modification.server.Impacts.TestImpactUtils.*;
25+
import static org.gridsuite.modification.server.Impacts.TestImpactUtils.createCreationImpactType;
26+
import static org.gridsuite.modification.server.Impacts.TestImpactUtils.createDeletionImpactType;
27+
import static org.gridsuite.modification.server.Impacts.TestImpactUtils.createModificationImpactType;
2528
import static org.junit.Assert.assertEquals;
2629

2730
/**
2831
* @author Slimane Amar <slimane.amar at rte-france.com>
2932
*/
33+
@Tag("UnitTest")
3034
public class ElementImpactTest {
3135
private ObjectMapper mapper = new ObjectMapper();
3236

‎src/test/java/org/gridsuite/modification/server/Impacts/TestImpactUtils.java‎

Lines changed: 27 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,22 @@
66
*/
77
package org.gridsuite.modification.server.Impacts;
88

9+
import com.fasterxml.jackson.core.JsonProcessingException;
910
import com.fasterxml.jackson.core.type.TypeReference;
1011
import com.fasterxml.jackson.databind.ObjectMapper;
1112
import com.powsybl.iidm.network.IdentifiableType;
12-
import lombok.SneakyThrows;
1313
import org.apache.commons.lang3.tuple.Pair;
1414
import org.gridsuite.modification.server.dto.NetworkModificationResult;
1515
import org.gridsuite.modification.server.dto.NetworkModificationResult.ApplicationStatus;
1616
import org.gridsuite.modification.server.impacts.SimpleElementImpact;
1717
import org.gridsuite.modification.server.impacts.SimpleElementImpact.SimpleImpactType;
1818

19-
import java.util.*;
19+
import java.util.ArrayList;
20+
import java.util.LinkedList;
21+
import java.util.List;
22+
import java.util.Optional;
23+
import java.util.Set;
24+
import java.util.TreeSet;
2025
import java.util.stream.Collectors;
2126

2227
import static org.gridsuite.modification.server.utils.Assertions.*;
@@ -27,14 +32,11 @@
2732
* @author Slimane Amar <slimane.amar at rte-france.com>
2833
*/
2934
public final class TestImpactUtils {
30-
3135
private TestImpactUtils() {
3236
}
3337

34-
@SneakyThrows
35-
public static void testEmptyImpacts(ObjectMapper mapper, String resultAsString) {
36-
Optional<NetworkModificationResult> networkModificationResult = mapper.readValue(resultAsString, new TypeReference<>() {
37-
});
38+
public static void testEmptyImpacts(ObjectMapper mapper, String resultAsString) throws JsonProcessingException {
39+
Optional<NetworkModificationResult> networkModificationResult = mapper.readValue(resultAsString, new TypeReference<>() { });
3840
assertTrue(networkModificationResult.isPresent());
3941
testEmptyImpacts(mapper, networkModificationResult.get());
4042
}
@@ -55,21 +57,17 @@ private static void testEmptyImpacts(ObjectMapper mapper, ApplicationStatus appl
5557
assertThat(networkModificationResult).usingRecursiveComparison().isEqualTo(resultExpected);
5658
}
5759

58-
@SneakyThrows
59-
public static void testElementImpacts(ObjectMapper mapper, String resultAsString, int nbImpacts, Set<String> substationIds) {
60-
Optional<NetworkModificationResult> networkModificationResult = mapper.readValue(resultAsString, new TypeReference<>() {
61-
});
60+
public static void testElementImpacts(ObjectMapper mapper, String resultAsString, int nbImpacts, Set<String> substationIds) throws JsonProcessingException {
61+
Optional<NetworkModificationResult> networkModificationResult = mapper.readValue(resultAsString, new TypeReference<>() { });
6262
assertTrue(networkModificationResult.isPresent());
6363

6464
assertEquals(ApplicationStatus.ALL_OK, networkModificationResult.get().getApplicationStatus());
6565
assertEquals(new TreeSet<>(substationIds), networkModificationResult.get().getImpactedSubstationsIds());
6666
assertEquals(nbImpacts, networkModificationResult.get().getNetworkImpacts().size());
6767
}
6868

69-
@SneakyThrows
70-
public static void testElementImpacts(ObjectMapper mapper, String resultAsString, List<SimpleElementImpact> elementImpactsExpected) {
71-
Optional<NetworkModificationResult> networkModificationResult = mapper.readValue(resultAsString, new TypeReference<>() {
72-
});
69+
public static void testElementImpacts(ObjectMapper mapper, String resultAsString, List<SimpleElementImpact> elementImpactsExpected) throws JsonProcessingException {
70+
Optional<NetworkModificationResult> networkModificationResult = mapper.readValue(resultAsString, new TypeReference<>() { });
7371
assertTrue(networkModificationResult.isPresent());
7472
NetworkModificationResult resultExpected = NetworkModificationResult.builder()
7573
.applicationStatus(ApplicationStatus.ALL_OK)
@@ -80,22 +78,20 @@ public static void testElementImpacts(ObjectMapper mapper, String resultAsString
8078
.isEqualTo(resultExpected);
8179
}
8280

83-
public static void testElementCreationImpact(ObjectMapper mapper, String resultAsString, IdentifiableType elementType, String elementId, Set<String> substationIds) {
81+
public static void testElementCreationImpact(ObjectMapper mapper, String resultAsString, IdentifiableType elementType, String elementId, Set<String> substationIds) throws JsonProcessingException {
8482
testElementImpact(SimpleImpactType.CREATION, mapper, resultAsString, elementType, elementId, substationIds);
8583
}
8684

87-
public static void testElementModificationImpact(ObjectMapper mapper, String resultAsString, IdentifiableType elementType, String elementId, Set<String> substationIds) {
85+
public static void testElementModificationImpact(ObjectMapper mapper, String resultAsString, IdentifiableType elementType, String elementId, Set<String> substationIds) throws JsonProcessingException {
8886
testElementImpact(SimpleImpactType.MODIFICATION, mapper, resultAsString, elementType, elementId, substationIds);
8987
}
9088

91-
public static void testElementDeletionImpact(ObjectMapper mapper, String resultAsString, IdentifiableType elementType, String elementId, Set<String> substationIds) {
89+
public static void testElementDeletionImpact(ObjectMapper mapper, String resultAsString, IdentifiableType elementType, String elementId, Set<String> substationIds) throws JsonProcessingException {
9290
testElementImpact(SimpleImpactType.DELETION, mapper, resultAsString, elementType, elementId, substationIds);
9391
}
9492

95-
@SneakyThrows
96-
public static void testElementImpact(SimpleImpactType impactType, ObjectMapper mapper, String resultAsString, IdentifiableType elementType, String elementId, Set<String> substationIds) {
97-
Optional<NetworkModificationResult> networkModificationResult = mapper.readValue(resultAsString, new TypeReference<>() {
98-
});
93+
public static void testElementImpact(SimpleImpactType impactType, ObjectMapper mapper, String resultAsString, IdentifiableType elementType, String elementId, Set<String> substationIds) throws JsonProcessingException {
94+
Optional<NetworkModificationResult> networkModificationResult = mapper.readValue(resultAsString, new TypeReference<>() { });
9995
assertTrue(networkModificationResult.isPresent());
10096
NetworkModificationResult resultExpected = NetworkModificationResult.builder()
10197
.applicationStatus(ApplicationStatus.ALL_OK)
@@ -106,12 +102,10 @@ public static void testElementImpact(SimpleImpactType impactType, ObjectMapper m
106102
.isEqualTo(resultExpected);
107103
}
108104

109-
@SneakyThrows
110105
public static void testConnectableDeletionImpacts(ObjectMapper mapper, String resultAsString,
111106
IdentifiableType connectableType, String connectableId,
112-
String breakerId, String disconnectorId, String substationId) {
113-
Optional<NetworkModificationResult> networkModificationResult = mapper.readValue(resultAsString, new TypeReference<>() {
114-
});
107+
String breakerId, String disconnectorId, String substationId) throws JsonProcessingException {
108+
Optional<NetworkModificationResult> networkModificationResult = mapper.readValue(resultAsString, new TypeReference<>() { });
115109
assertTrue(networkModificationResult.isPresent());
116110
NetworkModificationResult resultExpected = NetworkModificationResult.builder()
117111
.applicationStatus(ApplicationStatus.ALL_OK)
@@ -129,38 +123,33 @@ private static List<SimpleElementImpact> createConnectableDeletionImpacts(Identi
129123
);
130124
}
131125

132-
@SneakyThrows
133126
public static void testBranchCreationImpacts(ObjectMapper mapper, String resultAsString,
134127
IdentifiableType branchType, String branchId,
135128
String breakerId1, String disconnectorId1, String substationId1,
136-
String breakerId2, String disconnectorId2, String substationId2) {
129+
String breakerId2, String disconnectorId2, String substationId2) throws JsonProcessingException {
137130
testBranchImpacts(mapper, SimpleImpactType.CREATION, resultAsString, branchType, branchId, breakerId1, disconnectorId1, substationId1, breakerId2, disconnectorId2, substationId2);
138131
}
139132

140-
@SneakyThrows
141-
public static void testBranchCreationImpacts(ObjectMapper mapper, String resultAsString, IdentifiableType elementType, String elementId, Set<String> substationIds) {
133+
public static void testBranchCreationImpacts(ObjectMapper mapper, String resultAsString, IdentifiableType elementType, String elementId, Set<String> substationIds) throws JsonProcessingException {
142134
List<SimpleElementImpact> impacts = List.of(
143135
createElementImpact(SimpleImpactType.CREATION, elementType, elementId, new TreeSet<>(substationIds)),
144136
createElementImpact(SimpleImpactType.MODIFICATION, elementType, elementId, new TreeSet<>(substationIds)) // case with newCurrentLimits1
145137
);
146138
testElementImpacts(mapper, resultAsString, impacts);
147139
}
148140

149-
@SneakyThrows
150141
public static void testBranchDeletionImpacts(ObjectMapper mapper, String resultAsString,
151142
IdentifiableType branchType, String branchId,
152143
String breakerId1, String disconnectorId1, String substationId1,
153-
String breakerId2, String disconnectorId2, String substationId2) {
144+
String breakerId2, String disconnectorId2, String substationId2) throws JsonProcessingException {
154145
testBranchImpacts(mapper, SimpleImpactType.DELETION, resultAsString, branchType, branchId, breakerId1, disconnectorId1, substationId1, breakerId2, disconnectorId2, substationId2);
155146
}
156147

157-
@SneakyThrows
158148
public static void testBranchImpacts(ObjectMapper mapper, SimpleImpactType impactType, String resultAsString,
159149
IdentifiableType branchType, String branchId,
160150
String breakerId1, String disconnectorId1, String substationId1,
161-
String breakerId2, String disconnectorId2, String substationId2) {
162-
Optional<NetworkModificationResult> networkModificationResult = mapper.readValue(resultAsString, new TypeReference<>() {
163-
});
151+
String breakerId2, String disconnectorId2, String substationId2) throws JsonProcessingException {
152+
Optional<NetworkModificationResult> networkModificationResult = mapper.readValue(resultAsString, new TypeReference<>() { });
164153
assertTrue(networkModificationResult.isPresent());
165154
NetworkModificationResult resultExpected = NetworkModificationResult.builder()
166155
.applicationStatus(ApplicationStatus.ALL_OK)
@@ -190,14 +179,12 @@ private static List<SimpleElementImpact> createBranchImpacts(SimpleImpactType im
190179
return impacts;
191180
}
192181

193-
@SneakyThrows
194182
public static void test3WTDeletionImpacts(ObjectMapper mapper, String resultAsString, String w3tId,
195183
String breakerId1, String disconnectorId1,
196184
String breakerId2, String disconnectorId2,
197185
String breakerId3, String disconnectorId3,
198-
String substationId) {
199-
Optional<NetworkModificationResult> networkModificationResult = mapper.readValue(resultAsString, new TypeReference<>() {
200-
});
186+
String substationId) throws JsonProcessingException {
187+
Optional<NetworkModificationResult> networkModificationResult = mapper.readValue(resultAsString, new TypeReference<>() { });
201188
assertTrue(networkModificationResult.isPresent());
202189
NetworkModificationResult resultExpected = NetworkModificationResult.builder()
203190
.applicationStatus(ApplicationStatus.ALL_OK)

‎src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java‎

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

9+
import com.fasterxml.jackson.core.JsonProcessingException;
910
import com.fasterxml.jackson.core.type.TypeReference;
1011
import com.fasterxml.jackson.databind.ObjectMapper;
1112
import com.fasterxml.jackson.databind.ObjectWriter;
@@ -17,7 +18,6 @@
1718
import com.powsybl.iidm.network.extensions.GeneratorStartup;
1819
import com.powsybl.network.store.client.NetworkStoreService;
1920
import com.powsybl.network.store.iidm.impl.NetworkFactoryImpl;
20-
import lombok.SneakyThrows;
2121
import nl.jqno.equalsverifier.EqualsVerifier;
2222
import org.apache.commons.lang3.tuple.Pair;
2323
import org.gridsuite.modification.server.Impacts.TestImpactUtils;
@@ -41,6 +41,7 @@
4141
import org.junit.After;
4242
import org.junit.Before;
4343
import org.junit.Test;
44+
import org.junit.jupiter.api.Tag;
4445
import org.junit.runner.RunWith;
4546
import org.mockito.stubbing.Answer;
4647
import org.springframework.beans.factory.annotation.Autowired;
@@ -94,6 +95,7 @@
9495
@RunWith(SpringRunner.class)
9596
@AutoConfigureMockMvc
9697
@SpringBootTest
98+
@Tag("IntegrationTest")
9799
public class ModificationControllerTest {
98100

99101
private static final UUID TEST_NETWORK_ID = UUID.fromString("7928181c-7977-4592-ba19-88027e4254e4");
@@ -209,9 +211,8 @@ public void testEquipmentIdNonNull() {
209211
assertEquals(errorMessage, assertThrows(NullPointerException.class, () -> loadCreationInfos.setEquipmentId(null)).getMessage());
210212
}
211213

212-
@SneakyThrows
213214
@Test
214-
public void testNetworkNotFound() {
215+
public void testNetworkNotFound() throws Exception {
215216
mockMvc.perform(post(URI_NETWORK_MODIF_BAD_NETWORK)
216217
.content(objectWriter.writeValueAsString(LoadCreationInfos.builder().equipmentId("id").build()))
217218
.contentType(MediaType.APPLICATION_JSON))
@@ -513,9 +514,8 @@ public void testMoveModificationWithOrigin() throws Exception {
513514
testMoveModification(TEST_GROUP_ID, Boolean.TRUE);
514515
}
515516

516-
@SneakyThrows
517517
@Test
518-
public void createGeneratorWithStartup() {
518+
public void createGeneratorWithStartup() throws Exception {
519519

520520
// create and build generator without startup
521521
GeneratorCreationInfos generatorCreationInfos = ModificationCreation.getCreationGenerator("v2", "idGenerator1", "nameGenerator1", "1B", "v2load", "LOAD", "v1");
@@ -742,8 +742,7 @@ public void testGroupDuplication() throws Exception {
742742
}
743743

744744
@Test
745-
@SneakyThrows
746-
public void testTombstonedEquipmentInfos() {
745+
public void testTombstonedEquipmentInfos() throws Exception {
747746
MvcResult mvcResult;
748747

749748
assertTrue(equipmentInfosRepository.findAllByNetworkUuidAndVariantId(TEST_NETWORK_ID, NetworkCreation.VARIANT_ID).isEmpty());
@@ -925,7 +924,7 @@ public void testTombstonedEquipmentInfos() {
925924

926925
private void testConnectableDeletionImpacts(String resultAsString,
927926
IdentifiableType connectableType, String connectableId,
928-
String breakerId, String disconnectorId, String substationId) {
927+
String breakerId, String disconnectorId, String substationId) throws JsonProcessingException {
929928
TestImpactUtils.testConnectableDeletionImpacts(mapper, resultAsString, connectableType, connectableId, breakerId, disconnectorId, substationId);
930929

931930
// Connectable and switches have been removed from network
@@ -942,7 +941,7 @@ private void testConnectableDeletionImpacts(String resultAsString,
942941
private void testBranchDeletionImpacts(String resultAsString,
943942
IdentifiableType branchType, String branchId,
944943
String breakerId1, String disconnectorId1, String substationId1,
945-
String breakerId2, String disconnectorId2, String substationId2) {
944+
String breakerId2, String disconnectorId2, String substationId2) throws JsonProcessingException {
946945
TestImpactUtils.testBranchDeletionImpacts(mapper, resultAsString, branchType, branchId, breakerId1, disconnectorId1, substationId1, breakerId2, disconnectorId2, substationId2);
947946

948947
// line and switches have been removed from network
@@ -964,7 +963,7 @@ private void test3WTDeletionImpacts(String resultAsString, String w3tId,
964963
String breakerId1, String disconnectorId1,
965964
String breakerId2, String disconnectorId2,
966965
String breakerId3, String disconnectorId3,
967-
String substationId) {
966+
String substationId) throws JsonProcessingException {
968967
TestImpactUtils.test3WTDeletionImpacts(mapper, resultAsString, w3tId, breakerId1, disconnectorId1, breakerId2, disconnectorId2, breakerId3, disconnectorId3, substationId);
969968

970969
// 3 windings transformer and switches have been removed from network
@@ -1000,12 +999,12 @@ private List<SimpleElementImpact> testVoltageLevelDeletionImpacts(String vlId, L
1000999
return createVoltageLevelDeletionImpacts(vlId, busbarSectionsIds, connectablesTypesAndIds, substationId);
10011000
}
10021001

1003-
private void testVoltageLevelDeletionImpacts(String resultAsString, String vlId, List<String> busbarSectionsIds, List<Pair<IdentifiableType, String>> connectablesTypesAndIds, String substationId) {
1002+
private void testVoltageLevelDeletionImpacts(String resultAsString, String vlId, List<String> busbarSectionsIds, List<Pair<IdentifiableType, String>> connectablesTypesAndIds, String substationId) throws JsonProcessingException {
10041003
List<SimpleElementImpact> testElementImpacts = testVoltageLevelDeletionImpacts(vlId, busbarSectionsIds, connectablesTypesAndIds, substationId);
10051004
TestImpactUtils.testElementImpacts(mapper, resultAsString, testElementImpacts);
10061005
}
10071006

1008-
private void testSubstationDeletionImpacts(String resultAsString, String subStationId, List<SimpleElementImpact> vlsDeletionImpacts) {
1007+
private void testSubstationDeletionImpacts(String resultAsString, String subStationId, List<SimpleElementImpact> vlsDeletionImpacts) throws JsonProcessingException {
10091008
List<SimpleElementImpact> impacts = new ArrayList<>(List.of(createDeletionImpactType(IdentifiableType.SUBSTATION, subStationId, Set.of(subStationId))));
10101009
impacts.addAll(vlsDeletionImpacts);
10111010
TestImpactUtils.testElementImpacts(mapper, resultAsString, impacts);

0 commit comments

Comments
 (0)