Skip to content

Commit 38764c1

Browse files
rolnicorolnico
committed
Add normalizeLineSeparator to tests
Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
1 parent 0a3ee0c commit 38764c1

1 file changed

Lines changed: 20 additions & 20 deletions

File tree

‎single-line-diagram/single-line-diagram-core/src/test/java/com/powsybl/sld/SingleLineDiagramTest.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -56,73 +56,73 @@ void tearDown() throws IOException {
5656
@Test
5757
void testDraw() throws IOException {
5858
SingleLineDiagram.draw(network, "VL1", svgPath);
59-
assertEquals(toString("/TestDrawVL1PrefixEmpty.svg"), toString(Files.newInputStream(svgPath)));
59+
assertEquals(toString("/TestDrawVL1PrefixEmpty.svg"), normalizeLineSeparator(toString(Files.newInputStream(svgPath))));
6060

6161
SingleLineDiagram.draw(network, "VL1", svgPath, new LegacyIdProvider("Legacy"));
62-
assertEquals(toString("/TestDrawVL1PrefixLegacy.svg"), toString(Files.newInputStream(svgPath)));
62+
assertEquals(toString("/TestDrawVL1PrefixLegacy.svg"), normalizeLineSeparator(toString(Files.newInputStream(svgPath))));
6363

6464
try (StringWriter writer = new StringWriter()) {
6565
SingleLineDiagram.draw(network, "VL1", writer, new StringWriter());
66-
assertEquals(toString("/TestDrawVL1PrefixEmpty.svg"), writer.toString());
66+
assertEquals(toString("/TestDrawVL1PrefixEmpty.svg"), normalizeLineSeparator(writer.toString()));
6767
}
6868

6969
try (StringWriter writer = new StringWriter()) {
7070
SingleLineDiagram.draw(network, "VL1", writer, new StringWriter(), new LegacyIdProvider("Legacy"));
71-
assertEquals(toString("/TestDrawVL1PrefixLegacy.svg"), writer.toString());
71+
assertEquals(toString("/TestDrawVL1PrefixLegacy.svg"), normalizeLineSeparator(writer.toString()));
7272
}
7373

7474
SingleLineDiagram.draw(network, "VL1", svgPath, sldParameters);
75-
assertEquals(toString("/TestDrawVL1PrefixTest.svg"), toString(Files.newInputStream(svgPath)));
75+
assertEquals(toString("/TestDrawVL1PrefixTest.svg"), normalizeLineSeparator(toString(Files.newInputStream(svgPath))));
7676

7777
SingleLineDiagram.draw(network, "VL1", svgPath, sldParameters, new LegacyIdProvider("Legacy"));
78-
assertEquals(toString("/TestDrawVL1PrefixLegacy.svg"), toString(Files.newInputStream(svgPath)));
78+
assertEquals(toString("/TestDrawVL1PrefixLegacy.svg"), normalizeLineSeparator(toString(Files.newInputStream(svgPath))));
7979

8080
try (StringWriter writer = new StringWriter()) {
8181
SingleLineDiagram.draw(network, "VL1", writer, new StringWriter(), sldParameters);
82-
assertEquals(toString("/TestDrawVL1PrefixTest.svg"), writer.toString());
82+
assertEquals(toString("/TestDrawVL1PrefixTest.svg"), normalizeLineSeparator(writer.toString()));
8383
}
8484

8585
try (StringWriter writer = new StringWriter()) {
8686
SingleLineDiagram.draw(network, "VL1", writer, new StringWriter(), sldParameters, new LegacyIdProvider("Legacy"));
87-
assertEquals(toString("/TestDrawVL1PrefixLegacy.svg"), writer.toString());
87+
assertEquals(toString("/TestDrawVL1PrefixLegacy.svg"), normalizeLineSeparator(writer.toString()));
8888
}
8989
}
9090

9191
@Test
9292
void testDrawVoltageLevel() throws IOException {
9393
SingleLineDiagram.drawVoltageLevel(network, "VL1", svgPath);
94-
assertEquals(toString("/TestDrawVL1PrefixEmpty.svg"), toString(Files.newInputStream(svgPath)));
94+
assertEquals(toString("/TestDrawVL1PrefixEmpty.svg"), normalizeLineSeparator(toString(Files.newInputStream(svgPath))));
9595

9696
SingleLineDiagram.drawVoltageLevel(network, "VL1", svgPath, new LegacyIdProvider("Legacy"));
97-
assertEquals(toString("/TestDrawVL1PrefixLegacy.svg"), toString(Files.newInputStream(svgPath)));
97+
assertEquals(toString("/TestDrawVL1PrefixLegacy.svg"), normalizeLineSeparator(toString(Files.newInputStream(svgPath))));
9898

9999
try (StringWriter writer = new StringWriter()) {
100100
SingleLineDiagram.drawVoltageLevel(network, "VL1", writer, new StringWriter(), sldParameters);
101-
assertEquals(toString("/TestDrawVL1PrefixTest.svg"), writer.toString());
101+
assertEquals(toString("/TestDrawVL1PrefixTest.svg"), normalizeLineSeparator(writer.toString()));
102102
}
103103

104104
try (StringWriter writer = new StringWriter()) {
105105
SingleLineDiagram.drawVoltageLevel(network, "VL1", writer, new StringWriter(), sldParameters, new LegacyIdProvider("Legacy"));
106-
assertEquals(toString("/TestDrawVL1PrefixLegacy.svg"), writer.toString());
106+
assertEquals(toString("/TestDrawVL1PrefixLegacy.svg"), normalizeLineSeparator(writer.toString()));
107107
}
108108
}
109109

110110
@Test
111111
void testDrawSubstation() throws IOException {
112112
SingleLineDiagram.drawSubstation(network, "S1", svgPath);
113-
assertEquals(toString("/TestDrawS1PrefixEmpty.svg"), toString(Files.newInputStream(svgPath)));
113+
assertEquals(toString("/TestDrawS1PrefixEmpty.svg"), normalizeLineSeparator(toString(Files.newInputStream(svgPath))));
114114

115115
SingleLineDiagram.drawSubstation(network, "S1", svgPath, new LegacyIdProvider("Legacy"));
116-
assertEquals(toString("/TestDrawS1PrefixLegacy.svg"), toString(Files.newInputStream(svgPath)));
116+
assertEquals(toString("/TestDrawS1PrefixLegacy.svg"), normalizeLineSeparator(toString(Files.newInputStream(svgPath))));
117117

118118
try (StringWriter writer = new StringWriter()) {
119119
SingleLineDiagram.drawSubstation(network, "S1", writer, new StringWriter(), sldParameters);
120-
assertEquals(toString("/TestDrawS1PrefixTest.svg"), writer.toString());
120+
assertEquals(toString("/TestDrawS1PrefixTest.svg"), normalizeLineSeparator(writer.toString()));
121121
}
122122

123123
try (StringWriter writer = new StringWriter()) {
124124
SingleLineDiagram.drawSubstation(network, "S1", writer, new StringWriter(), sldParameters, new LegacyIdProvider("Legacy"));
125-
assertEquals(toString("/TestDrawS1PrefixLegacy.svg"), writer.toString());
125+
assertEquals(toString("/TestDrawS1PrefixLegacy.svg"), normalizeLineSeparator(writer.toString()));
126126
}
127127
}
128128

@@ -131,19 +131,19 @@ void testDrawMultiSubstation() throws IOException {
131131
network = Networks.createTestCase11Network();
132132

133133
SingleLineDiagram.drawMultiSubstations(network, List.of("subst", "subst2"), svgPath);
134-
assertEquals(toString("/TestDrawS1S2PrefixEmpty.svg"), toString(Files.newInputStream(svgPath)));
134+
assertEquals(toString("/TestDrawS1S2PrefixEmpty.svg"), normalizeLineSeparator(toString(Files.newInputStream(svgPath))));
135135

136136
SingleLineDiagram.drawMultiSubstations(network, List.of("subst", "subst2"), svgPath, new LegacyIdProvider("Legacy"));
137-
assertEquals(toString("/TestDrawS1S2PrefixLegacy.svg"), toString(Files.newInputStream(svgPath)));
137+
assertEquals(toString("/TestDrawS1S2PrefixLegacy.svg"), normalizeLineSeparator(toString(Files.newInputStream(svgPath))));
138138

139139
try (StringWriter writer = new StringWriter()) {
140140
SingleLineDiagram.drawMultiSubstations(network, List.of("subst", "subst2"), writer, new StringWriter(), sldParameters);
141-
assertEquals(toString("/TestDrawS1S2PrefixTest.svg"), writer.toString());
141+
assertEquals(toString("/TestDrawS1S2PrefixTest.svg"), normalizeLineSeparator(writer.toString()));
142142
}
143143

144144
try (StringWriter writer = new StringWriter()) {
145145
SingleLineDiagram.drawMultiSubstations(network, List.of("subst", "subst2"), writer, new StringWriter(), sldParameters, new LegacyIdProvider("Legacy"));
146-
assertEquals(toString("/TestDrawS1S2PrefixLegacy.svg"), writer.toString());
146+
assertEquals(toString("/TestDrawS1S2PrefixLegacy.svg"), normalizeLineSeparator(writer.toString()));
147147
}
148148
}
149149
}

0 commit comments

Comments
 (0)