Skip to content

Commit 5de41da

Browse files
syllamohsyllamoh
committed
sonar alert : enhance test covery
Signed-off-by: Mohamed Sylla <[email protected]>
1 parent 449a8ca commit 5de41da

File tree

12 files changed

+171
-91
lines changed

12 files changed

+171
-91
lines changed

‎sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/FCDAInfo.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,6 @@ public TFCDA getFCDA(){
5858
}
5959

6060
public boolean isValid() {
61-
return doName != null &&
62-
!StringUtils.isBlank(doName.getName()) &&
63-
!doName.getStructNames().isEmpty();
61+
return doName != null && !StringUtils.isBlank(doName.toString());
6462
}
6563
}

‎sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/IedDTO.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
import lombok.Getter;
88
import lombok.NoArgsConstructor;
9-
import lombok.Setter;
10-
import org.lfenergy.compas.scl2007b4.model.TLDevice;
119
import org.lfenergy.compas.sct.commons.scl.ied.IEDAdapter;
1210
import org.lfenergy.compas.sct.commons.scl.ied.LDeviceAdapter;
1311

‎sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/LDeviceDTO.java‎

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@
66

77
import lombok.Getter;
88
import lombok.NoArgsConstructor;
9-
import lombok.Setter;
10-
import org.lfenergy.compas.sct.commons.scl.ied.AbstractLNAdapter;
9+
10+
import lombok.extern.slf4j.Slf4j;
11+
import org.lfenergy.compas.sct.commons.Utils;
1112
import org.lfenergy.compas.sct.commons.scl.ied.LDeviceAdapter;
12-
import org.lfenergy.compas.sct.commons.scl.ied.LN0Adapter;
1313
import org.lfenergy.compas.sct.commons.scl.ied.LNAdapter;
1414

15-
import java.util.Collection;
15+
1616
import java.util.HashSet;
1717
import java.util.List;
1818
import java.util.Set;
1919
import java.util.stream.Collectors;
2020

