Skip to content

Commit c0aee83

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

File tree

1 file changed

+12
-19
lines changed

1 file changed

+12
-19
lines changed

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

Lines changed: 12 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,14 @@ 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());
192185
List<FaultResult> orderedFaultResults = result.getFaultResults().stream().sorted(Comparator.comparing(fr -> fr.getFault().getId())).toList();
193186
List<org.gridsuite.shortcircuit.server.dto.FaultResult> orderedFaultResultsDto = faultResults.stream().sorted(Comparator.comparing(fr -> fr.getFault().getId())).toList();
194187
assertFaultResultsEquals(orderedFaultResults, orderedFaultResultsDto);
195188
}
196189

197-
private static void assertPagedFaultResultsEqualsSorted(ShortCircuitAnalysisResult result, List<org.gridsuite.shortcircuit.server.dto.FaultResult> faultResults) {
190+
private static void assertSortedFaultResultsEquals(ShortCircuitAnalysisResult result, List<org.gridsuite.shortcircuit.server.dto.FaultResult> faultResults) {
198191
assertEquals(result.getFaultResults().size(), faultResults.size());
199192
assertFaultResultsEquals(result.getFaultResults(), faultResults);
200193
}
@@ -322,7 +315,7 @@ public void runTest() throws Exception {
322315
.andExpect(content().contentType(MediaType.APPLICATION_JSON))
323316
.andReturn();
324317
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);
318+
assertFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_WITH_LIMIT_VIOLATIONS, resultDto.getFaults());
326319

327320
// BASIC mode
328321
result = mockMvc.perform(get(
@@ -332,7 +325,7 @@ public void runTest() throws Exception {
332325
.andExpect(content().contentType(MediaType.APPLICATION_JSON))
333326
.andReturn();
334327
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);
328+
assertFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_BASIC, resultDtoBasic.getFaults());
336329

337330
// FULL mode
338331
result = mockMvc.perform(get(
@@ -342,7 +335,7 @@ public void runTest() throws Exception {
342335
.andExpect(content().contentType(MediaType.APPLICATION_JSON))
343336
.andReturn();
344337
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);
338+
assertFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_MAGNITUDE_FULL, resultDtoFull.getFaults());
346339

347340
result = mockMvc.perform(get(
348341
"/" + VERSION + "/results/{resultUuid}/fault_results/paged", RESULT_UUID)
@@ -358,7 +351,7 @@ public void runTest() throws Exception {
358351
JsonNode faultResultsPageNode = mapper.readTree(result.getResponse().getContentAsString());
359352
ObjectReader faultResultsReader = mapper.readerFor(new TypeReference<List<org.gridsuite.shortcircuit.server.dto.FaultResult>>() { });
360353
List<org.gridsuite.shortcircuit.server.dto.FaultResult> faultResultsPageDto0 = faultResultsReader.readValue(faultResultsPageNode.get("content"));
361-
assertPagedFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_WITH_LIMIT_VIOLATIONS, faultResultsPageDto0);
354+
assertFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_WITH_LIMIT_VIOLATIONS, faultResultsPageDto0);
362355

363356
result = mockMvc.perform(get(
364357
"/" + VERSION + "/results/{resultUuid}/fault_results/paged", RESULT_UUID)
@@ -371,7 +364,7 @@ public void runTest() throws Exception {
371364
.andReturn();
372365
JsonNode faultResultsPageNode0 = mapper.readTree(result.getResponse().getContentAsString());
373366
List<org.gridsuite.shortcircuit.server.dto.FaultResult> faultResultsPageDto0Full = faultResultsReader.readValue(faultResultsPageNode0.get("content"));
374-
assertPagedFaultResultsEqualsSorted(ShortCircuitAnalysisResultMock.RESULT_SORTED_PAGE_0, faultResultsPageDto0Full);
367+
assertSortedFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_SORTED_PAGE_0, faultResultsPageDto0Full);
375368

376369
result = mockMvc.perform(get(
377370
"/" + VERSION + "/results/{resultUuid}/fault_results/paged", RESULT_UUID)
@@ -384,7 +377,7 @@ public void runTest() throws Exception {
384377
.andReturn();
385378
JsonNode faultResultsPageNode1 = mapper.readTree(result.getResponse().getContentAsString());
386379
List<org.gridsuite.shortcircuit.server.dto.FaultResult> faultResultsPageDto1Full = faultResultsReader.readValue(faultResultsPageNode1.get("content"));
387-
assertPagedFaultResultsEqualsSorted(ShortCircuitAnalysisResultMock.RESULT_SORTED_PAGE_1, faultResultsPageDto1Full);
380+
assertSortedFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_SORTED_PAGE_1, faultResultsPageDto1Full);
388381

389382
// should throw not found if result does not exist
390383
mockMvc.perform(get("/" + VERSION + "/results/{resultUuid}", OTHER_RESULT_UUID))
@@ -439,7 +432,7 @@ public void runWithBusIdTest() throws Exception {
439432
.andExpect(content().contentType(MediaType.APPLICATION_JSON))
440433
.andReturn();
441434
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);
435+
assertFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_FORTESCUE_FULL, resultDto.getFaults());
443436

444437
// paged results (more deeply tested in unit tests)
445438
result = mockMvc.perform(get(
@@ -455,7 +448,7 @@ public void runWithBusIdTest() throws Exception {
455448
List<org.gridsuite.shortcircuit.server.dto.FeederResult> feederResults = reader.readValue(feederResultsPage.get("content"));
456449
// we update the fault result with the feeders we just get to be able to use the assertion
457450
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));
451+
assertFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_FORTESCUE_FULL, List.of(formattedFaultResult));
459452
}
460453
}
461454

@@ -499,7 +492,7 @@ public void runWithBusBarSectionIdTest() throws Exception {
499492
.andExpect(content().contentType(MediaType.APPLICATION_JSON))
500493
.andReturn();
501494
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);
495+
assertFaultResultsEquals(ShortCircuitAnalysisResultMock.RESULT_FORTESCUE_FULL, resultDto.getFaults());
503496
}
504497
}
505498

0 commit comments

Comments
 (0)