Skip to content

Commit d5f3a82

Browse files
committed
[#75] : test corrections after remarks on pull request
Signed-off-by: Aliou DIAITE <[email protected]>
1 parent 02c522b commit d5f3a82

File tree

8 files changed

+16
-11
lines changed

8 files changed

+16
-11
lines changed

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/com/SubNetworkAdapterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void getConnectedAPAdapters() {
6565
}
6666

6767
@Test
68-
void addPrivate() throws Exception {
68+
void addPrivate() {
6969
SubNetworkAdapter subNetworkAdapter = new SubNetworkAdapter(null, new TSubNetwork());
7070
TPrivate tPrivate = new TPrivate();
7171
tPrivate.setType("Private Type");

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/dtt/BDAAdapterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ protected void completeInit() {
9292
}
9393

9494
@Test
95-
void addPrivate() throws Exception {
95+
void addPrivate() {
9696
init();
9797
DATypeAdapter.BDAAdapter bdaAdapter = new DATypeAdapter.BDAAdapter(sclElementAdapter,sclElement);
9898
TPrivate tPrivate = new TPrivate();

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/ied/IEDAdapterTest.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
import org.lfenergy.compas.sct.commons.scl.SclRootAdapter;
1616
import org.lfenergy.compas.sct.commons.testhelpers.MarshallerWrapper;
1717
import org.lfenergy.compas.sct.commons.testhelpers.SclTestMarshaller;
18+
import org.mockito.Mockito;
1819

1920
import java.util.HashMap;
21+
import java.util.List;
2022
import java.util.Map;
2123

2224
import static org.junit.jupiter.api.Assertions.*;
@@ -228,10 +230,13 @@ void createControlBlock() throws Exception {
228230
}
229231

230232
@Test
231-
void addPrivate() throws Exception {
232-
SCL scd = SclTestMarshaller.getSCLFromFile("/ied-test-schema-conf/ied_unit_test.xml");
233-
SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
234-
IEDAdapter iAdapter = assertDoesNotThrow(() -> sclRootAdapter.getIEDAdapterByName("IED_NAME"));
233+
void addPrivate() {
234+
SclRootAdapter sclRootAdapter = Mockito.mock(SclRootAdapter.class);
235+
SCL scl = Mockito.mock(SCL.class);
236+
Mockito.when(sclRootAdapter.getCurrentElem()).thenReturn(scl);
237+
TIED tied = new TIED();
238+
Mockito.when(scl.getIED()).thenReturn(List.of(tied));
239+
IEDAdapter iAdapter = new IEDAdapter(sclRootAdapter, tied);
235240
TPrivate tPrivate = new TPrivate();
236241
tPrivate.setType("Private Type");
237242
tPrivate.setSource("Private Source");

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/ied/LN0AdapterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ void testHasControlBlockAndAddControlBlock() {
314314
}
315315

316316
@Test
317-
void addPrivate() throws Exception {
317+
void addPrivate() {
318318
LN0 tln = new LN0();
319319
tln.getLnClass().add(TLLN0Enum.LLN_0.value());
320320
LN0Adapter lnAdapter = new LN0Adapter(null,tln);

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/ied/RootSDIAdapterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void testInnerDAIAdapter(){
5858
}
5959

6060
@Test
61-
void addPrivate() throws Exception {
61+
void addPrivate() {
6262
TSDI tsdi = new TSDI();
6363
tsdi.setName("sdo1");
6464
RootSDIAdapter rootSDIAdapter = new RootSDIAdapter(null,tsdi);

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/ied/SDIAdapterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void testInnerDAIAdapter(){
6060
}
6161

6262
@Test
63-
void addPrivate() throws Exception {
63+
void addPrivate() {
6464
TSDI tsdi = new TSDI();
6565
tsdi.setName("sdo1");
6666
SDIAdapter sdiAdapter = new SDIAdapter(null,tsdi);

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/sstation/SubstationAdapterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void testGetVoltageLevelAdapter() {
6464
}
6565

6666
@Test
67-
void addPrivate() throws Exception {
67+
void addPrivate() {
6868
TPrivate tPrivate = new TPrivate();
6969
tPrivate.setType("Private Type");
7070
tPrivate.setSource("Private Source");

sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/sstation/VoltageLevelAdapterTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void testGetBayAdapter() {
6969
}
7070

7171
@Test
72-
void addPrivate() throws Exception {
72+
void addPrivate() {
7373
TPrivate tPrivate = new TPrivate();
7474
tPrivate.setType("Private Type");
7575
tPrivate.setSource("Private Source");

0 commit comments

Comments
 (0)