Skip to content

Commit d4e0da0

Browse files
samirromdhanisamirromdhani
committed
added in extensions (iidm, cgmes) & entsoe assertTxt
Signed-off-by: Samir Romdhani <samir.romdhani_externe@rte-france.com>
1 parent 5de1fff commit d4e0da0

File tree

39 files changed

+116
-118
lines changed

39 files changed

+116
-118
lines changed

‎cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_dangling_line_boundary_node.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,27 @@
1313
<iidm:busBreakerTopology>
1414
<iidm:bus id="NHV1" v="402.1428451538086" angle="0.0"/>
1515
</iidm:busBreakerTopology>
16-
<iidm:danglingLine id="NHV1_XNODE1" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE1" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
17-
<iidm:danglingLine id="NHV1_XNODE2" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE2" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
16+
<iidm:danglingLine id="NHV1_XNODE1" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" bus="NHV1" connectableBus="NHV1" pairingKey="XNODE1" p="302.4440612792969" q="98.74027252197266"/>
17+
<iidm:danglingLine id="NHV1_XNODE2" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" bus="NHV1" connectableBus="NHV1" pairingKey="XNODE2" p="302.4440612792969" q="98.74027252197266"/>
1818
</iidm:voltageLevel>
19-
<iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0.0" b="0.0" ratedU1="24.0" ratedU2="400.0" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.2825164794922" p2="-604.8909301757812" q2="-197.48046875"/>
19+
<iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0.0" b="0.0" ratedU1="24.0" ratedU2="400.0" voltageLevelId1="VLGEN" bus1="NGEN" connectableBus1="NGEN" voltageLevelId2="VLHV1" bus2="NHV1" connectableBus2="NHV1" p1="605.558349609375" q1="225.2825164794922" p2="-604.8909301757812" q2="-197.48046875"/>
2020
</iidm:substation>
2121
<iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
2222
<iidm:voltageLevel id="VLHV2" nominalV="380.0" topologyKind="BUS_BREAKER">
2323
<iidm:busBreakerTopology>
2424
<iidm:bus id="NHV2" v="389.9526763916016" angle="-3.5063576698303223"/>
2525
</iidm:busBreakerTopology>
26-
<iidm:danglingLine id="XNODE1_NHV2" p0="0.0" q0="0.0" r="1.5" x="13.0" g="2.0E-6" b="1.93E-4" pairingKey="XNODE1" bus="NHV2" connectableBus="NHV2" p="-300.43389892578125" q="-137.18849182128906"/>
27-
<iidm:danglingLine id="XNODE2_NHV2" p0="0.0" q0="0.0" r="1.5" x="13.0" g="2.0E-6" b="1.93E-4" pairingKey="XNODE2" bus="NHV2" connectableBus="NHV2" p="-300.43389892578125" q="-137.18849182128906"/>
26+
<iidm:danglingLine id="XNODE1_NHV2" p0="0.0" q0="0.0" r="1.5" x="13.0" g="2.0E-6" b="1.93E-4" bus="NHV2" connectableBus="NHV2" pairingKey="XNODE1" p="-300.43389892578125" q="-137.18849182128906"/>
27+
<iidm:danglingLine id="XNODE2_NHV2" p0="0.0" q0="0.0" r="1.5" x="13.0" g="2.0E-6" b="1.93E-4" bus="NHV2" connectableBus="NHV2" pairingKey="XNODE2" p="-300.43389892578125" q="-137.18849182128906"/>
2828
</iidm:voltageLevel>
2929
<iidm:voltageLevel id="VLLOAD" nominalV="150.0" topologyKind="BUS_BREAKER">
3030
<iidm:busBreakerTopology>
3131
<iidm:bus id="NLOAD" v="147.57861328125" angle="-9.614486694335938"/>
3232
</iidm:busBreakerTopology>
3333
<iidm:load id="LOAD" loadType="UNDEFINED" p0="600.0" q0="200.0" bus="NLOAD" connectableBus="NLOAD" p="600.0" q="200.0"/>
3434
</iidm:voltageLevel>
35-
<iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.04724999999999999" x="4.049724365620455" g="0.0" b="0.0" ratedU1="400.0" ratedU2="158.0" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.3769836425781" p2="-600.0" q2="-200.0">
36-
<iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0.0" loadTapChangingCapabilities="true" regulating="true" regulationMode="VOLTAGE" regulationValue="158.0">
35+
<iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.04724999999999999" x="4.049724365620455" g="0.0" b="0.0" ratedU1="400.0" ratedU2="158.0" voltageLevelId1="VLHV2" bus1="NHV2" connectableBus1="NHV2" voltageLevelId2="VLLOAD" bus2="NLOAD" connectableBus2="NLOAD" p1="600.8677978515625" q1="274.3769836425781" p2="-600.0" q2="-200.0">
36+
<iidm:ratioTapChanger regulating="true" lowTapPosition="0" tapPosition="1" targetDeadband="0.0" loadTapChangingCapabilities="true" regulationMode="VOLTAGE" regulationValue="158.0">
3737
<iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
3838
<iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="0.8505666905244191"/>
3939
<iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="1.0006666666666666"/>

