Skip to content

Commit 5407cda

Browse files
AliouDIAITEAliouDIAITE
authored
Merge pull request #207 from com-pas/feature/206_update_compas_core_scl-extension
feat(206): update compas-core dependency and refacto test class MarshallerWrapper
2 parents 930c95b + 45b4e4f commit 5407cda

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+627
-1504
lines changed

‎pom.xml‎

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,36 @@
3737
<sonar.coverage.exclusions>sct-coverage/**</sonar.coverage.exclusions>
3838
<aggregate.report.dir>../sct-coverage/target/site/jacoco-aggregate/jacoco.xml</aggregate.report.dir>
3939
<sonar.coverage.jacoco.xmlReportPaths>${basedir}/${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
40-
<scl-extension.version>0.9.1</scl-extension.version>
40+
<compas-core.version>0.12.0</compas-core.version>
4141
<compas-scl-xsd.version>0.0.4</compas-scl-xsd.version>
4242
<maven.plugin.javadoc>3.4.1</maven.plugin.javadoc>
4343
<maven-source-plugin.version>3.2.1</maven-source-plugin.version>
4444
<junit-version>5.9.0</junit-version>
45+
<logback-classic.version>1.4.5</logback-classic.version>
46+
<assertj.version>3.22.0</assertj.version>
47+
<lombok.version>1.18.24</lombok.version>
4548
</properties>
4649

50+
<dependencies>
51+
<dependency>
52+
<groupId>org.lfenergy.compas.core</groupId>
53+
<artifactId>scl2007b4</artifactId>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.lfenergy.compas.core</groupId>
57+
<artifactId>scl-extension</artifactId>
58+
</dependency>
59+
<dependency>
60+
<groupId>ch.qos.logback</groupId>
61+
<artifactId>logback-classic</artifactId>
62+
</dependency>
63+
</dependencies>
4764
<dependencyManagement>
4865
<dependencies>
4966
<dependency>
5067
<groupId>org.projectlombok</groupId>
5168
<artifactId>lombok</artifactId>
52-
<version>1.18.24</version>
69+
<version>${lombok.version}</version>
5370
</dependency>
5471
<dependency>
5572
<groupId>org.junit.jupiter</groupId>
@@ -72,12 +89,12 @@
7289
<dependency>
7390
<groupId>org.lfenergy.compas.core</groupId>
7491
<artifactId>scl2007b4</artifactId>
75-
<version>0.2.1</version>
92+
<version>${compas-core.version}</version>
7693
</dependency>
7794
<dependency>
7895
<groupId>org.lfenergy.compas.core</groupId>
7996
<artifactId>scl-extension</artifactId>
80-
<version>${scl-extension.version}</version>
97+
<version>${compas-core.version}</version>
8198
</dependency>
8299
<dependency>
83100
<groupId>org.lfenergy.compas.xsd</groupId>
@@ -87,24 +104,15 @@
87104
<dependency>
88105
<groupId>ch.qos.logback</groupId>
89106
<artifactId>logback-classic</artifactId>
90-
<version>1.2.6</version>
107+
<version>${logback-classic.version}</version>
108+
</dependency>
109+
<dependency>
110+
<groupId>org.assertj</groupId>
111+
<artifactId>assertj-core</artifactId>
112+
<version>${assertj.version}</version>
91113
</dependency>
92114
</dependencies>
93115
</dependencyManagement>
94-
<dependencies>
95-
<dependency>
96-
<groupId>org.lfenergy.compas.core</groupId>
97-
<artifactId>scl2007b4</artifactId>
98-
</dependency>
99-
<dependency>
100-
<groupId>org.lfenergy.compas.core</groupId>
101-
<artifactId>scl-extension</artifactId>
102-
</dependency>
103-
<dependency>
104-
<groupId>ch.qos.logback</groupId>
105-
<artifactId>logback-classic</artifactId>
106-
</dependency>
107-
</dependencies>
108116
<modules>
109117
<module>sct-commons</module>
110118
<module>sct-coverage</module>
@@ -123,12 +131,16 @@
123131
<plugin>
124132
<groupId>org.lfenergy.compas.core</groupId>
125133
<artifactId>scl-extension</artifactId>
126-
<version>${scl-extension.version}</version>
134+
<version>${compas-core.version}</version>
127135
</plugin>
128136
<plugin>
129137
<groupId>org.apache.maven.plugins</groupId>
130138
<artifactId>maven-compiler-plugin</artifactId>
131139
<version>3.8.1</version>
140+
<configuration>
141+
<source>${java.version}</source>
142+
<target>${java.version}</target>
143+
</configuration>
132144
</plugin>
133145
<plugin>
134146
<groupId>org.jacoco</groupId>

‎sct-app/pom.xml‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,27 +54,16 @@
5454
<artifactId>junit-jupiter-engine</artifactId>
5555
<scope>test</scope>
5656
</dependency>
57-
<dependency>
58-
<groupId>org.mockito</groupId>
59-
<artifactId>mockito-core</artifactId>
60-
<version>3.6.28</version>
61-
<scope>test</scope>
62-
</dependency>
6357
<dependency>
6458
<groupId>org.assertj</groupId>
6559
<artifactId>assertj-core</artifactId>
66-
<version>3.23.1</version>
6760
</dependency>
6861
</dependencies>
6962
<build>
7063
<plugins>
7164
<plugin>
7265
<groupId>org.apache.maven.plugins</groupId>
7366
<artifactId>maven-compiler-plugin</artifactId>
74-
<configuration>
75-
<source>17</source>
76-
<target>17</target>
77-
</configuration>
7867
</plugin>
7968
<plugin>
8069
<groupId>org.apache.maven.plugins</groupId>
@@ -102,6 +91,7 @@
10291
<plugin>
10392
<groupId>org.apache.maven.plugins</groupId>
10493
<artifactId>maven-dependency-plugin</artifactId>
94+
<version>3.3.0</version>
10595
<executions>
10696
<execution>
10797
<id>unpack</id>
@@ -120,11 +110,6 @@
120110
<groupId>org.lfenergy.compas.core</groupId>
121111
<artifactId>scl-extension</artifactId>
122112
</artifactItem>
123-
<artifactItem>
124-
<groupId>org.lfenergy.compas.core</groupId>
125-
<artifactId>scl-extension</artifactId>
126-
<version>0.8.0</version>
127-
</artifactItem>
128113
</artifactItems>
129114
<outputDirectory>${project.build.directory}</outputDirectory>
130115
</configuration>

‎sct-app/src/test/resources/std_1.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<compas:SystemVersion MainSystemVersion="01.00" MinorSystemVersion="009.001.001"/>
3535
</Private>
3636
<Private type="COMPAS-ICDHeader">
37-
<compas:ICDHeader IEDType="GTW" ICDSystemVersionUUID="b4f8089e-4170-47f1-b6ad-dd1f50885518" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00" headerRevision="01.00.00"/>
37+
<compas:ICDHeader IEDType="SCU" ICDSystemVersionUUID="b4f8089e-4170-47f1-b6ad-dd1f50885518" VendorName="RTE" IEDredundancy="A" IEDmodel="ICDfromModeling" hwRev="01.00.00" swRev="01.00.00" headerId="f8dbc8c1-2db7-4652-a9d6-0b414bdeccfa" headerVersion="01.00.00" headerRevision="01.00.00"/>
3838
</Private>
3939
<Services nameLength="64">
4040
<ConfLNs fixPrefix="true" fixLnInst="true"/>
@@ -341,4 +341,4 @@
341341
<EnumVal ord="24">Y</EnumVal>
342342
</EnumType>
343343
</DataTypeTemplates>
344-
</SCL>
344+
</SCL>

‎sct-commons/pom.xml‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
<properties>
2121
<sonar.coverage.jacoco.xmlReportPaths>${basedir}/${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
2222
<sonar.jacoco.excludes>**/scl2007b4/**/*</sonar.jacoco.excludes>
23-
<assertJ.version>3.22.0</assertJ.version>
24-
<opencsv.version>5.6</opencsv.version>
23+
<opencsv.version>5.7.1</opencsv.version>
2524
<mockito.version>4.9.0</mockito.version>
2625
</properties>
2726

