Skip to content

Commit db5669b

Browse files
author
David SARTORI
committed
Refacto
Signed-off-by: David SARTORI <[email protected]>
1 parent e509910 commit db5669b

File tree

1 file changed

+14
-19
lines changed

1 file changed

+14
-19
lines changed

‎src/test/java/org/gridsuite/shortcircuit/server/ShortCircuitAnalysisControllerTest.java‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ private static final class ShortCircuitAnalysisResultMock {
135135
static final ShortCircuitAnalysisResult RESULT_BASIC = new ShortCircuitAnalysisResult(List.of(FAULT_RESULT_BASIC_1, FAULT_RESULT_BASIC_2, FAULT_RESULT_BASIC_3));
136136
}
137137

138-
private static class ShortCircuitAnalysisProviderMock implements ShortCircuitAnalysisProvider {
138+
private static final class ShortCircuitAnalysisProviderMock implements ShortCircuitAnalysisProvider {
139139
@Override
140140
public String getName() {
141141
return "ShortCircuitAnalysisMock";
@@ -180,21 +180,16 @@ public String getVersion() {
180180

181181
private Network nodeBreakerNetwork;
182182

183-
private static void assertResultsEquals(ShortCircuitAnalysisResult result, org.gridsuite.shortcircuit.server.dto.ShortCircuitAnalysisResult resultDto) {
184-
assertEquals(result.getFaultResults().size(), resultDto.getFaults().size());
185-
List<FaultResult> orderedFaultResults = result.getFaultResults().stream().sorted(Comparator.comparing(fr -> fr.getFault().getId())).collect(Collectors.toList());
186-
List<org.gridsuite.shortcircuit.server.dto.FaultResult> orderedFaultResultsDto = resultDto.getFaults().stream().sorted(Comparator.comparing(fr -> fr.getFault().getId())).collect(Collectors.toList());
187-
assertFaultResultsEquals(orderedFaultResults, orderedFaultResultsDto);
188-
}
189-
190-
private static void assertPagedFaultResultsEquals(ShortCircuitAnalysisResult result, List<org.gridsuite.shortcircuit.server.dto.FaultResult> faultResults) {
183+
private static void assertFaultResultsEquals(ShortCircuitAnalysisResult result, List<org.gridsuite.shortcircuit.server.dto.FaultResult> faultResults) {
191184
assertEquals(result.getFaultResults().size(), faultResults.size());
185+
186+
// When we do not provide sort parameter to the request, order is not guaranteed, so we sort results here to not test their order
192187
List<FaultResult> orderedFaultResults = result.getFaultResults().stream().sorted(Comparator.comparing(fr -> fr.getFault().getId())).toList();
193188
List<org.gridsuite.shortcircuit.server.dto.FaultResult> orderedFaultResultsDto = faultResults.stream().sorted(Comparator.comparing(fr -> fr.getFault().getId())).toList();
194189
assertFaultResultsEquals(orderedFaultResults, orderedFaultResultsDto);
195190
}
196191

197-
private static void assertPagedFaultResultsEqualsSorted(ShortCircuitAnalysisResult result, List<org.gridsuite.shortcircuit.server.dto.FaultResult> faultResults) {
192+
private static void assertSortedFaultResultsEquals(ShortCircuitAnalysisResult result, List<org.gridsuite.shortcircuit.server.dto.FaultResult> faultResults) {
198193
assertEquals(result.getFaultResults().size(), faultResults.size());
199194
assertFaultResultsEquals(result.getFaultResults(), faultResults);
200195
}
@@ -322,7 +317,7 @@ public void runTest() throws Exception {
322317
.andExpect(content().contentType(MediaType.APPLICATION_JSON))
323318
.andReturn();
324319
org.gridsuite.shortcircuit.server.dto.ShortCircuitAnalysisResult resultDto = mapper.readValue(result.getResponse().getContentAsString(), org.gridsuite.shortcircuit.server.dto.ShortCircuitAnalysisResult.class);
325-
assertResultsEquals(ShortCircuitAnalysisResultMock.RESULT_WITH_LIMIT_VIOLATIONS, resultDto);
320+
assertFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_WITH_LIMIT_VIOLATIONS, resultDto.getFaults());
326321

327322
// BASIC mode
328323
result = mockMvc.perform(get(
@@ -332,7 +327,7 @@ public void runTest() throws Exception {
332327
.andExpect(content().contentType(MediaType.APPLICATION_JSON))
333328
.andReturn();
334329
org.gridsuite.shortcircuit.server.dto.ShortCircuitAnalysisResult resultDtoBasic = mapper.readValue(result.getResponse().getContentAsString(), org.gridsuite.shortcircuit.server.dto.ShortCircuitAnalysisResult.class);
335-
assertResultsEquals(ShortCircuitAnalysisResultMock.RESULT_BASIC, resultDtoBasic);
330+
assertFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_BASIC, resultDtoBasic.getFaults());
336331

337332
// FULL mode
338333
result = mockMvc.perform(get(
@@ -342,7 +337,7 @@ public void runTest() throws Exception {
342337
.andExpect(content().contentType(MediaType.APPLICATION_JSON))
343338
.andReturn();
344339
org.gridsuite.shortcircuit.server.dto.ShortCircuitAnalysisResult resultDtoFull = mapper.readValue(result.getResponse().getContentAsString(), org.gridsuite.shortcircuit.server.dto.ShortCircuitAnalysisResult.class);
345-
assertResultsEquals(ShortCircuitAnalysisResultMock.RESULT_MAGNITUDE_FULL, resultDtoFull);
340+
assertFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_MAGNITUDE_FULL, resultDtoFull.getFaults());
346341

347342
result = mockMvc.perform(get(
348343
"/" + VERSION + "/results/{resultUuid}/fault_results/paged", RESULT_UUID)
@@ -358,7 +353,7 @@ public void runTest() throws Exception {
358353
JsonNode faultResultsPageNode = mapper.readTree(result.getResponse().getContentAsString());
359354
ObjectReader faultResultsReader = mapper.readerFor(new TypeReference<List<org.gridsuite.shortcircuit.server.dto.FaultResult>>() { });
360355
List<org.gridsuite.shortcircuit.server.dto.FaultResult> faultResultsPageDto0 = faultResultsReader.readValue(faultResultsPageNode.get("content"));
361-
assertPagedFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_WITH_LIMIT_VIOLATIONS, faultResultsPageDto0);
356+
assertFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_WITH_LIMIT_VIOLATIONS, faultResultsPageDto0);
362357

363358
result = mockMvc.perform(get(
364359
"/" + VERSION + "/results/{resultUuid}/fault_results/paged", RESULT_UUID)
@@ -371,7 +366,7 @@ public void runTest() throws Exception {
371366
.andReturn();
372367
JsonNode faultResultsPageNode0 = mapper.readTree(result.getResponse().getContentAsString());
373368
List<org.gridsuite.shortcircuit.server.dto.FaultResult> faultResultsPageDto0Full = faultResultsReader.readValue(faultResultsPageNode0.get("content"));
374-
assertPagedFaultResultsEqualsSorted(ShortCircuitAnalysisResultMock.RESULT_SORTED_PAGE_0, faultResultsPageDto0Full);
369+
assertSortedFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_SORTED_PAGE_0, faultResultsPageDto0Full);
375370

376371
result = mockMvc.perform(get(
377372
"/" + VERSION + "/results/{resultUuid}/fault_results/paged", RESULT_UUID)
@@ -384,7 +379,7 @@ public void runTest() throws Exception {
384379
.andReturn();
385380
JsonNode faultResultsPageNode1 = mapper.readTree(result.getResponse().getContentAsString());
386381
List<org.gridsuite.shortcircuit.server.dto.FaultResult> faultResultsPageDto1Full = faultResultsReader.readValue(faultResultsPageNode1.get("content"));
387-
assertPagedFaultResultsEqualsSorted(ShortCircuitAnalysisResultMock.RESULT_SORTED_PAGE_1, faultResultsPageDto1Full);
382+
assertSortedFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_SORTED_PAGE_1, faultResultsPageDto1Full);
388383

389384
// should throw not found if result does not exist
390385
mockMvc.perform(get("/" + VERSION + "/results/{resultUuid}", OTHER_RESULT_UUID))
@@ -439,7 +434,7 @@ public void runWithBusIdTest() throws Exception {
439434
.andExpect(content().contentType(MediaType.APPLICATION_JSON))
440435
.andReturn();
441436
org.gridsuite.shortcircuit.server.dto.ShortCircuitAnalysisResult resultDto = mapper.readValue(result.getResponse().getContentAsString(), org.gridsuite.shortcircuit.server.dto.ShortCircuitAnalysisResult.class);
442-
assertResultsEquals(ShortCircuitAnalysisResultMock.RESULT_FORTESCUE_FULL, resultDto);
437+
assertFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_FORTESCUE_FULL, resultDto.getFaults());
443438

444439
// paged results (more deeply tested in unit tests)
445440
result = mockMvc.perform(get(
@@ -455,7 +450,7 @@ public void runWithBusIdTest() throws Exception {
455450
List<org.gridsuite.shortcircuit.server.dto.FeederResult> feederResults = reader.readValue(feederResultsPage.get("content"));
456451
// we update the fault result with the feeders we just get to be able to use the assertion
457452
org.gridsuite.shortcircuit.server.dto.FaultResult formattedFaultResult = new org.gridsuite.shortcircuit.server.dto.FaultResult(faultResult.getFault(), faultResult.getCurrent(), faultResult.getPositiveMagnitude(), faultResult.getShortCircuitPower(), faultResult.getLimitViolations(), feederResults, faultResult.getShortCircuitLimits());
458-
assertPagedFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_FORTESCUE_FULL, List.of(formattedFaultResult));
453+
assertFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_FORTESCUE_FULL, List.of(formattedFaultResult));
459454
}
460455
}
461456

@@ -499,7 +494,7 @@ public void runWithBusBarSectionIdTest() throws Exception {
499494
.andExpect(content().contentType(MediaType.APPLICATION_JSON))
500495
.andReturn();
501496
org.gridsuite.shortcircuit.server.dto.ShortCircuitAnalysisResult resultDto = mapper.readValue(result.getResponse().getContentAsString(), org.gridsuite.shortcircuit.server.dto.ShortCircuitAnalysisResult.class);
502-
assertResultsEquals(ShortCircuitAnalysisResultMock.RESULT_FORTESCUE_FULL, resultDto);
497+
assertFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_FORTESCUE_FULL, resultDto.getFaults());
503498
}
504499
}
505500

0 commit comments

Comments
 (0)