‎cgmes/cgmes-extensions/src/test/resources/eurostag_cgmes_line_boundary_node.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,27 @@
1313
<iidm:busBreakerTopology>
1414
<iidm:bus id="NHV1" v="402.1428451538086" angle="0.0"/>
1515
</iidm:busBreakerTopology>
16-
<iidm:danglingLine id="NHV1_XNODE1" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE1" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
17-
<iidm:danglingLine id="NHV1_XNODE2" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" pairingKey="XNODE2" bus="NHV1" connectableBus="NHV1" p="302.4440612792969" q="98.74027252197266"/>
16+
<iidm:danglingLine id="NHV1_XNODE1" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" bus="NHV1" connectableBus="NHV1" pairingKey="XNODE1" p="302.4440612792969" q="98.74027252197266"/>
17+
<iidm:danglingLine id="NHV1_XNODE2" p0="0.0" q0="0.0" r="1.5" x="20.0" g="1.0E-6" b="1.93E-4" bus="NHV1" connectableBus="NHV1" pairingKey="XNODE2" p="302.4440612792969" q="98.74027252197266"/>
1818
</iidm:voltageLevel>
19-
<iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0.0" b="0.0" ratedU1="24.0" ratedU2="400.0" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1" p1="605.558349609375" q1="225.2825164794922" p2="-604.8909301757812" q2="-197.48046875"/>
19+
<iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0.0" b="0.0" ratedU1="24.0" ratedU2="400.0" voltageLevelId1="VLGEN" bus1="NGEN" connectableBus1="NGEN" voltageLevelId2="VLHV1" bus2="NHV1" connectableBus2="NHV1" p1="605.558349609375" q1="225.2825164794922" p2="-604.8909301757812" q2="-197.48046875"/>
2020
</iidm:substation>
2121
<iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
2222
<iidm:voltageLevel id="VLHV2" nominalV="380.0" topologyKind="BUS_BREAKER">
2323
<iidm:busBreakerTopology>
2424
<iidm:bus id="NHV2" v="389.9526763916016" angle="-3.5063576698303223"/>
2525
</iidm:busBreakerTopology>
26-
<iidm:danglingLine id="XNODE1_NHV2" p0="0.0" q0="0.0" r="1.5" x="13.0" g="2.0E-6" b="1.93E-4" pairingKey="XNODE1" bus="NHV2" connectableBus="NHV2" p="-300.43389892578125" q="-137.18849182128906"/>
27-
<iidm:danglingLine id="XNODE2_NHV2" p0="0.0" q0="0.0" r="1.5" x="13.0" g="2.0E-6" b="1.93E-4" pairingKey="XNODE2" bus="NHV2" connectableBus="NHV2" p="-300.43389892578125" q="-137.18849182128906"/>
26+
<iidm:danglingLine id="XNODE1_NHV2" p0="0.0" q0="0.0" r="1.5" x="13.0" g="2.0E-6" b="1.93E-4" bus="NHV2" connectableBus="NHV2" pairingKey="XNODE1" p="-300.43389892578125" q="-137.18849182128906"/>
27+
<iidm:danglingLine id="XNODE2_NHV2" p0="0.0" q0="0.0" r="1.5" x="13.0" g="2.0E-6" b="1.93E-4" bus="NHV2" connectableBus="NHV2" pairingKey="XNODE2" p="-300.43389892578125" q="-137.18849182128906"/>
2828
</iidm:voltageLevel>
2929
<iidm:voltageLevel id="VLLOAD" nominalV="150.0" topologyKind="BUS_BREAKER">
3030
<iidm:busBreakerTopology>
3131
<iidm:bus id="NLOAD" v="147.57861328125" angle="-9.614486694335938"/>
3232
</iidm:busBreakerTopology>
3333
<iidm:load id="LOAD" loadType="UNDEFINED" p0="600.0" q0="200.0" bus="NLOAD" connectableBus="NLOAD" p="600.0" q="200.0"/>
3434
</iidm:voltageLevel>
35-
<iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.04724999999999999" x="4.049724365620455" g="0.0" b="0.0" ratedU1="400.0" ratedU2="158.0" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD" p1="600.8677978515625" q1="274.3769836425781" p2="-600.0" q2="-200.0">
36-
<iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0.0" loadTapChangingCapabilities="true" regulating="true" regulationMode="VOLTAGE" regulationValue="158.0">
35+
<iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.04724999999999999" x="4.049724365620455" g="0.0" b="0.0" ratedU1="400.0" ratedU2="158.0" voltageLevelId1="VLHV2" bus1="NHV2" connectableBus1="NHV2" voltageLevelId2="VLLOAD" bus2="NLOAD" connectableBus2="NLOAD" p1="600.8677978515625" q1="274.3769836425781" p2="-600.0" q2="-200.0">
36+
<iidm:ratioTapChanger regulating="true" lowTapPosition="0" tapPosition="1" targetDeadband="0.0" loadTapChangingCapabilities="true" regulationMode="VOLTAGE" regulationValue="158.0">
3737
<iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
3838
<iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="0.8505666905244191"/>
3939
<iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="1.0006666666666666"/>