@@ -91,11 +90,6 @@
9190
<version>${mockito.version}</version>
9291
<scope>test</scope>
9392
</dependency>
94-
<dependency>
95-
<groupId>com.fasterxml.jackson.dataformat</groupId>
96-
<artifactId>jackson-dataformat-yaml</artifactId>
97-
<version>2.12.3</version>
98-
</dependency>
9993
<dependency>
10094
<groupId>jakarta.annotation</groupId>
10195
<artifactId>jakarta.annotation-api</artifactId>
@@ -110,7 +104,6 @@
110104
<dependency>
111105
<groupId>org.assertj</groupId>
112106
<artifactId>assertj-core</artifactId>
113-
<version>${assertJ.version}</version>
114107
<scope>test</scope>
115108
</dependency>
116109
<dependency>
@@ -125,10 +118,6 @@
125118
<plugin>
126119
<groupId>org.apache.maven.plugins</groupId>
127120
<artifactId>maven-compiler-plugin</artifactId>
128-
<configuration>
129-
<source>17</source>
130-
<target>17</target>
131-
</configuration>
132121
</plugin>
133122
<plugin>
134123
<groupId>org.apache.maven.plugins</groupId>
@@ -161,6 +150,7 @@
161150
<plugin>
162151
<groupId>org.apache.maven.plugins</groupId>
163152
<artifactId>maven-dependency-plugin</artifactId>
153+
<version>3.3.0</version>
164154
<executions>
165155
<execution>
166156
<id>unpack</id>
@@ -179,11 +169,6 @@
179169
<groupId>org.lfenergy.compas.core</groupId>
180170
<artifactId>scl-extension</artifactId>
181171
</artifactItem>
182-
<artifactItem>
183-
<groupId>org.lfenergy.compas.core</groupId>
184-
<artifactId>scl-extension</artifactId>
185-
<version>0.8.0</version>
186-
</artifactItem>
187172
</artifactItems>
188173
<outputDirectory>${project.build.directory}</outputDirectory>
189174
</configuration>

