Skip to content

Commit 9d11bdc

Browse files
committed
Fix tests so they can run both on Windows and Linux.
Signed-off-by: amichaut <[email protected]>
1 parent c942e97 commit 9d11bdc

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

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

+2
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,7 @@ void tsStatsFunctions() throws IOException {
269269
}
270270

271271
String output = outputStream.toString();
272+
output = output.replaceAll("\r\n", "\n");
272273
assertEquals("1.0\n0.2\n-5.0\n3.0\n1.0\n", output);
273274

274275
outputStream.reset();
@@ -279,6 +280,7 @@ void tsStatsFunctions() throws IOException {
279280
}
280281

281282
output = outputStream.toString();
283+
output = output.replaceAll("\r\n", "\n");
282284
assertEquals("6.0\n2.0\n1.0\n3.0\n2.0\n", output);
283285
}
284286

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ private void compareLogger(TimeSeriesMappingLogger logger, String expectedType,
306306
try (BufferedWriter bufferedWriter = new BufferedWriter(loggerCsvOutput)) {
307307
logger.writeCsv(bufferedWriter);
308308
bufferedWriter.flush();
309-
String loggerCsv = loggerCsvOutput.toString();
309+
String loggerCsv = loggerCsvOutput.toString().replaceAll("\r\n", "\n");
310310
String[] lines = loggerCsv.split("\n");
311311
int nbLines = lines.length;
312312
int nbExpectedLines = 1;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ void provideTsNotMappedTest() throws Exception {
241241
try (StringWriter sw = new StringWriter()) {
242242
TimeSeriesMappingConfig mappingConfig = dsl.load(network, mappingParameters, store, sw, null);
243243
assertEquals(ImmutableSet.of(new MappingKey(EquipmentVariable.targetP, "FSSV.O11_G")), mappingConfig.getGeneratorTimeSeries());
244-
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());
244+
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"));
245245
}
246246
}
247247

@@ -265,7 +265,7 @@ void provideTsEmptyFilterTest() throws Exception {
265265
try (StringWriter sw = new StringWriter()) {
266266
TimeSeriesMappingConfig mappingConfig = dsl.load(network, mappingParameters, store, sw, null);
267267
assertEquals(Collections.emptySet(), mappingConfig.getGeneratorTimeSeries());
268-
assertEquals("WARNING;Mapping script;provideTs - Empty filtered list for equipment type GENERATOR and variables [targetP]\n", sw.toString());
268+
assertEquals("WARNING;Mapping script;provideTs - Empty filtered list for equipment type GENERATOR and variables [targetP]\n", sw.toString().replaceAll("\r\n", "\n"));
269269
}
270270
}
271271
}

0 commit comments

Comments
 (0)