PR #55 - Replace explicit line-break characters replacement by generic calls to TestUtil#normalizeLineSeparator

Author: armic-artelys

metrix-mapping/src/test/java/com/powsybl/metrix/mapping/TimeSeriesDslLoaderTest.java

@@ -9,6 +9,7 @@
 package com.powsybl.metrix.mapping;
 
 import com.google.common.collect.Sets;
+import com.powsybl.commons.TestUtil;
 import com.powsybl.commons.io.table.TableFormatterConfig;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.timeseries.*;
@@ -268,8 +269,7 @@ void tsStatsFunctions() throws IOException {
             csvWriter.printMappingSynthesis(System.out, new TableFormatterConfig());
         }
 
-        String output = outputStream.toString();
-        output = output.replaceAll("\r\n", "\n");
+        String output = TestUtil.normalizeLineSeparator(outputStream.toString());
         assertEquals("1.0\n0.2\n-5.0\n3.0\n1.0\n", output);
 
         outputStream.reset();
@@ -279,8 +279,7 @@ void tsStatsFunctions() throws IOException {
             csvWriter.printMappingSynthesis(System.out, new TableFormatterConfig());
         }
 
-        output = outputStream.toString();
-        output = output.replaceAll("\r\n", "\n");
+        output = TestUtil.normalizeLineSeparator(outputStream.toString());
         assertEquals("6.0\n2.0\n1.0\n3.0\n2.0\n", output);
     }
 

metrix-mapping/src/test/java/com/powsybl/metrix/mapping/TimeSeriesMapperCheckerTest.java

@@ -10,6 +10,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Range;
+import com.powsybl.commons.TestUtil;
 import com.powsybl.commons.datasource.MemDataSource;
 import com.powsybl.iidm.network.Generator;
 import com.powsybl.iidm.network.HvdcLine;
@@ -306,7 +307,7 @@ private void compareLogger(TimeSeriesMappingLogger logger, String expectedType,
         try (BufferedWriter bufferedWriter = new BufferedWriter(loggerCsvOutput)) {
             logger.writeCsv(bufferedWriter);
             bufferedWriter.flush();
-            String loggerCsv = loggerCsvOutput.toString().replaceAll("\r\n", "\n");
+            String loggerCsv = TestUtil.normalizeLineSeparator(loggerCsvOutput.toString());
             String[] lines = loggerCsv.split("\n");
             int nbLines = lines.length;
             int nbExpectedLines = 1;

metrix-mapping/src/test/java/com/powsybl/metrix/mapping/TimeSeriesProvideTsTest.java metrix-mapping/src/test/java/com/powsybl/metrix/mapping/TimeSeriesProviderTsTest.java

@@ -9,6 +9,7 @@
 package com.powsybl.metrix.mapping;
 
 import com.google.common.collect.ImmutableSet;
+import com.powsybl.commons.TestUtil;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.xml.NetworkXml;
 import com.powsybl.timeseries.*;
@@ -22,7 +23,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-class TimeSeriesProvideTsTest {
+class TimeSeriesProviderTsTest {
 
     private Network network;
 
@@ -241,7 +242,7 @@ void provideTsNotMappedTest() throws Exception {
         try (StringWriter sw = new StringWriter()) {
             TimeSeriesMappingConfig mappingConfig = dsl.load(network, mappingParameters, store, sw, null);
             assertEquals(ImmutableSet.of(new MappingKey(EquipmentVariable.targetP, "FSSV.O11_G")), mappingConfig.getGeneratorTimeSeries());
-            assertEquals("WARNING;Mapping script;provideTs - Time series can not be provided for id FSSV.O11_G because id is not mapped on targetP\n", sw.toString().replace("\r\n", "\n"));
+            assertEquals("WARNING;Mapping script;provideTs - Time series can not be provided for id FSSV.O11_G because id is not mapped on targetP\n", TestUtil.normalizeLineSeparator(sw.toString()));
         }
     }
 
@@ -265,7 +266,7 @@ void provideTsEmptyFilterTest() throws Exception {
         try (StringWriter sw = new StringWriter()) {
             TimeSeriesMappingConfig mappingConfig = dsl.load(network, mappingParameters, store, sw, null);
             assertEquals(Collections.emptySet(), mappingConfig.getGeneratorTimeSeries());
-            assertEquals("WARNING;Mapping script;provideTs - Empty filtered list for equipment type GENERATOR and variables [targetP]\n", sw.toString().replaceAll("\r\n", "\n"));
+            assertEquals("WARNING;Mapping script;provideTs - Empty filtered list for equipment type GENERATOR and variables [targetP]\n", TestUtil.normalizeLineSeparator(sw.toString()));
         }
     }
 }