‎sct-commons/src/main/resources/jaxb-marshaller-config.yml‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ void testAddLDevice(){
4545
assertTrue(iedDTO.getLDeviceDTO(DTO.HOLDER_LD_INST).isPresent());
4646
}
4747

48-
}
48+
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import org.lfenergy.compas.sct.commons.dto.*;
1515
import org.lfenergy.compas.sct.commons.exception.ScdException;
1616
import org.lfenergy.compas.sct.commons.scl.ied.*;
17+
import org.lfenergy.compas.sct.commons.testhelpers.MarshallerWrapper;
1718
import org.lfenergy.compas.sct.commons.testhelpers.SclTestMarshaller;
1819

1920
import java.util.*;
@@ -26,7 +27,6 @@
2627
import static org.lfenergy.compas.sct.commons.testhelpers.DataTypeUtils.createDa;
2728
import static org.lfenergy.compas.sct.commons.testhelpers.DataTypeUtils.createDo;
2829
import static org.lfenergy.compas.sct.commons.testhelpers.SclTestMarshaller.assertIsMarshallable;
29-
import static org.lfenergy.compas.sct.commons.testhelpers.marshaller.SclTestMarshaller.createWrapper;
3030
import static org.lfenergy.compas.sct.commons.util.PrivateEnum.COMPAS_SCL_FILE_TYPE;
3131

