diff --git a/src/main/java/org/gridsuite/shortcircuit/server/service/ShortCircuitService.java b/src/main/java/org/gridsuite/shortcircuit/server/service/ShortCircuitService.java index d676c3f0..4e578525 100644 --- a/src/main/java/org/gridsuite/shortcircuit/server/service/ShortCircuitService.java +++ b/src/main/java/org/gridsuite/shortcircuit/server/service/ShortCircuitService.java @@ -226,8 +226,6 @@ private void addFeedersRows(CsvWriter csvWriter, FaultResult faultResult, CsvExp )); csvWriter.writeRow(feederRowData); } - } else { - csvWriter.writeRow(List.of("", "", "", "", "", "")); } } diff --git a/src/test/java/org/gridsuite/shortcircuit/server/ShortCircuitCsvExportTest.java b/src/test/java/org/gridsuite/shortcircuit/server/ShortCircuitCsvExportTest.java index 2391df60..a91c24c9 100644 --- a/src/test/java/org/gridsuite/shortcircuit/server/ShortCircuitCsvExportTest.java +++ b/src/test/java/org/gridsuite/shortcircuit/server/ShortCircuitCsvExportTest.java @@ -164,7 +164,7 @@ void resultTest() throws Exception { doReturn(page).when(shortCircuitService).getFaultResultsPage(NETWORK_UUID, VARIANT_ID, RESULT_UUID, FaultResultsMode.FULL, null, null, Pageable.unpaged()); MvcResult result; - int expectedResultSize = 5; + int expectedResultSize = 3; // Including "\uFEFF" indicates the UTF-8 BOM at the start List expectedHeaders = List.of( "\uFEFFID nœud", @@ -180,7 +180,6 @@ void resultTest() throws Exception { ); List expectedLine1 = List.of("faultId1", "faultVoltageLevelId1", "", "", "0.05", "", "0.011", "0.2", "20", "0.035", "-0.155"); List expectedLine3 = List.of("faultId2", "faultVoltageLevelId2", "", "", "0.04", "", "0.011", "0.2", "10", "0.035", "-0.155"); - List expectedBlankLine = List.of(); for (String language : List.of("fr", "en")) { result = mockMvc.perform(post( @@ -207,9 +206,7 @@ void resultTest() throws Exception { assertEquals(expectedResultSize, actualCsv.size()); assertEquals(expectedHeaders, actualCsv.getFirst()); assertEquals(expectedLine1, actualCsv.get(1)); - assertEquals(expectedBlankLine, actualCsv.get(2)); - assertEquals(expectedLine3, actualCsv.get(3)); - assertEquals(expectedBlankLine, actualCsv.get(4)); + assertEquals(expectedLine3, actualCsv.get(2)); } } }