21+
@Slf4j
2122
@Getter
2223
@NoArgsConstructor
2324
public class LDeviceDTO {
@@ -31,15 +32,18 @@ public LDeviceDTO(String inst, String ldName) {
3132
}
3233

3334
public static LDeviceDTO from(LDeviceAdapter lDeviceAdapter, LogicalNodeOptions options) {
35+
log.info(Utils.entering());
3436
LDeviceDTO lDeviceDTO = new LDeviceDTO();
35-
lDeviceDTO.ldInst = lDeviceAdapter.getInst();
36-
lDeviceDTO.ldName = lDeviceAdapter.getLdName();
37-
List<LNAdapter> lnAdapters = lDeviceAdapter.getLNAdapters();
38-
lDeviceDTO.lNodes = lnAdapters.stream()
39-
.map(lnAdapter -> LNodeDTO.from(lnAdapter, options))
40-
.collect(Collectors.toSet());
41-
lDeviceDTO.lNodes.add(LNodeDTO.from(lDeviceAdapter.getLN0Adapter(),options));
42-
37+
if(lDeviceAdapter != null) {
38+
lDeviceDTO.ldInst = lDeviceAdapter.getInst();
39+
lDeviceDTO.ldName = lDeviceAdapter.getLdName();
40+
lDeviceDTO.lNodes.add(LNodeDTO.from(lDeviceAdapter.getLN0Adapter(), options));
41+
List<LNAdapter> lnAdapters = lDeviceAdapter.getLNAdapters();
42+
lDeviceDTO.lNodes = lnAdapters.stream()
43+
.map(lnAdapter -> LNodeDTO.from(lnAdapter, options))
44+
.collect(Collectors.toSet());
45+
}
46+
log.info(Utils.leaving());
4347
return lDeviceDTO;
4448
}
4549

‎sct-commons/src/main/java/org/lfenergy/compas/sct/commons/dto/LNodeDTO.java‎

Lines changed: 9 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66

77
import lombok.Getter;
88
import lombok.NoArgsConstructor;
9+
import lombok.extern.slf4j.Slf4j;
910
import org.lfenergy.compas.scl2007b4.model.TAnyLN;
1011
import org.lfenergy.compas.scl2007b4.model.TExtRef;
12+
import org.lfenergy.compas.sct.commons.Utils;
1113
import org.lfenergy.compas.sct.commons.scl.ied.AbstractLNAdapter;
1214
import org.lfenergy.compas.sct.commons.scl.ied.LDeviceAdapter;
1315
import org.lfenergy.compas.sct.commons.scl.ied.LNAdapter;
@@ -18,6 +20,7 @@
1820
import java.util.stream.Collectors;
1921

2022

23+
@Slf4j
2124
@Getter
2225
@NoArgsConstructor
2326
public class LNodeDTO {
@@ -40,14 +43,18 @@ public LNodeDTO(String inst, String lnClass, String lnPrefix, String lnType) {
4043
}
4144

4245
public static <T extends TAnyLN> LNodeDTO from(AbstractLNAdapter<T> nodeAdapter, LogicalNodeOptions options) {
46+
log.info(Utils.entering());
4347
LNodeDTO lNodeDTO = new LNodeDTO();
48+
if(nodeAdapter == null) return lNodeDTO;
49+
4450
lNodeDTO.nodeType = nodeAdapter.getLnType();
4551
lNodeDTO.nodeClass = nodeAdapter.getLNClass();
4652
if(!nodeAdapter.getPrefix().isBlank()){
4753
lNodeDTO.prefix = nodeAdapter.getPrefix();
4854
}
4955
lNodeDTO.inst = nodeAdapter.getLNInst();
5056
if(options == null) {
57+
log.info(Utils.leaving());
5158
return lNodeDTO;
5259
}
5360

@@ -60,34 +67,15 @@ public static <T extends TAnyLN> LNodeDTO from(AbstractLNAdapter<T> nodeAdapter,
6067
extRefInfo.setHolderLnClass(lNodeDTO.nodeClass);
6168
extRefInfo.setHolderLnInst(lNodeDTO.inst);
6269
extRefInfo.setHolderPrefix(lNodeDTO.prefix);
63-
LDeviceAdapter lDeviceAdapter = (LDeviceAdapter)nodeAdapter.getParentAdapter();
70+
LDeviceAdapter lDeviceAdapter = nodeAdapter.getParentAdapter();
6471
extRefInfo.setHolderIedName(lDeviceAdapter.getParentAdapter().getName());
6572
extRefInfo.setHolderLdInst(lDeviceAdapter.getInst());
6673
return extRefInfo;
6774
})
6875
.collect(Collectors.toList())
6976
);
7077
}
71-
72-
/*
73-
if(options.isWithResumedDtt()){
74-
ResumedDataTemplate filter = new ResumedDataTemplate();
75-
filter.setLnInst(nodeAdapter.getLNInst());
76-
filter.setLnClass(nodeAdapter.getLNClass());
77-
filter.setLnType(nodeAdapter.getLnType());
78-
lNodeDTO.extractResumedDTT(nodeAdapter,filter);
79-
nodeAdapter.toDTO(this, options.isWithExtRef(), options.isWithResumedDtt(), options.isWithCB(), options.isWithDatSet());
80-
}
81-
82-
83-
if(options.isWithCB()){
84-
lNodeDTO.extractControlBlocks(nodeAdapter);
85-
}
86-
87-
if(options.isWithDatSet()){
88-
89-
}*/
90-
78+
log.info(Utils.leaving());
9179
return lNodeDTO;
9280
}
9381

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
package org.lfenergy.compas.sct.commons.dto;
66

77
import org.junit.jupiter.api.Test;
8+
import org.lfenergy.compas.scl2007b4.model.TExtRef;
89
import org.lfenergy.compas.scl2007b4.model.TLLN0Enum;
10+
import org.lfenergy.compas.scl2007b4.model.TServiceType;
911

1012
import static org.junit.jupiter.api.Assertions.*;
1113