‎cgmes/cgmes-extensions/src/test/resources/eurostag_cim_characteristics.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<iidm:bus id="NHV1"/>
1515
</iidm:busBreakerTopology>
1616
</iidm:voltageLevel>
17-
<iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0.0" b="0.0" ratedU1="24.0" ratedU2="400.0" bus1="NGEN" connectableBus1="NGEN" voltageLevelId1="VLGEN" bus2="NHV1" connectableBus2="NHV1" voltageLevelId2="VLHV1"/>
17+
<iidm:twoWindingsTransformer id="NGEN_NHV1" r="0.26658461538461536" x="11.104492831516762" g="0.0" b="0.0" ratedU1="24.0" ratedU2="400.0" voltageLevelId1="VLGEN" bus1="NGEN" connectableBus1="NGEN" voltageLevelId2="VLHV1" bus2="NHV1" connectableBus2="NHV1"/>
1818
</iidm:substation>
1919
<iidm:substation id="P2" country="FR" tso="RTE" geographicalTags="B">
2020
<iidm:voltageLevel id="VLHV2" nominalV="380.0" topologyKind="BUS_BREAKER">
@@ -28,17 +28,17 @@
2828
</iidm:busBreakerTopology>
2929
<iidm:load id="LOAD" loadType="UNDEFINED" p0="600.0" q0="200.0" bus="NLOAD" connectableBus="NLOAD"/>
3030
</iidm:voltageLevel>
31-
<iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.04724999999999999" x="4.049724365620455" g="0.0" b="0.0" ratedU1="400.0" ratedU2="158.0" bus1="NHV2" connectableBus1="NHV2" voltageLevelId1="VLHV2" bus2="NLOAD" connectableBus2="NLOAD" voltageLevelId2="VLLOAD">
32-
<iidm:ratioTapChanger lowTapPosition="0" tapPosition="1" targetDeadband="0.0" loadTapChangingCapabilities="true" regulating="true" regulationMode="VOLTAGE" regulationValue="158.0">
31+
<iidm:twoWindingsTransformer id="NHV2_NLOAD" r="0.04724999999999999" x="4.049724365620455" g="0.0" b="0.0" ratedU1="400.0" ratedU2="158.0" voltageLevelId1="VLHV2" bus1="NHV2" connectableBus1="NHV2" voltageLevelId2="VLLOAD" bus2="NLOAD" connectableBus2="NLOAD">
32+
<iidm:ratioTapChanger regulating="true" lowTapPosition="0" tapPosition="1" targetDeadband="0.0" loadTapChangingCapabilities="true" regulationMode="VOLTAGE" regulationValue="158.0">
3333
<iidm:terminalRef id="NHV2_NLOAD" side="TWO"/>
3434
<iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="0.8505666905244191"/>
3535
<iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="1.0006666666666666"/>
3636
<iidm:step r="0.0" x="0.0" g="0.0" b="0.0" rho="1.150766642808914"/>
3737
</iidm:ratioTapChanger>
3838
</iidm:twoWindingsTransformer>
3939
</iidm:substation>
40-
<iidm:line id="NHV1_NHV2_1" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
41-
<iidm:line id="NHV1_NHV2_2" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" bus1="NHV1" connectableBus1="NHV1" voltageLevelId1="VLHV1" bus2="NHV2" connectableBus2="NHV2" voltageLevelId2="VLHV2"/>
40+
<iidm:line id="NHV1_NHV2_1" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" voltageLevelId1="VLHV1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId2="VLHV2" bus2="NHV2" connectableBus2="NHV2"/>
41+
<iidm:line id="NHV1_NHV2_2" r="3.0" x="33.0" g1="0.0" b1="1.93E-4" g2="0.0" b2="1.93E-4" voltageLevelId1="VLHV1" bus1="NHV1" connectableBus1="NHV1" voltageLevelId2="VLHV2" bus2="NHV2" connectableBus2="NHV2"/>
4242
<iidm:extension id="sim1">
4343
<cc:cimCharacteristics topologyKind="BUS_BRANCH" cimVersion="14"/>
4444
</iidm:extension>

