From a6c158ca9864e866cc4f5c5aea2025fd8d104e8e Mon Sep 17 00:00:00 2001 From: Florian Dupuy <66690739+flo-dup@users.noreply.github.com> Date: Mon, 13 Jun 2022 15:01:28 +0200 Subject: [PATCH 1/2] Display NaN values in FeederInfo as dash character (#399) * Transform NaN values into - character on FeederInfo * Update test references Signed-off-by: Florian Dupuy --- .../sld/svg/DirectionalFeederInfo.java | 13 ++- .../resources/InternalBranchesBusBreaker.svg | 48 ++++---- .../resources/InternalBranchesNodeBreaker.svg | 36 +++--- .../NodeDecoratorsBranchStatusBusBreaker.svg | 48 ++++---- .../NodeDecoratorsBranchStatusNodeBreaker.svg | 40 +++---- .../test/resources/NodeDecoratorsSwitches.svg | 36 +++--- .../TestCase11SubstationGraphHFirst.svg | 108 +++++++++--------- .../TestCase11SubstationGraphHLast.svg | 108 +++++++++--------- .../TestCase11SubstationGraphHMiddle.svg | 108 +++++++++--------- .../TestCase11SubstationGraphHNone.svg | 108 +++++++++--------- ...ase12GraphWithNodesInfosNominalVoltage.svg | 60 +++++----- ...stCase12GraphWithNodesInfosTopological.svg | 60 +++++----- .../resources/TestCase14UpToNFeederInfos.svg | 2 +- .../TestCase15GraphWithVoltageIndicator.svg | 16 +-- ...15GraphWithVoltageIndicatorTopological.svg | 16 +-- ...TestCase15GraphWithoutVoltageIndicator.svg | 16 +-- .../test/resources/TestCaseFictitiousBus.svg | 12 +- .../TestCaseFictitiousBusTopological.svg | 12 +- .../test/resources/TestSldClassSubstation.svg | 16 +-- .../src/test/resources/TestSldClassVl.svg | 8 +- .../src/test/resources/consecutive_shunts.svg | 8 +- .../src/test/resources/feederInfoTest.svg | 4 +- .../topological_style_substation.svg | 24 ++-- 23 files changed, 455 insertions(+), 452 deletions(-) diff --git a/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DirectionalFeederInfo.java b/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DirectionalFeederInfo.java index e7ad5374d..9ce605675 100644 --- a/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DirectionalFeederInfo.java +++ b/single-line-diagram-core/src/main/java/com/powsybl/sld/svg/DirectionalFeederInfo.java @@ -33,14 +33,17 @@ public DirectionalFeederInfo(String componentType, double value, int precision) } public DirectionalFeederInfo(String componentType, double value, int precision, String userDefinedId) { - this(componentType, - value > 0 ? DiagramLabelProvider.LabelDirection.OUT : DiagramLabelProvider.LabelDirection.IN, - null, - format(value, precision), - userDefinedId); + this(componentType, getArrowDirection(value), null, format(value, precision), userDefinedId); + } + + private static DiagramLabelProvider.LabelDirection getArrowDirection(double value) { + return value > 0 ? DiagramLabelProvider.LabelDirection.OUT : DiagramLabelProvider.LabelDirection.IN; } private static String format(double value, int precision) { + if (Double.isNaN(value)) { + return "-"; + } DecimalFormat format = new DecimalFormat(); format.setMaximumFractionDigits(precision); // Floating representation with point diff --git a/single-line-diagram-core/src/test/resources/InternalBranchesBusBreaker.svg b/single-line-diagram-core/src/test/resources/InternalBranchesBusBreaker.svg index fcc9888f2..6c26881b6 100644 --- a/single-line-diagram-core/src/test/resources/InternalBranchesBusBreaker.svg +++ b/single-line-diagram-core/src/test/resources/InternalBranchesBusBreaker.svg @@ -158,12 +158,12 @@ - NaN + - - NaN + - @@ -191,12 +191,12 @@ - NaN + - - NaN + - @@ -224,12 +224,12 @@ - NaN + - - NaN + - @@ -257,12 +257,12 @@ - NaN + - - NaN + - @@ -290,12 +290,12 @@ - NaN + - - NaN + - @@ -303,12 +303,12 @@ - NaN + - - NaN + - @@ -344,12 +344,12 @@ - NaN + - - NaN + - @@ -377,12 +377,12 @@ - NaN + - - NaN + - @@ -410,12 +410,12 @@ - NaN + - - NaN + - @@ -445,12 +445,12 @@ - NaN + - - NaN + - @@ -478,12 +478,12 @@ - NaN + - - NaN + - @@ -491,12 +491,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreaker.svg b/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreaker.svg index dddbe0829..71784a427 100644 --- a/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreaker.svg +++ b/single-line-diagram-core/src/test/resources/InternalBranchesNodeBreaker.svg @@ -149,12 +149,12 @@ - NaN + - - NaN + - @@ -190,12 +190,12 @@ - NaN + - - NaN + - @@ -231,12 +231,12 @@ - NaN + - - NaN + - @@ -313,12 +313,12 @@ - NaN + - - NaN + - @@ -326,12 +326,12 @@ - NaN + - - NaN + - @@ -375,12 +375,12 @@ - NaN + - - NaN + - @@ -416,12 +416,12 @@ - NaN + - - NaN + - @@ -541,12 +541,12 @@ - NaN + - - NaN + - @@ -554,12 +554,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusBusBreaker.svg b/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusBusBreaker.svg index 3d8cdef2c..5e6ddf278 100644 --- a/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusBusBreaker.svg +++ b/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusBusBreaker.svg @@ -144,12 +144,12 @@ - NaN + - - NaN + - @@ -180,12 +180,12 @@ - NaN + - - NaN + - @@ -216,12 +216,12 @@ - NaN + - - NaN + - @@ -252,12 +252,12 @@ - NaN + - - NaN + - @@ -285,12 +285,12 @@ - NaN + - - NaN + - @@ -298,12 +298,12 @@ - NaN + - - NaN + - @@ -342,12 +342,12 @@ - NaN + - - NaN + - @@ -378,12 +378,12 @@ - NaN + - - NaN + - @@ -414,12 +414,12 @@ - NaN + - - NaN + - @@ -452,12 +452,12 @@ - NaN + - - NaN + - @@ -485,12 +485,12 @@ - NaN + - - NaN + - @@ -498,12 +498,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusNodeBreaker.svg b/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusNodeBreaker.svg index 10dce608a..d49746be6 100644 --- a/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusNodeBreaker.svg +++ b/single-line-diagram-core/src/test/resources/NodeDecoratorsBranchStatusNodeBreaker.svg @@ -163,12 +163,12 @@ - NaN + - - NaN + - @@ -207,12 +207,12 @@ - NaN + - - NaN + - @@ -251,12 +251,12 @@ - NaN + - - NaN + - @@ -339,12 +339,12 @@ - NaN + - - NaN + - @@ -383,12 +383,12 @@ - NaN + - - NaN + - @@ -427,12 +427,12 @@ - NaN + - - NaN + - @@ -559,12 +559,12 @@ - NaN + - - NaN + - @@ -623,12 +623,12 @@ - NaN + - - NaN + - @@ -667,12 +667,12 @@ - NaN + - - NaN + - @@ -755,12 +755,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/NodeDecoratorsSwitches.svg b/single-line-diagram-core/src/test/resources/NodeDecoratorsSwitches.svg index 2a0394cff..8ab43dd5e 100644 --- a/single-line-diagram-core/src/test/resources/NodeDecoratorsSwitches.svg +++ b/single-line-diagram-core/src/test/resources/NodeDecoratorsSwitches.svg @@ -158,12 +158,12 @@ - NaN + - - NaN + - @@ -205,12 +205,12 @@ - NaN + - - NaN + - @@ -252,12 +252,12 @@ - NaN + - - NaN + - @@ -346,12 +346,12 @@ - NaN + - - NaN + - @@ -359,12 +359,12 @@ - NaN + - - NaN + - @@ -414,12 +414,12 @@ - NaN + - - NaN + - @@ -461,12 +461,12 @@ - NaN + - - NaN + - @@ -604,12 +604,12 @@ - NaN + - - NaN + - @@ -617,12 +617,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHFirst.svg b/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHFirst.svg index 5d1015449..8854d6718 100644 --- a/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHFirst.svg +++ b/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHFirst.svg @@ -304,12 +304,12 @@ - NaN + - - NaN + - @@ -345,12 +345,12 @@ - NaN + - - NaN + - @@ -386,12 +386,12 @@ - NaN + - - NaN + - @@ -427,12 +427,12 @@ - NaN + - - NaN + - @@ -468,12 +468,12 @@ - NaN + - - NaN + - @@ -512,12 +512,12 @@ - NaN + - - NaN + - @@ -553,12 +553,12 @@ - NaN + - - NaN + - @@ -594,12 +594,12 @@ - NaN + - - NaN + - @@ -638,12 +638,12 @@ - NaN + - - NaN + - @@ -679,12 +679,12 @@ - NaN + - - NaN + - @@ -720,12 +720,12 @@ - NaN + - - NaN + - @@ -764,12 +764,12 @@ - NaN + - - NaN + - @@ -805,12 +805,12 @@ - NaN + - - NaN + - @@ -892,12 +892,12 @@ - NaN + - - NaN + - @@ -933,12 +933,12 @@ - NaN + - - NaN + - @@ -974,12 +974,12 @@ - NaN + - - NaN + - @@ -1015,12 +1015,12 @@ - NaN + - - NaN + - @@ -1059,12 +1059,12 @@ - NaN + - - NaN + - @@ -1100,12 +1100,12 @@ - NaN + - - NaN + - @@ -1141,12 +1141,12 @@ - NaN + - - NaN + - @@ -1182,12 +1182,12 @@ - NaN + - - NaN + - @@ -1223,12 +1223,12 @@ - NaN + - - NaN + - @@ -1274,12 +1274,12 @@ - NaN + - - NaN + - @@ -1315,12 +1315,12 @@ - NaN + - - NaN + - @@ -1356,12 +1356,12 @@ - NaN + - - NaN + - @@ -1397,12 +1397,12 @@ - NaN + - - NaN + - @@ -1438,12 +1438,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHLast.svg b/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHLast.svg index 4cc2c499c..6f3851822 100644 --- a/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHLast.svg +++ b/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHLast.svg @@ -304,12 +304,12 @@ - NaN + - - NaN + - @@ -345,12 +345,12 @@ - NaN + - - NaN + - @@ -386,12 +386,12 @@ - NaN + - - NaN + - @@ -427,12 +427,12 @@ - NaN + - - NaN + - @@ -468,12 +468,12 @@ - NaN + - - NaN + - @@ -512,12 +512,12 @@ - NaN + - - NaN + - @@ -553,12 +553,12 @@ - NaN + - - NaN + - @@ -594,12 +594,12 @@ - NaN + - - NaN + - @@ -638,12 +638,12 @@ - NaN + - - NaN + - @@ -679,12 +679,12 @@ - NaN + - - NaN + - @@ -720,12 +720,12 @@ - NaN + - - NaN + - @@ -764,12 +764,12 @@ - NaN + - - NaN + - @@ -805,12 +805,12 @@ - NaN + - - NaN + - @@ -892,12 +892,12 @@ - NaN + - - NaN + - @@ -933,12 +933,12 @@ - NaN + - - NaN + - @@ -974,12 +974,12 @@ - NaN + - - NaN + - @@ -1015,12 +1015,12 @@ - NaN + - - NaN + - @@ -1059,12 +1059,12 @@ - NaN + - - NaN + - @@ -1100,12 +1100,12 @@ - NaN + - - NaN + - @@ -1141,12 +1141,12 @@ - NaN + - - NaN + - @@ -1182,12 +1182,12 @@ - NaN + - - NaN + - @@ -1223,12 +1223,12 @@ - NaN + - - NaN + - @@ -1274,12 +1274,12 @@ - NaN + - - NaN + - @@ -1315,12 +1315,12 @@ - NaN + - - NaN + - @@ -1356,12 +1356,12 @@ - NaN + - - NaN + - @@ -1397,12 +1397,12 @@ - NaN + - - NaN + - @@ -1438,12 +1438,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHMiddle.svg b/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHMiddle.svg index 8e04b4d75..1d4cac968 100644 --- a/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHMiddle.svg +++ b/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHMiddle.svg @@ -304,12 +304,12 @@ - NaN + - - NaN + - @@ -345,12 +345,12 @@ - NaN + - - NaN + - @@ -386,12 +386,12 @@ - NaN + - - NaN + - @@ -427,12 +427,12 @@ - NaN + - - NaN + - @@ -468,12 +468,12 @@ - NaN + - - NaN + - @@ -512,12 +512,12 @@ - NaN + - - NaN + - @@ -553,12 +553,12 @@ - NaN + - - NaN + - @@ -594,12 +594,12 @@ - NaN + - - NaN + - @@ -638,12 +638,12 @@ - NaN + - - NaN + - @@ -679,12 +679,12 @@ - NaN + - - NaN + - @@ -720,12 +720,12 @@ - NaN + - - NaN + - @@ -764,12 +764,12 @@ - NaN + - - NaN + - @@ -805,12 +805,12 @@ - NaN + - - NaN + - @@ -892,12 +892,12 @@ - NaN + - - NaN + - @@ -933,12 +933,12 @@ - NaN + - - NaN + - @@ -974,12 +974,12 @@ - NaN + - - NaN + - @@ -1015,12 +1015,12 @@ - NaN + - - NaN + - @@ -1059,12 +1059,12 @@ - NaN + - - NaN + - @@ -1100,12 +1100,12 @@ - NaN + - - NaN + - @@ -1141,12 +1141,12 @@ - NaN + - - NaN + - @@ -1182,12 +1182,12 @@ - NaN + - - NaN + - @@ -1223,12 +1223,12 @@ - NaN + - - NaN + - @@ -1274,12 +1274,12 @@ - NaN + - - NaN + - @@ -1315,12 +1315,12 @@ - NaN + - - NaN + - @@ -1356,12 +1356,12 @@ - NaN + - - NaN + - @@ -1397,12 +1397,12 @@ - NaN + - - NaN + - @@ -1438,12 +1438,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHNone.svg b/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHNone.svg index 5d1015449..8854d6718 100644 --- a/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHNone.svg +++ b/single-line-diagram-core/src/test/resources/TestCase11SubstationGraphHNone.svg @@ -304,12 +304,12 @@ - NaN + - - NaN + - @@ -345,12 +345,12 @@ - NaN + - - NaN + - @@ -386,12 +386,12 @@ - NaN + - - NaN + - @@ -427,12 +427,12 @@ - NaN + - - NaN + - @@ -468,12 +468,12 @@ - NaN + - - NaN + - @@ -512,12 +512,12 @@ - NaN + - - NaN + - @@ -553,12 +553,12 @@ - NaN + - - NaN + - @@ -594,12 +594,12 @@ - NaN + - - NaN + - @@ -638,12 +638,12 @@ - NaN + - - NaN + - @@ -679,12 +679,12 @@ - NaN + - - NaN + - @@ -720,12 +720,12 @@ - NaN + - - NaN + - @@ -764,12 +764,12 @@ - NaN + - - NaN + - @@ -805,12 +805,12 @@ - NaN + - - NaN + - @@ -892,12 +892,12 @@ - NaN + - - NaN + - @@ -933,12 +933,12 @@ - NaN + - - NaN + - @@ -974,12 +974,12 @@ - NaN + - - NaN + - @@ -1015,12 +1015,12 @@ - NaN + - - NaN + - @@ -1059,12 +1059,12 @@ - NaN + - - NaN + - @@ -1100,12 +1100,12 @@ - NaN + - - NaN + - @@ -1141,12 +1141,12 @@ - NaN + - - NaN + - @@ -1182,12 +1182,12 @@ - NaN + - - NaN + - @@ -1223,12 +1223,12 @@ - NaN + - - NaN + - @@ -1274,12 +1274,12 @@ - NaN + - - NaN + - @@ -1315,12 +1315,12 @@ - NaN + - - NaN + - @@ -1356,12 +1356,12 @@ - NaN + - - NaN + - @@ -1397,12 +1397,12 @@ - NaN + - - NaN + - @@ -1438,12 +1438,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosNominalVoltage.svg b/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosNominalVoltage.svg index 07757b399..93a08e55a 100644 --- a/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosNominalVoltage.svg +++ b/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosNominalVoltage.svg @@ -205,12 +205,12 @@ - NaN + - - NaN + - @@ -248,12 +248,12 @@ - NaN + - - NaN + - @@ -291,12 +291,12 @@ - NaN + - - NaN + - @@ -332,12 +332,12 @@ - NaN + - - NaN + - @@ -345,12 +345,12 @@ - NaN + - - NaN + - @@ -394,12 +394,12 @@ - NaN + - - NaN + - @@ -437,12 +437,12 @@ - NaN + - - NaN + - @@ -478,12 +478,12 @@ - NaN + - - NaN + - @@ -491,12 +491,12 @@ - NaN + - - NaN + - @@ -540,12 +540,12 @@ - NaN + - - NaN + - @@ -583,12 +583,12 @@ - NaN + - - NaN + - @@ -624,12 +624,12 @@ - NaN + - - NaN + - @@ -637,12 +637,12 @@ - NaN + - - NaN + - @@ -686,12 +686,12 @@ - NaN + - - NaN + - @@ -729,12 +729,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosTopological.svg b/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosTopological.svg index 1ec8b3e76..5be1cebf0 100644 --- a/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosTopological.svg +++ b/single-line-diagram-core/src/test/resources/TestCase12GraphWithNodesInfosTopological.svg @@ -269,12 +269,12 @@ - NaN + - - NaN + - @@ -312,12 +312,12 @@ - NaN + - - NaN + - @@ -355,12 +355,12 @@ - NaN + - - NaN + - @@ -396,12 +396,12 @@ - NaN + - - NaN + - @@ -409,12 +409,12 @@ - NaN + - - NaN + - @@ -458,12 +458,12 @@ - NaN + - - NaN + - @@ -501,12 +501,12 @@ - NaN + - - NaN + - @@ -542,12 +542,12 @@ - NaN + - - NaN + - @@ -555,12 +555,12 @@ - NaN + - - NaN + - @@ -604,12 +604,12 @@ - NaN + - - NaN + - @@ -647,12 +647,12 @@ - NaN + - - NaN + - @@ -688,12 +688,12 @@ - NaN + - - NaN + - @@ -701,12 +701,12 @@ - NaN + - - NaN + - @@ -750,12 +750,12 @@ - NaN + - - NaN + - @@ -793,12 +793,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/TestCase14UpToNFeederInfos.svg b/single-line-diagram-core/src/test/resources/TestCase14UpToNFeederInfos.svg index 95c43979a..33e53baaf 100644 --- a/single-line-diagram-core/src/test/resources/TestCase14UpToNFeederInfos.svg +++ b/single-line-diagram-core/src/test/resources/TestCase14UpToNFeederInfos.svg @@ -105,7 +105,7 @@ - NaN + - diff --git a/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicator.svg b/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicator.svg index 643bea1ba..7d2d10cde 100644 --- a/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicator.svg +++ b/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicator.svg @@ -142,12 +142,12 @@ - NaN + - - NaN + - @@ -196,12 +196,12 @@ - NaN + - - NaN + - @@ -262,12 +262,12 @@ - NaN + - - NaN + - @@ -302,12 +302,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicatorTopological.svg b/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicatorTopological.svg index a98182b71..ad9d4918b 100644 --- a/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicatorTopological.svg +++ b/single-line-diagram-core/src/test/resources/TestCase15GraphWithVoltageIndicatorTopological.svg @@ -232,12 +232,12 @@ - NaN + - - NaN + - @@ -286,12 +286,12 @@ - NaN + - - NaN + - @@ -352,12 +352,12 @@ - NaN + - - NaN + - @@ -392,12 +392,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/TestCase15GraphWithoutVoltageIndicator.svg b/single-line-diagram-core/src/test/resources/TestCase15GraphWithoutVoltageIndicator.svg index 93958ae22..62b685463 100644 --- a/single-line-diagram-core/src/test/resources/TestCase15GraphWithoutVoltageIndicator.svg +++ b/single-line-diagram-core/src/test/resources/TestCase15GraphWithoutVoltageIndicator.svg @@ -126,12 +126,12 @@ - NaN + - - NaN + - @@ -180,12 +180,12 @@ - NaN + - - NaN + - @@ -246,12 +246,12 @@ - NaN + - - NaN + - @@ -286,12 +286,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/TestCaseFictitiousBus.svg b/single-line-diagram-core/src/test/resources/TestCaseFictitiousBus.svg index 00a927b16..20df83d1d 100644 --- a/single-line-diagram-core/src/test/resources/TestCaseFictitiousBus.svg +++ b/single-line-diagram-core/src/test/resources/TestCaseFictitiousBus.svg @@ -95,12 +95,12 @@ - NaN + - - NaN + - @@ -128,12 +128,12 @@ - NaN + - - NaN + - @@ -161,12 +161,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/TestCaseFictitiousBusTopological.svg b/single-line-diagram-core/src/test/resources/TestCaseFictitiousBusTopological.svg index 117b49502..83d6cefa6 100644 --- a/single-line-diagram-core/src/test/resources/TestCaseFictitiousBusTopological.svg +++ b/single-line-diagram-core/src/test/resources/TestCaseFictitiousBusTopological.svg @@ -173,12 +173,12 @@ - NaN + - - NaN + - @@ -206,12 +206,12 @@ - NaN + - - NaN + - @@ -239,12 +239,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/TestSldClassSubstation.svg b/single-line-diagram-core/src/test/resources/TestSldClassSubstation.svg index 5ae2d2ca4..aa759b300 100644 --- a/single-line-diagram-core/src/test/resources/TestSldClassSubstation.svg +++ b/single-line-diagram-core/src/test/resources/TestSldClassSubstation.svg @@ -171,12 +171,12 @@ - NaN + - - NaN + - @@ -212,12 +212,12 @@ - NaN + - - NaN + - @@ -263,12 +263,12 @@ - NaN + - - NaN + - @@ -304,12 +304,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/TestSldClassVl.svg b/single-line-diagram-core/src/test/resources/TestSldClassVl.svg index 68bb1b1ea..5a6700445 100644 --- a/single-line-diagram-core/src/test/resources/TestSldClassVl.svg +++ b/single-line-diagram-core/src/test/resources/TestSldClassVl.svg @@ -168,12 +168,12 @@ - NaN + - - NaN + - @@ -211,12 +211,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/consecutive_shunts.svg b/single-line-diagram-core/src/test/resources/consecutive_shunts.svg index 7e31efda7..5a048f85c 100644 --- a/single-line-diagram-core/src/test/resources/consecutive_shunts.svg +++ b/single-line-diagram-core/src/test/resources/consecutive_shunts.svg @@ -690,7 +690,7 @@ - NaN + - @@ -1130,7 +1130,7 @@ - NaN + - @@ -1173,7 +1173,7 @@ - NaN + - @@ -1253,7 +1253,7 @@ - NaN + - diff --git a/single-line-diagram-core/src/test/resources/feederInfoTest.svg b/single-line-diagram-core/src/test/resources/feederInfoTest.svg index 509db66b3..ea3905faa 100644 --- a/single-line-diagram-core/src/test/resources/feederInfoTest.svg +++ b/single-line-diagram-core/src/test/resources/feederInfoTest.svg @@ -174,12 +174,12 @@ - NaN + - - NaN + - diff --git a/single-line-diagram-core/src/test/resources/topological_style_substation.svg b/single-line-diagram-core/src/test/resources/topological_style_substation.svg index 7b35c8e55..c03695ed0 100644 --- a/single-line-diagram-core/src/test/resources/topological_style_substation.svg +++ b/single-line-diagram-core/src/test/resources/topological_style_substation.svg @@ -204,12 +204,12 @@ - NaN + - - NaN + - @@ -245,12 +245,12 @@ - NaN + - - NaN + - @@ -286,12 +286,12 @@ - NaN + - - NaN + - @@ -334,12 +334,12 @@ - NaN + - - NaN + - @@ -375,12 +375,12 @@ - NaN + - - NaN + - @@ -423,12 +423,12 @@ - NaN + - - NaN + - From 09935b6e882cf8041e93ea1dccfee8900fe4d180 Mon Sep 17 00:00:00 2001 From: Florian Dupuy <66690739+flo-dup@users.noreply.github.com> Date: Mon, 13 Jun 2022 16:03:59 +0200 Subject: [PATCH 2/2] Bump powsybl-core to 4.9.0 (#397) * Bump powsybl-core to 4.9.0 * Update following Mockito update * Update reference iidm files from 1.7 to 1.8 Signed-off-by: Florian Dupuy --- pom.xml | 2 +- .../dl/conversion/AbstractCgmesDLExporterTest.java | 13 ++++++------- .../src/test/resources/branchStatusRef.xml | 2 +- .../src/test/resources/busbarSectionPositionRef.xml | 2 +- .../src/test/resources/connectablePositionRef.xml | 2 +- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index e4270f63d..a098a5abd 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ **/generated/**/* - 4.8.0 + 4.9.0 diff --git a/single-line-diagram-cgmes/single-line-diagram-cgmes-dl-conversion/src/test/java/com/powsybl/sld/cgmes/dl/conversion/AbstractCgmesDLExporterTest.java b/single-line-diagram-cgmes/single-line-diagram-cgmes-dl-conversion/src/test/java/com/powsybl/sld/cgmes/dl/conversion/AbstractCgmesDLExporterTest.java index a9ed3363f..1f2cd35dd 100644 --- a/single-line-diagram-cgmes/single-line-diagram-cgmes-dl-conversion/src/test/java/com/powsybl/sld/cgmes/dl/conversion/AbstractCgmesDLExporterTest.java +++ b/single-line-diagram-cgmes/single-line-diagram-cgmes-dl-conversion/src/test/java/com/powsybl/sld/cgmes/dl/conversion/AbstractCgmesDLExporterTest.java @@ -16,7 +16,6 @@ import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; -import org.mockito.Matchers; import org.mockito.Mockito; import com.powsybl.sld.cgmes.dl.iidm.extensions.DiagramPoint; @@ -54,14 +53,14 @@ public abstract class AbstractCgmesDLExporterTest { @Before public void setUp() { tripleStore = Mockito.mock(TripleStore.class); - Mockito.when(tripleStore.add(Matchers.any(String.class), Matchers.eq(CgmesNamespace.CIM_16_NAMESPACE), - Matchers.eq("Diagram"), Matchers.any(PropertyBag.class))) + Mockito.when(tripleStore.add(Mockito.any(String.class), Mockito.eq(CgmesNamespace.CIM_16_NAMESPACE), + Mockito.eq("Diagram"), Mockito.any(PropertyBag.class))) .thenReturn(diagramId); - Mockito.when(tripleStore.add(Matchers.any(String.class), Matchers.eq(CgmesNamespace.CIM_16_NAMESPACE), - Matchers.eq("DiagramObjectStyle"), Matchers.any(PropertyBag.class))) + Mockito.when(tripleStore.add(Mockito.any(String.class), Mockito.eq(CgmesNamespace.CIM_16_NAMESPACE), + Mockito.eq("DiagramObjectStyle"), Mockito.any(PropertyBag.class))) .thenReturn(diagramObjectStyleId); - Mockito.when(tripleStore.add(Matchers.any(String.class), Matchers.eq(CgmesNamespace.CIM_16_NAMESPACE), - Matchers.eq("DiagramObject"), Matchers.any(PropertyBag.class))) + Mockito.when(tripleStore.add(Mockito.any(String.class), Mockito.eq(CgmesNamespace.CIM_16_NAMESPACE), + Mockito.eq("DiagramObject"), Mockito.any(PropertyBag.class))) .thenReturn(diagramObjectId); cgmesDLModel = Mockito.mock(CgmesDLModel.class); diff --git a/single-line-diagram-iidm-extensions/src/test/resources/branchStatusRef.xml b/single-line-diagram-iidm-extensions/src/test/resources/branchStatusRef.xml index 551aec2a1..62a05e5a8 100644 --- a/single-line-diagram-iidm-extensions/src/test/resources/branchStatusRef.xml +++ b/single-line-diagram-iidm-extensions/src/test/resources/branchStatusRef.xml @@ -1,5 +1,5 @@ - + diff --git a/single-line-diagram-iidm-extensions/src/test/resources/busbarSectionPositionRef.xml b/single-line-diagram-iidm-extensions/src/test/resources/busbarSectionPositionRef.xml index 9af5c3864..2cc1dbdce 100644 --- a/single-line-diagram-iidm-extensions/src/test/resources/busbarSectionPositionRef.xml +++ b/single-line-diagram-iidm-extensions/src/test/resources/busbarSectionPositionRef.xml @@ -1,5 +1,5 @@ - + diff --git a/single-line-diagram-iidm-extensions/src/test/resources/connectablePositionRef.xml b/single-line-diagram-iidm-extensions/src/test/resources/connectablePositionRef.xml index 4e0e0b1ec..556137235 100644 --- a/single-line-diagram-iidm-extensions/src/test/resources/connectablePositionRef.xml +++ b/single-line-diagram-iidm-extensions/src/test/resources/connectablePositionRef.xml @@ -1,5 +1,5 @@ - +