Skip to content

Commit 083396f

Browse files
massifbenmassifben
committed
Merge pull request #455 from com-pas/revert-450-fix/449-fix-test-in-lnodestatusservicetest
Revert "fix(#449): fix test in LNodeStatusServiceTest"
2 parents afdabad + eecbfb9 commit 083396f

File tree

2 files changed

+15
-61
lines changed

2 files changed

+15
-61
lines changed

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

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

4949
public static Stream<Arguments> provideUpdateModStVal() {
5050
return Stream.of(
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")
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")
6559
);
6660
}
6761

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

Lines changed: 7 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,9 @@
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">on</Private>
24-
</LNode>
25-
<LNode iedName="IED_NAME_1" ldInst="LDEVICE_1" lnClass="PDIS" lnInst="4">
2623
<Private type="COMPAS-LNodeStatus">off</Private>
2724
</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">
25+
<LNode iedName="IED_NAME_1" ldInst="LDEVICE_1" lnClass="PDIS" lnInst="4">
3226
<Private type="COMPAS-LNodeStatus">off</Private>
3327
</LNode>
3428
</Function>
@@ -40,15 +34,9 @@
4034
<Private type="COMPAS-LNodeStatus">on</Private>
4135
</LNode>
4236
<LNode iedName="IED_NAME_1" ldInst="LDEVICE_3" lnClass="LLN0">
43-
<Private type="COMPAS-LNodeStatus">on</Private>
44-
</LNode>
45-
<LNode iedName="IED_NAME_1" ldInst="LDEVICE_4" lnClass="LLN0">
46-
<Private type="COMPAS-LNodeStatus">off</Private>
47-
</LNode>
48-
<LNode iedName="IED_NAME_1" ldInst="LDEVICE_5" lnClass="LLN0">
4937
<Private type="COMPAS-LNodeStatus">off</Private>
5038
</LNode>
51-
<LNode iedName="IED_NAME_1" ldInst="LDEVICE_6" lnClass="LLN0">
39+
<LNode iedName="IED_NAME_1" ldInst="LDEVICE_4" lnClass="LLN0">
5240
<Private type="COMPAS-LNodeStatus">off</Private>
5341
</LNode>
5442
</Function>
@@ -61,7 +49,7 @@
6149
<Authentication/>
6250
<LDevice inst="LDEVICE_1">
6351
<LN0 lnType="lnType1" lnClass="LLN0" inst="">
64-
<Private type="COMPAS-LNodeStatus">on;off</Private>
52+
<Private type="COMPAS-LNodeStatus">on</Private>
6553
<DOI name="Mod">
6654
<DAI name="stVal"/>
6755
</DOI>
@@ -73,69 +61,41 @@
7361
</DOI>
7462
</LN>
7563
<LN lnType="lnType2" lnClass="PDIS" inst="2">
76-
<Private type="COMPAS-LNodeStatus">off;on</Private>
77-
<DOI name="Mod">
78-
<DAI name="stVal"/>
79-
</DOI>
80-
</LN>
81-
<LN lnType="lnType2" lnClass="PDIS" inst="3">
8264
<Private type="COMPAS-LNodeStatus">on</Private>
8365
<DOI name="Mod">
8466
<DAI name="stVal"/>
8567
</DOI>
8668
</LN>
87-
<LN lnType="lnType2" lnClass="PDIS" inst="4">
69+
<LN lnType="lnType2" lnClass="PDIS" inst="3">
8870
<Private type="COMPAS-LNodeStatus">on;off</Private>
8971
<DOI name="Mod">
9072
<DAI name="stVal"/>
9173
</DOI>
9274
</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">
75+
<LN lnType="lnType2" lnClass="PDIS" inst="4">
10076
<Private type="COMPAS-LNodeStatus">off</Private>
10177
<DOI name="Mod">
10278
<DAI name="stVal"/>
10379
</DOI>
10480
</LN>
10581
</LDevice>
10682
<LDevice inst="LDEVICE_2">
107-
<LN0 lnType="lnType1" lnClass="LLN0" inst="">
108-
<Private type="COMPAS-LNodeStatus">off;on</Private>
109-
<DOI name="Mod">
110-
<DAI name="stVal"/>
111-
</DOI>
112-
</LN0>
113-
</LDevice>
114-
<LDevice inst="LDEVICE_3">
11583
<LN0 lnType="lnType1" lnClass="LLN0" inst="">
11684
<Private type="COMPAS-LNodeStatus">on</Private>
11785
<DOI name="Mod">
11886
<DAI name="stVal"/>
11987
</DOI>
12088
</LN0>
12189
</LDevice>
122-
<LDevice inst="LDEVICE_4">
90+
<LDevice inst="LDEVICE_3">
12391
<LN0 lnType="lnType1" lnClass="LLN0" inst="">
12492
<Private type="COMPAS-LNodeStatus">on;off</Private>
12593
<DOI name="Mod">
12694
<DAI name="stVal"/>
12795
</DOI>
12896
</LN0>
12997
</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">
98+
<LDevice inst="LDEVICE_4">
13999
<LN0 lnType="lnType1" lnClass="LLN0" inst="">
140100
<Private type="COMPAS-LNodeStatus">off</Private>
141101
<DOI name="Mod">

0 commit comments

Comments
 (0)