‎cgmes/cgmes-extensions/src/test/resources/network_test1_cgmes_metadata_models.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@
2222
</iidm:substation>
2323
<iidm:extension id="network">
2424
<cmm:cgmesMetadataModels>
25-
<cmm:model id="eqId" subset="EQUIPMENT" description="EQ description" version="1" modelingAuthoritySet="http://powsybl.org">
25+
<cmm:model subset="EQUIPMENT" modelingAuthoritySet="http://powsybl.org" id="eqId" version="1" description="EQ description">
2626
<cmm:profile>http://equipment-core</cmm:profile>
2727
<cmm:profile>http://equipment-operation</cmm:profile>
2828
<cmm:dependentOnModel>eq-dependency1</cmm:dependentOnModel>
2929
<cmm:dependentOnModel>eq-dependency2</cmm:dependentOnModel>
3030
</cmm:model>
31-
<cmm:model id="svId" subset="STATE_VARIABLES" description="SV description" version="1" modelingAuthoritySet="http://powsybl.org">
31+
<cmm:model subset="STATE_VARIABLES" modelingAuthoritySet="http://powsybl.org" id="svId" version="1" description="SV description">
3232
<cmm:profile>http://state-variables</cmm:profile>
3333
<cmm:dependentOnModel>sv-dependency1</cmm:dependentOnModel>
3434
<cmm:dependentOnModel>sv-dependency2</cmm:dependentOnModel>
3535
</cmm:model>
36-
<cmm:model id="sshId" subset="STEADY_STATE_HYPOTHESIS" description="SSH description" version="1" modelingAuthoritySet="http://powsybl.org">
36+
<cmm:model subset="STEADY_STATE_HYPOTHESIS" modelingAuthoritySet="http://powsybl.org" id="sshId" version="1" description="SSH description">
3737
<cmm:profile>http://steady-state-hypothesis</cmm:profile>
3838
<cmm:dependentOnModel>ssh-dependency1</cmm:dependentOnModel>
3939
<cmm:dependentOnModel>ssh-dependency2</cmm:dependentOnModel>
4040
<cmm:supersedesModel>ssh-superseded1</cmm:supersedesModel>
4141
</cmm:model>
4242
</cmm:cgmesMetadataModels>
4343
</iidm:extension>
44-
</iidm:network>
44+
</iidm:network>