@@ -67,4 +69,40 @@ void testIsValid(){
6769
assertFalse(bindingInfo.isValid());
6870

6971
}
72+
73+
@Test
74+
void testIsWrappedIn(){
75+
TExtRef extRef = DTO.createExtRef();
76+
ExtRefBindingInfo bindingInfo = new ExtRefBindingInfo();
77+
assertFalse(bindingInfo.isWrappedIn(extRef));
78+
79+
bindingInfo.setIedName(extRef.getIedName());
80+
assertFalse(bindingInfo.isWrappedIn(extRef));
81+
82+
bindingInfo.setLdInst(extRef.getLdInst());
83+
assertFalse(bindingInfo.isWrappedIn(extRef));
84+
85+
if(!extRef.getLnClass().isEmpty()) {
86+
bindingInfo.setLnClass(extRef.getLnClass().get(0));
87+
assertFalse(bindingInfo.isWrappedIn(extRef));
88+
89+
bindingInfo.setLnInst(extRef.getLnInst());
90+
assertFalse(bindingInfo.isWrappedIn(extRef));
91+
92+
bindingInfo.setPrefix(extRef.getPrefix());
93+
assertFalse(bindingInfo.isWrappedIn(extRef));
94+
}
95+
96+
bindingInfo.setServiceType(extRef.getServiceType());
97+
assertTrue(bindingInfo.isWrappedIn(extRef));
98+
}
99+
100+
@Test
101+
void testIsNull(){
102+
ExtRefBindingInfo bindingInfo = new ExtRefBindingInfo();
103+
assertTrue(bindingInfo.isNull());
104+
105+
bindingInfo.setServiceType(TServiceType.REPORT);
106+
assertFalse(bindingInfo.isNull());
107+
}
70108
}

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

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import org.junit.jupiter.api.Test;
88
import org.lfenergy.compas.scl2007b4.model.TExtRef;
9+
import org.lfenergy.compas.scl2007b4.model.TFCDA;
910
import org.lfenergy.compas.scl2007b4.model.TServiceType;
1011

1112
import static org.junit.jupiter.api.Assertions.*;
@@ -31,6 +32,55 @@ void testConstruction(){
3132
assertNotNull(extRefInfo1.getSourceInfo());
3233
}
3334

35+
@Test
36+
void testMatchTFCDA(){
37+
ExtRefInfo extRefInfo = new ExtRefInfo();
38+
39+
TFCDA tfcda = new TFCDA();
40+
assertFalse(extRefInfo.matchFCDA(tfcda));
41+
42+
tfcda.setLdInst("LD");
43+
assertFalse(extRefInfo.matchFCDA(tfcda));
44+
extRefInfo.setBindingInfo(new ExtRefBindingInfo());
45+
assertFalse(extRefInfo.matchFCDA(tfcda));
46+
extRefInfo.getBindingInfo().setLdInst("LD1");
47+
assertFalse(extRefInfo.matchFCDA(tfcda));
48+
49+
extRefInfo.getBindingInfo().setLdInst("LD");
50+
tfcda.getLnClass().add("LNCLASS");
51+
assertFalse(extRefInfo.matchFCDA(tfcda));
52+
extRefInfo.getBindingInfo().setLnClass("LNCLASS1");
53+
assertFalse(extRefInfo.matchFCDA(tfcda));
54+
55+
extRefInfo.getBindingInfo().setLnClass("LNCLASS");
56+
tfcda.setLnInst("1");
57+
assertFalse(extRefInfo.matchFCDA(tfcda));
58+
extRefInfo.getBindingInfo().setLnInst("2");
59+
assertFalse(extRefInfo.matchFCDA(tfcda));
60+
61+
extRefInfo.getBindingInfo().setLnInst("1");
62+
tfcda.setPrefix("PR");
63+
assertFalse(extRefInfo.matchFCDA(tfcda));
64+
extRefInfo.getBindingInfo().setPrefix("RP");
65+
assertFalse(extRefInfo.matchFCDA(tfcda));
66+
67+
extRefInfo.getBindingInfo().setPrefix("PR");
68+
tfcda.setDoName("Do");
69+
assertFalse(extRefInfo.matchFCDA(tfcda));
70+
extRefInfo.setSignalInfo(new ExtRefSignalInfo());
71+
assertFalse(extRefInfo.matchFCDA(tfcda));
72+
extRefInfo.getSignalInfo().setPDO("Do1");
73+
assertFalse(extRefInfo.matchFCDA(tfcda));
74+
75+
extRefInfo.getSignalInfo().setPDO("Do");
76+
tfcda.setDaName("Da");
77+
assertFalse(extRefInfo.matchFCDA(tfcda));
78+
extRefInfo.getSignalInfo().setPDA("Da1");
79+
assertFalse(extRefInfo.matchFCDA(tfcda));
80+
81+
extRefInfo.getSignalInfo().setPDA("Da");
82+
assertTrue(extRefInfo.matchFCDA(tfcda));
83+
}
3484

