Skip to content

Commit a6a656c

Browse files
committed
Fixing failing tests.
1 parent cc7916c commit a6a656c

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

src/main/java/edu/ie3/datamodel/io/IoUtil.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ public static String harmonizeFileSeparator(String in) {
3737
* @return the option for a harmonized path
3838
*/
3939
public static Path harmonizeFileSeparator(Path path) {
40-
return Path.of(
41-
IoUtil.harmonizeFileSeparator(
42-
path.toString()
43-
.replaceFirst("^" + IoUtil.FILE_SEPARATOR_REGEX, "")
44-
.replaceAll(IoUtil.FILE_SEPARATOR_REGEX + "$", "")));
40+
return Path.of(IoUtil.harmonizeFileSeparator(path.toString()));
4541
}
4642

4743
/**

src/main/java/edu/ie3/datamodel/io/source/csv/CsvDataSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public Stream<Map<String, String>> getSourceData(Class<? extends UniqueEntity> e
6565

6666
// -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
6767

68-
public BufferedReader createReader(String filePath) throws FileNotFoundException {
68+
public BufferedReader createReader(Path filePath) throws FileNotFoundException {
6969
return connector.initReader(filePath);
7070
}
7171

src/main/java/edu/ie3/datamodel/io/source/csv/CsvIdCoordinateSource.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import edu.ie3.util.geo.GeoUtils;
1313
import java.io.BufferedReader;
1414
import java.io.IOException;
15-
import java.nio.file.Path;
1615
import java.util.*;
1716
import java.util.function.Function;
1817
import java.util.stream.Collectors;

src/test/groovy/edu/ie3/datamodel/io/source/EntitySourceTest.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ import edu.ie3.test.common.GridTestData as gtd
1616
import spock.lang.Shared
1717
import spock.lang.Specification
1818

19+
import java.nio.file.Path
20+
1921
class EntitySourceTest extends Specification {
2022

2123
private final class DummyEntitySource extends EntitySource {
@@ -27,7 +29,7 @@ class EntitySourceTest extends Specification {
2729
@Shared
2830
String csvSep = ","
2931
@Shared
30-
String testBaseFolderPath = "testBaseFolderPath" // does not have to exist for this test
32+
Path testBaseFolderPath = Path.of("testBaseFolderPath") // does not have to exist for this test
3133
@Shared
3234
FileNamingStrategy fileNamingStrategy = new FileNamingStrategy()
3335

0 commit comments

Comments
 (0)