Skip to content

Commit 5e6b65b

Browse files
massifbenmassifben
committed
fix(#449): fix test in LNodeStatusServiceTest
Signed-off-by: massifben <[email protected]>
1 parent 8f178f4 commit 5e6b65b

File tree

2 files changed

+61
-15
lines changed

2 files changed

+61
-15
lines changed

‎sct-commons/src/test/java/org/lfenergy/compas/sct/commons/LNodeStatusServiceTest.java‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,20 @@ void updateLnStatusBasedOnPrivateLNodeStatus_should_update_Mod_stVal(String ldIn
4848

4949
public static Stream<Arguments> provideUpdateModStVal() {
5050
return Stream.of(
51-
Arguments.of(named("LN 'on' à mettre à 'on'", "LDEVICE_1"), "PDIS", "1", "on"),
52-
Arguments.of(named("LN 'off;on' à mettre à 'on'", "LDEVICE_1"), "PDIS", "2", "on"),
53-
Arguments.of(named("LN 'off' à mettre à 'off'", "LDEVICE_1"), "PDIS", "3", "off"),
54-
Arguments.of(named("LN 'off;on' à mettre à 'off'", "LDEVICE_1"), "PDIS", "3", "off"),
55-
Arguments.of(named("LN0 'on' à mettre à 'on'", "LDEVICE_1"), "LLN0", "", "on"),
56-
Arguments.of(named("LN0 'off;on' à mettre à 'on'", "LDEVICE_2"), "LLN0", "", "on"),
57-
Arguments.of(named("LN0 'off' à mettre à 'off'", "LDEVICE_3"), "LLN0", "", "off"),
58-
Arguments.of(named("LN0 'off;on' à mettre à 'off'", "LDEVICE_4"), "LLN0", "", "off")
51+
// Tests on LN
52+
Arguments.of(named("LN 'on;off' to set to 'on'", "LDEVICE_1"), "PDIS", "1", "on"),
53+
Arguments.of(named("LN 'off;on' to set to 'on'", "LDEVICE_1"), "PDIS", "2", "on"),
54+
Arguments.of(named("LN 'on' to set to 'on'", "LDEVICE_1"), "PDIS", "3", "on"),
55+
Arguments.of(named("LN 'on;off' to set to 'off'", "LDEVICE_1"), "PDIS", "4", "off"),
56+
Arguments.of(named("LN 'off;on' to set to 'off'", "LDEVICE_1"), "PDIS", "5", "off"),
57+
Arguments.of(named("LN 'off' to set to 'off'", "LDEVICE_1"), "PDIS", "6", "off"),
58+
// Tests on LN0
59+
Arguments.of(named("LN0 'on;off' to set to 'on'", "LDEVICE_1"), "LLN0", "", "on"),
60+
Arguments.of(named("LN0 'off;on' to set to 'on'", "LDEVICE_2"), "LLN0", "", "on"),
61+
Arguments.of(named("LN0 'on' to set to 'on'", "LDEVICE_3"), "LLN0", "", "on"),
62+
Arguments.of(named("LN0 'on;off' to set to 'off'", "LDEVICE_4"), "LLN0", "", "off"),
63+
Arguments.of(named("LN0 'off;on' to set to 'off'", "LDEVICE_5"), "LLN0", "", "off"),
64+
Arguments.of(named("LN0 'off' to set to 'off'", "LDEVICE_6"), "LLN0", "", "off")
5965
);
6066
}
6167

‎sct-commons/src/test/resources/scl-lnodestatus/lnodestatus.scd‎

Lines changed: 47 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,17 @@
2020
<Private type="COMPAS-LNodeStatus">on</Private>
2121
</LNode>
2222
<LNode iedName="IED_NAME_1" ldInst="LDEVICE_1" lnClass="PDIS" lnInst="3">
23-
<Private type="COMPAS-LNodeStatus">off</Private>
23+
<Private type="COMPAS-LNodeStatus">on</Private>
2424
</LNode>
2525
<LNode iedName="IED_NAME_1" ldInst="LDEVICE_1" lnClass="PDIS" lnInst="4">
2626
<Private type="COMPAS-LNodeStatus">off</Private>
2727
</LNode>
28+
<LNode iedName="IED_NAME_1" ldInst="LDEVICE_1" lnClass="PDIS" lnInst="5">
29+
<Private type="COMPAS-LNodeStatus">off</Private>
30+
</LNode>
31+
<LNode iedName="IED_NAME_1" ldInst="LDEVICE_1" lnClass="PDIS" lnInst="6">
32+
<Private type="COMPAS-LNodeStatus">off</Private>
33+
</LNode>
2834
</Function>
2935
<Function name="FUNCTION_2">
3036
<LNode iedName="IED_NAME_1" ldInst="LDEVICE_1" lnClass="LLN0">
@@ -34,11 +40,17 @@
3440
<Private type="COMPAS-LNodeStatus">on</Private>
3541
</LNode>
3642
<LNode iedName="IED_NAME_1" ldInst="LDEVICE_3" lnClass="LLN0">
37-
<Private type="COMPAS-LNodeStatus">off</Private>
43+
<Private type="COMPAS-LNodeStatus">on</Private>
3844
</LNode>
3945
<LNode iedName="IED_NAME_1" ldInst="LDEVICE_4" lnClass="LLN0">
4046
<Private type="COMPAS-LNodeStatus">off</Private>
4147
</LNode>
48+
<LNode iedName="IED_NAME_1" ldInst="LDEVICE_5" lnClass="LLN0">
49+
<Private type="COMPAS-LNodeStatus">off</Private>
50+
</LNode>
51+
<LNode iedName="IED_NAME_1" ldInst="LDEVICE_6" lnClass="LLN0">
52+
<Private type="COMPAS-LNodeStatus">off</Private>
53+
</LNode>
4254
</Function>
4355
</Bay>
4456
</VoltageLevel>
@@ -49,7 +61,7 @@
4961
<Authentication/>
5062
<LDevice inst="LDEVICE_1">
5163
<LN0 lnType="lnType1" lnClass="LLN0" inst="">
52-
<Private type="COMPAS-LNodeStatus">on</Private>
64+
<Private type="COMPAS-LNodeStatus">on;off</Private>
5365
<DOI name="Mod">
5466
<DAI name="stVal"/>
5567
</DOI>
@@ -61,18 +73,30 @@
6173
</DOI>
6274
</LN>
6375
<LN lnType="lnType2" lnClass="PDIS" inst="2">
64-
<Private type="COMPAS-LNodeStatus">on</Private>
76+
<Private type="COMPAS-LNodeStatus">off;on</Private>
6577
<DOI name="Mod">
6678
<DAI name="stVal"/>
6779
</DOI>
6880
</LN>
6981
<LN lnType="lnType2" lnClass="PDIS" inst="3">
70-
<Private type="COMPAS-LNodeStatus">on;off</Private>
82+
<Private type="COMPAS-LNodeStatus">on</Private>
7183
<DOI name="Mod">
7284
<DAI name="stVal"/>
7385
</DOI>
7486
</LN>
7587
<LN lnType="lnType2" lnClass="PDIS" inst="4">
88+
<Private type="COMPAS-LNodeStatus">on;off</Private>
89+
<DOI name="Mod">
90+
<DAI name="stVal"/>
91+
</DOI>
92+
</LN>
93+
<LN lnType="lnType2" lnClass="PDIS" inst="5">
94+
<Private type="COMPAS-LNodeStatus">off;on</Private>
95+
<DOI name="Mod">
96+
<DAI name="stVal"/>
97+
</DOI>
98+
</LN>
99+
<LN lnType="lnType2" lnClass="PDIS" inst="6">
76100
<Private type="COMPAS-LNodeStatus">off</Private>
77101
<DOI name="Mod">
78102
<DAI name="stVal"/>
@@ -81,21 +105,37 @@
81105
</LDevice>
82106
<LDevice inst="LDEVICE_2">
83107
<LN0 lnType="lnType1" lnClass="LLN0" inst="">
84-
<Private type="COMPAS-LNodeStatus">on</Private>
108+
<Private type="COMPAS-LNodeStatus">off;on</Private>
85109
<DOI name="Mod">
86110
<DAI name="stVal"/>
87111
</DOI>
88112
</LN0>
89113
</LDevice>
90114
<LDevice inst="LDEVICE_3">
91115
<LN0 lnType="lnType1" lnClass="LLN0" inst="">
92-
<Private type="COMPAS-LNodeStatus">on;off</Private>
116+
<Private type="COMPAS-LNodeStatus">on</Private>
93117
<DOI name="Mod">
94118
<DAI name="stVal"/>
95119
</DOI>
96120
</LN0>
97121
</LDevice>
98122
<LDevice inst="LDEVICE_4">
123+
<LN0 lnType="lnType1" lnClass="LLN0" inst="">
124+
<Private type="COMPAS-LNodeStatus">on;off</Private>
125+
<DOI name="Mod">
126+
<DAI name="stVal"/>
127+
</DOI>
128+
</LN0>
129+
</LDevice>
130+
<LDevice inst="LDEVICE_5">
131+
<LN0 lnType="lnType1" lnClass="LLN0" inst="">
132+
<Private type="COMPAS-LNodeStatus">off;on</Private>
133+
<DOI name="Mod">
134+
<DAI name="stVal"/>
135+
</DOI>
136+
</LN0>
137+
</LDevice>
138+
<LDevice inst="LDEVICE_6">
99139
<LN0 lnType="lnType1" lnClass="LLN0" inst="">
100140
<Private type="COMPAS-LNodeStatus">off</Private>
101141
<DOI name="Mod">

0 commit comments

Comments
 (0)