3585

3686
private ExtRefInfo createExtRef(){

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,19 @@
44

55
package org.lfenergy.compas.sct.commons.dto;
66

7+
import lombok.extern.slf4j.Slf4j;
78
import org.junit.jupiter.api.Test;
89
import org.lfenergy.compas.scl2007b4.model.TExtRef;
910
import org.lfenergy.compas.scl2007b4.model.TServiceType;
1011

1112
import static org.junit.jupiter.api.Assertions.*;
1213

14+
@Slf4j
1315
class ExtRefSignalInfoTest {
1416
@Test
1517
void testConstruction(){
1618
ExtRefSignalInfo signalInfo = DTO.createExtRefSignalInfo();
17-
18-
19+
log.info("Signal : {}",signalInfo);
1920
assertEquals(DTO.DESC,signalInfo.getDesc());
2021
assertEquals(DTO.P_DA,signalInfo.getPDA());
2122
assertEquals(DTO.P_DO,signalInfo.getPDO());

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.lfenergy.compas.scl2007b4.model.TFCDA;
99
import org.lfenergy.compas.scl2007b4.model.TFCEnum;
1010

11-
import static org.junit.jupiter.api.Assertions.assertEquals;
11+
import static org.junit.jupiter.api.Assertions.*;
1212

1313
class FCDAInfoTest {
1414

@@ -43,5 +43,11 @@ void testConstructor(){
4343
assertEquals("daName",fcdaInfo1.getDaName().getName());
4444
assertEquals("doName",fcdaInfo1.getDoName().getName());
4545
assertEquals(tfcda.getDaName(),fcdaInfo1.getDaName().toString());
46+
47+
TFCDA tfcda1 = fcdaInfo1.getFCDA();
48+
49+
assertEquals(tfcda1.getFc(),fcdaInfo1.getFc());
50+
51+
assertTrue(fcdaInfo1.isValid());
4652
}
4753
}

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
package org.lfenergy.compas.sct.commons.dto;
66

77
import org.junit.jupiter.api.Test;
8+
import org.lfenergy.compas.scl2007b4.model.SCL;
9+
import org.lfenergy.compas.sct.commons.scl.SclRootAdapter;
810
import org.lfenergy.compas.sct.commons.scl.ied.IEDAdapter;
911
import org.lfenergy.compas.sct.commons.scl.ied.LDeviceAdapter;
12+
import org.lfenergy.compas.sct.commons.testhelpers.marshaller.SclTestMarshaller;
1013
import org.mockito.MockedStatic;
1114
import org.mockito.Mockito;
1215

@@ -28,18 +31,13 @@ public void testConstruction(){
2831
}
2932

3033
@Test
31-
void testFrom(){
32-
IEDAdapter iedAdapter = Mockito.mock(IEDAdapter.class);
33-
LDeviceAdapter lDeviceAdapter = Mockito.mock(LDeviceAdapter.class);
34-
MockedStatic<LDeviceDTO> lDeviceDTOMockedStatic= Mockito.mockStatic(LDeviceDTO.class);
35-
Mockito.when(iedAdapter.getLDeviceAdapters()).thenReturn(List.of(lDeviceAdapter));
36-
lDeviceDTOMockedStatic.when(()-> LDeviceDTO.from(lDeviceAdapter,null)).thenReturn(new LDeviceDTO());
37-
Mockito.when(iedAdapter.getName()).thenReturn(DTO.HOLDER_IED_NAME);
34+
void testFrom() throws Exception {
35+
SCL scd = SclTestMarshaller.getSCLFromFile("/ied-test-schema-conf/ied_unit_test.xml");
36+
SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
37+
IEDAdapter iAdapter = assertDoesNotThrow(() -> sclRootAdapter.getIEDAdapter("IED_NAME"));
3838

39-
40-
IedDTO iedDTO = IedDTO.from(iedAdapter,null);
39+
IedDTO iedDTO = IedDTO.from(iAdapter,null);
4140
assertFalse(iedDTO.getLDevices().isEmpty());
42-
Mockito.reset(lDeviceAdapter);
4341
}
4442

4543
@Test

0 commit comments

Comments
 (0)