feat(#253): RSR-678 Update compas-core to 0.13.0 to use latest Compas…

… XSD file Signed-off-by: massifben <105049157+massifben@users.noreply.github.com>
com-pas · Mar 8, 2023 · d340ad6 · d340ad6
1 parent 22f7265
commit d340ad6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -37,7 +37,7 @@
         <sonar.coverage.exclusions>sct-coverage/**</sonar.coverage.exclusions>
         <aggregate.report.dir>../sct-coverage/target/site/jacoco-aggregate/jacoco.xml</aggregate.report.dir>
         <sonar.coverage.jacoco.xmlReportPaths>${basedir}/${aggregate.report.dir}</sonar.coverage.jacoco.xmlReportPaths>
-        <compas-core.version>0.12.0</compas-core.version>
+        <compas-core.version>0.13.0</compas-core.version>
         <compas-scl-xsd.version>0.0.4</compas-scl-xsd.version>
         <maven.plugin.javadoc>3.4.1</maven.plugin.javadoc>
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>

diff --git a/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/PrivateServiceTest.java b/sct-commons/src/test/java/org/lfenergy/compas/sct/commons/scl/PrivateServiceTest.java
@@ -17,6 +17,7 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.math.BigInteger;
 import java.util.*;
 import java.util.stream.Stream;
 
@@ -479,7 +480,7 @@ void comparePrivateCompasICDHeaders_should_return_true_equality_not_check_for_IE
         TCompasICDHeader compasICDHeader1 = new TCompasICDHeader();
         compasICDHeader1.setIEDName("IED-1");
         compasICDHeader1.setBayLabel("BAY-1");
-        compasICDHeader1.setIEDinstance("1");
+        compasICDHeader1.setIEDSubstationinstance(BigInteger.ONE);
         TCompasICDHeader compasICDHeader2 = new TCompasICDHeader();
         TPrivate tPrivate1 =  PrivateService.createPrivate(compasICDHeader1);
         TPrivate tPrivate2 =  PrivateService.createPrivate(compasICDHeader2);
@@ -496,7 +497,7 @@ void comparePrivateCompasICDHeaders_should_return_false_equality_not_check_for_I
         TCompasICDHeader compasICDHeader1 = new TCompasICDHeader();
         compasICDHeader1.setIEDName("IED-1");
         compasICDHeader1.setBayLabel("BAY-1");
-        compasICDHeader1.setIEDinstance("1");
+        compasICDHeader1.setIEDSubstationinstance(BigInteger.ONE);
         compasICDHeader1.setICDSystemVersionUUID("UUID-1");
         TCompasICDHeader compasICDHeader2 = new TCompasICDHeader();
         compasICDHeader2.setICDSystemVersionUUID("UUID-2");
@@ -515,7 +516,7 @@ void comparePrivateCompasICDHeaders_should_return_true() {
         TCompasICDHeader compasICDHeader1 = new TCompasICDHeader();
         compasICDHeader1.setIEDName("IED-1");
         compasICDHeader1.setBayLabel("BAY-1");
-        compasICDHeader1.setIEDinstance("1");
+        compasICDHeader1.setIEDSubstationinstance(BigInteger.ONE);
         compasICDHeader1.setICDSystemVersionUUID("UUID-1");
         TCompasICDHeader compasICDHeader2 = new TCompasICDHeader();
         compasICDHeader2.setICDSystemVersionUUID("UUID-1");
@@ -537,7 +538,7 @@ void copyCompasICDHeaderFromLNodePrivateIntoSTDPrivate() {
         lNodeCompasICDHeader.setICDSystemVersionUUID("UUID-2");
         lNodeCompasICDHeader.setIEDName("IED-1");
         lNodeCompasICDHeader.setBayLabel("BAY-1");
-        lNodeCompasICDHeader.setIEDinstance("1");
+        lNodeCompasICDHeader.setIEDSubstationinstance(BigInteger.ONE);
         TPrivate stdTPrivate =  PrivateService.createPrivate(stdCompasICDHeader);
         TPrivate lNodePrivate =  PrivateService.createPrivate(lNodeCompasICDHeader);
 
@@ -547,7 +548,7 @@ void copyCompasICDHeaderFromLNodePrivateIntoSTDPrivate() {
         // Then
         TCompasICDHeader result = PrivateService.extractCompasICDHeader(stdTPrivate).get();
         assertThat(result).extracting(TCompasICDHeader::getICDSystemVersionUUID, TCompasICDHeader::getIEDName,
-                TCompasICDHeader::getIEDinstance, TCompasICDHeader::getBayLabel)
+                TCompasICDHeader::getIEDSubstationinstance, TCompasICDHeader::getBayLabel)
                 .containsExactlyInAnyOrder("UUID-2", "IED-1", "1", "BAY-1");
     }
 }