3232
class SclServiceTest {
@@ -700,8 +700,8 @@ void testImportSTDElementsInSCD() throws Exception {
700700
void testImportSTDElementsInSCD_with_Multiple_STD() throws Exception {
701701
SCL scd = SclTestMarshaller.getSCLFromFile("/scd-ied-dtt-com-import-stds/scd_lnode_with_many_compas_icdheader.xml");
702702
SCL std0 = SclTestMarshaller.getSCLFromFile("/scd-ied-dtt-com-import-stds/std.xml");
703-
SCL std1 = SclTestMarshaller.getSCLFromFile("/scd-ied-dtt-com-import-stds/std_SITESITE1GTW1.xml");
704-
SCL std2 = SclTestMarshaller.getSCLFromFile("/scd-ied-dtt-com-import-stds/std_SITESITE1GTW2.xml");
703+
SCL std1 = SclTestMarshaller.getSCLFromFile("/scd-ied-dtt-com-import-stds/std_SITESITE1SCU1.xml");
704+
SCL std2 = SclTestMarshaller.getSCLFromFile("/scd-ied-dtt-com-import-stds/std_SITESITE1SCU2.xml");
705705
SclRootAdapter scdRootAdapter = new SclRootAdapter(scd);
706706

707707
SclRootAdapter expectedScdAdapter = assertDoesNotThrow( () -> SclService.importSTDElementsInSCD(
@@ -835,11 +835,11 @@ void updateLDeviceStatus_shouldReturnReportWithError_MissingRequiredObject(Strin
835835
// Given
836836
assertTrue(getLDeviceStatusValue(scl, "IedName1", "LDSUIED").isPresent());
837837
assertEquals("off", getLDeviceStatusValue(scl, "IedName1", "LDSUIED").get().getValue());
838-
String before = createWrapper().marshall(scl);
838+
String before = MarshallerWrapper.marshall(scl);
839839
// When
840840
SclReport sclReport = SclService.updateLDeviceStatus(scl);
841841
// Then
842-
String after = createWrapper().marshall(sclReport.getSclRootAdapter().getCurrentElem());
842+
String after = MarshallerWrapper.marshall(sclReport.getSclRootAdapter().getCurrentElem());
843843
assertFalse(sclReport.isSuccess());
844844
assertThat(sclReport.getSclReportItems())
845845
.hasSize(1)
@@ -888,11 +888,11 @@ void updateLDeviceStatus_shouldReturnReportWithError_WhenLDeviceStatusActiveOrUn
888888
assertEquals("off", getLDeviceStatusValue(scl, "IedName1", "LDSUIED").get().getValue());
889889
assertEquals("on", getLDeviceStatusValue(scl, "IedName2", "LDSUIED").get().getValue());
890890
assertFalse(getLDeviceStatusValue(scl, "IedName3", "LDSUIED").isPresent());
891-
String before = createWrapper().marshall(scl);
891+
String before = MarshallerWrapper.marshall(scl);
892892
// When
893893
SclReport sclReport = SclService.updateLDeviceStatus(scl);
894894
// Then
895-
String after = createWrapper().marshall(sclReport.getSclRootAdapter().getCurrentElem());
895+
String after = MarshallerWrapper.marshall(sclReport.getSclRootAdapter().getCurrentElem());
896896
assertFalse(sclReport.isSuccess());
897897
assertThat(sclReport.getSclReportItems())
898898
.hasSize(3)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void testAmChildElementRef() {
4545
}
4646

4747
@Test
48-
void addPrivate() throws Exception {
48+
void addPrivate() {
4949
ConnectedAPAdapter connectedAPAdapter = subNetworkAdapter.getConnectedAPAdapter(DTO.HOLDER_IED_NAME, DTO.AP_NAME);
5050
TPrivate tPrivate = new TPrivate();
5151
tPrivate.setType("Private Type");
@@ -107,4 +107,4 @@ void elementXPath(String iedName, String apName, String message) {
107107
assertThat(elementXPath).isEqualTo(message);
108108
}
109109

110-
}
110+
}

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

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44

55
package org.lfenergy.compas.sct.commons.scl.dtt;
66

7-
import org.apache.commons.io.IOUtils;
87
import org.lfenergy.compas.scl2007b4.model.SCL;
98
import org.lfenergy.compas.scl2007b4.model.TDataTypeTemplates;
10-
import org.lfenergy.compas.sct.commons.testhelpers.MarshallerWrapper;
119
import org.lfenergy.compas.sct.commons.scl.SclElementAdapter;
1210
import org.lfenergy.compas.sct.commons.scl.SclRootAdapter;
11+
import org.lfenergy.compas.sct.commons.testhelpers.SclTestMarshaller;
1312
import org.mockito.Mockito;
1413

1514

@@ -26,7 +25,7 @@ public void init(){
2625
}
2726

2827
protected static DataTypeTemplateAdapter initDttAdapterFromFile(String fileName) throws Exception {
29-
SCL scd = AbstractDTTLevel.getSCLFromFile(fileName);
28+
SCL scd = SclTestMarshaller.getSCLFromFile(fileName);
3029
SclRootAdapter sclRootAdapter = new SclRootAdapter(scd);
3130
return new DataTypeTemplateAdapter(
3231
sclRootAdapter,
@@ -43,15 +42,4 @@ protected SclElementAdapter getMockedSclParentAdapter(){
4342
}
4443
protected abstract void completeInit() ;
4544

46-
public static SCL getSCLFromFile(String filename) throws Exception {
47-
MarshallerWrapper marshallerWrapper = createWrapper();
48-
byte[] rawXml = IOUtils.resourceToByteArray(filename);
49-
return marshallerWrapper.unmarshall(rawXml,SCL.class);
50-
}
51-
52-
public static MarshallerWrapper createWrapper() {
53-
return MarshallerWrapper.builder()
54-
.withProperties("classpath:scl_schema.yml")
55-
.build();
56-
}
5745
}

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -340,9 +340,8 @@ void testImportLNodeType() throws Exception {
340340
assertTrue(nbLNodeType < rcvDttAdapter.getLNodeTypeAdapters().size());
341341
assertFalse(mapOldNewId.isEmpty());
342342

343-
MarshallerWrapper marshallerWrapper = AbstractDTTLevel.createWrapper();
344-
System.out.println(marshallerWrapper.marshall(rcvDttAdapter.getParentAdapter().getCurrentElem()));
345-
System.out.println(marshallerWrapper.marshall(prvDttAdapter.getParentAdapter().getCurrentElem()));
343+
System.out.println(MarshallerWrapper.marshall(rcvDttAdapter.getParentAdapter().getCurrentElem()));
344+
System.out.println(MarshallerWrapper.marshall(prvDttAdapter.getParentAdapter().getCurrentElem()));
346345
}
347346

348347
@Test
@@ -358,9 +357,8 @@ void testImportDOType() throws Exception {
358357
rcvDttAdapter.importDOType("IEDName",prvDttAdapter);
359358
assertTrue(nbDOType < rcvDttAdapter.getDOTypeAdapters().size());
360359

361-
MarshallerWrapper marshallerWrapper = AbstractDTTLevel.createWrapper();
362-
System.out.println(marshallerWrapper.marshall(rcvDttAdapter.getParentAdapter().getCurrentElem()));
363-
System.out.println(marshallerWrapper.marshall(prvDttAdapter.getParentAdapter().getCurrentElem()));
360+
System.out.println(MarshallerWrapper.marshall(rcvDttAdapter.getParentAdapter().getCurrentElem()));
361+
System.out.println(MarshallerWrapper.marshall(prvDttAdapter.getParentAdapter().getCurrentElem()));
364362
}
365363

366364
@Test
@@ -375,9 +373,8 @@ void testImportDAType() throws Exception {
375373

376374
rcvDttAdapter.importDAType("IEDName",prvDttAdapter);
377375
assertTrue(nbDAType < rcvDttAdapter.getDATypeAdapters().size());
378-
MarshallerWrapper marshallerWrapper = AbstractDTTLevel.createWrapper();
379-
System.out.println(marshallerWrapper.marshall(prvDttAdapter.getParentAdapter().getCurrentElem()));
380-
System.out.println(marshallerWrapper.marshall(rcvDttAdapter.getParentAdapter().getCurrentElem()));
376+
System.out.println(MarshallerWrapper.marshall(prvDttAdapter.getParentAdapter().getCurrentElem()));
377+
System.out.println(MarshallerWrapper.marshall(rcvDttAdapter.getParentAdapter().getCurrentElem()));
381378
}
382379

383380
@ParameterizedTest

0 commit comments

Comments
 (0)