‎entsoe-util/src/test/java/com/powsybl/entsoe/util/EntsoeAreaSerDeTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void test() throws IOException {
5151
s.newExtension(EntsoeAreaAdder.class).withCode(EntsoeGeographicalCode.BE).add();
5252
EntsoeArea country = s.getExtension(EntsoeArea.class);
5353

54-
Network network2 = roundTripXmlTest(network,
54+
Network network2 = roundTripTxtTest(network,
5555
(n, p) -> binWriteAndRead(jsonWriteAndRead(n, p), p),
5656
NetworkSerDe::write,
5757
NetworkSerDe::validateAndRead,

‎entsoe-util/src/test/resources/entsoeAreaRef.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<iidm:network xmlns:iidm="http://www.powsybl.org/schema/iidm/1_16" xmlns:ea="http://www.itesla_project.eu/schema/iidm/ext/entsoe_area/1_0" id="test" caseDate="2016-06-27T12:27:58.535+02:00" forecastDistance="0" sourceFormat="test" minimumValidationLevel="STEADY_STATE_HYPOTHESIS">
3-
<iidm:substation id="S" country="FR"></iidm:substation>
3+
<iidm:substation id="S" country="FR"/>
44
<iidm:extension id="S">
55
<ea:entsoeArea>BE</ea:entsoeArea>
66
</iidm:extension>

‎iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/AbstractIidmSerDeTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,7 @@ public Network allFormatsRoundTripTest(Network network, String filename, IidmVer
295295
}
296296

297297
public Network allFormatsRoundTripTxtTest(Network network, String filename, IidmVersion version) throws IOException {
298-
ExportOptions exportOptions = new ExportOptions();
299-
return allFormatsRoundTripTxtTest(network, filename, version, exportOptions);
298+
return allFormatsRoundTripTxtTest(network, filename, version, new ExportOptions());
300299
}
301300

302301
/**

‎iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/IdentifiableExtensionSerDeTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import java.io.InputStream;
2727
import java.util.Properties;
2828

29-
import static com.powsybl.commons.test.ComparisonUtils.assertXmlEquals;
29+
import static com.powsybl.commons.test.ComparisonUtils.assertTxtEquals;
3030
import static com.powsybl.iidm.serde.IidmSerDeConstants.CURRENT_IIDM_VERSION;
3131
import static org.junit.jupiter.api.Assertions.*;
3232

@@ -162,7 +162,7 @@ void testNotLatestVersionTerminalExtension() throws IOException {
162162
try (InputStream is = new ByteArrayInputStream(dataSource.getData(null, "xiidm"))) {
163163
assertNotNull(is);
164164
// check that loadMock has been serialized in v1.1
165-
assertXmlEquals(getVersionedNetworkAsStream("eurostag-tutorial-example1-with-loadMockExt-1_1.xml", IidmVersion.V_1_1),
165+
assertTxtEquals(getVersionedNetworkAsStream("eurostag-tutorial-example1-with-loadMockExt-1_1.xml", IidmVersion.V_1_1),
166166
is);
167167
}
168168
}

‎iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/LoadingLimitsBugTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void test() throws IOException {
4444
.setPermanentLimit(100)
4545
.add();
4646
// check that XIIDM 1.5 is not ill-formed
47-
allFormatsRoundTripTest(network, "/loading-limits-bug.xml",
47+
allFormatsRoundTripTxtTest(network, "/loading-limits-bug.xml",
4848
new ExportOptions().setVersion(IidmVersion.V_1_5.toString(".")));
4949
}
5050
}

‎iidm/iidm-serde/src/test/java/com/powsybl/iidm/serde/XMLExporterTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,14 @@
2525
import java.util.Properties;
2626
import java.util.function.Supplier;
2727

28-
import static com.powsybl.commons.test.ComparisonUtils.assertXmlEquals;
28+
import static com.powsybl.commons.test.ComparisonUtils.assertTxtEquals;
2929
import static com.powsybl.iidm.serde.AbstractTreeDataExporter.*;
3030
import static com.powsybl.iidm.serde.IidmSerDeConstants.CURRENT_IIDM_VERSION;
3131
import static org.junit.jupiter.api.Assertions.*;
3232

3333
/**
3434
* @author Chamseddine BENHAMED {@literal <chamseddine.benhamed at rte-france.com>}
3535
*/
36-
3736
class XMLExporterTest extends AbstractIidmSerDeTest {
3837
private static final String NODE_BREAKER_FILE = "/testNetworkNodeBreaker.xiidm";
3938
private FileSystem fileSystem;
@@ -48,7 +47,7 @@ void exporterTest(Network network, Supplier<InputStream> refFileIs, Properties p
4847
new XMLExporter().export(network, properties, dataSource);
4948
// check the exported file and compare it to iidm reference file
5049
try (InputStream is = new ByteArrayInputStream(dataSource.getData(null, "xiidm"))) {
51-
assertXmlEquals(refFileIs.get(), is);
50+
assertTxtEquals(refFileIs.get(), is);
5251
}
5352
}
5453

0 commit comments

Comments
 (0)