Ignore created time during CGMES files comparison

Signed-off-by: VEDELAGO MIORA <miora.ralambotiana@rte-france.com>
powsybl · Mar 24, 2022 · 0e74a70 · 0e74a70
1 parent 4587093
commit 0e74a70
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/...s-conversion/src/test/java/com/powsybl/cgmes/conversion/test/export/CgmesMappingTest.java b/...s-conversion/src/test/java/com/powsybl/cgmes/conversion/test/export/CgmesMappingTest.java
@@ -46,7 +46,7 @@ public void compareCgmesAndIidmExports() throws IOException {
     }
 
     @Test
-    public void compare2Exports() throws IOException {
+    public void compare2Exports() throws IOException, InterruptedException {
         String baseName = "nordic32";
         ReadOnlyDataSource dataSource = new ResourceDataSource(baseName, new ResourceSet("/cim14", "nordic32.xiidm"));
         Network network = new XMLImporter().importData(dataSource, NetworkFactory.findDefault(), null);
@@ -65,6 +65,7 @@ private void compareFiles(String export1, String export2) throws IOException {
         }
         DifferenceEvaluator knownDiffs = DifferenceEvaluators.chain(
                 DifferenceEvaluators.Default,
+                ExportXmlCompare::ignoringCreatedTime,
                 ExportXmlCompare::numericDifferenceEvaluator,
                 ExportXmlCompare::ignoringFullModelAbout,
                 ExportXmlCompare::ignoringCurrentLimitIds,

diff --git a/...s-conversion/src/test/java/com/powsybl/cgmes/conversion/test/export/ExportXmlCompare.java b/...s-conversion/src/test/java/com/powsybl/cgmes/conversion/test/export/ExportXmlCompare.java
@@ -290,6 +290,17 @@ static ComparisonResult sameScenarioTime(Comparison comparison, ComparisonResult
         return result;
     }
 
+    static ComparisonResult ignoringCreatedTime(Comparison comparison, ComparisonResult result) {
+        if (result == ComparisonResult.DIFFERENT && comparison.getType() == ComparisonType.TEXT_VALUE) {
+            Node control = comparison.getControlDetails().getTarget();
+            Node test = comparison.getTestDetails().getTarget();
+            if (test != null && control != null && control.getParentNode().getLocalName().equals("Model.created")) {
+                return ComparisonResult.EQUAL;
+            }
+        }
+        return result;
+    }
+
     static ComparisonResult ignoringStaticVarCompensatorDiffq(Comparison comparison, ComparisonResult result) {
         if (result == ComparisonResult.DIFFERENT) {
             Node control = comparison.getControlDetails().getTarget();