From e92fb75d540c7c9b48785b2d1f8634c0a6ac7224 Mon Sep 17 00:00:00 2001 From: Romain Courtier Date: Wed, 9 Oct 2024 09:48:13 +0200 Subject: [PATCH] Rework existing tests: moved cgmes input file into a specific subfolder and read the files using the static method in ConversionUtil Signed-off-by: Romain Courtier --- .../conversion/test/OperationalLimitsGroupTest.java | 9 ++++++--- .../multiple_limitsets_on_same_terminal.xml} | 0 2 files changed, 6 insertions(+), 3 deletions(-) rename cgmes/cgmes-conversion/src/test/resources/{OperationalLimits.xml => issues/operational-limits/multiple_limitsets_on_same_terminal.xml} (100%) diff --git a/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/OperationalLimitsGroupTest.java b/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/OperationalLimitsGroupTest.java index 21b6a67f6e9..7c906a9b62a 100644 --- a/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/OperationalLimitsGroupTest.java +++ b/cgmes/cgmes-conversion/src/test/java/com/powsybl/cgmes/conversion/test/OperationalLimitsGroupTest.java @@ -19,6 +19,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import static com.powsybl.cgmes.conversion.test.ConversionUtil.readCgmesResources; import static org.junit.jupiter.api.Assertions.*; /** @@ -32,10 +33,12 @@ class OperationalLimitsGroupTest extends AbstractSerDeTest { private static final Pattern ACTIVE_POWER_LIMIT = Pattern.compile(""); private static final Pattern CURRENT_LIMIT = Pattern.compile(""); + private static final String DIR = "/issues/operational-limits/"; + @Test void importMultipleLimitsGroupsOnSameLineEndTest() { // Retrieve line - Network network = Network.read("OperationalLimits.xml", getClass().getResourceAsStream("/OperationalLimits.xml")); + Network network = readCgmesResources(DIR, "multiple_limitsets_on_same_terminal.xml"); Line line = network.getLine("Line"); // There is 1 set on side 1, 2 sets on side 2 @@ -56,7 +59,7 @@ void importMultipleLimitsGroupsOnSameLineEndTest() { @Test void exportSelectedLimitsGroupTest() throws IOException { // Import and export CGMES limits - Network network = Network.read("OperationalLimits.xml", getClass().getResourceAsStream("/OperationalLimits.xml")); + Network network = readCgmesResources(DIR, "multiple_limitsets_on_same_terminal.xml"); Properties exportParams = new Properties(); exportParams.put(CgmesExport.EXPORT_ALL_LIMITS_GROUP, false); @@ -86,7 +89,7 @@ void exportSelectedLimitsGroupTest() throws IOException { @Test void exportAllLimitsGroupTest() throws IOException { // Import and export CGMES limits - Network network = Network.read("OperationalLimits.xml", getClass().getResourceAsStream("/OperationalLimits.xml")); + Network network = readCgmesResources(DIR, "multiple_limitsets_on_same_terminal.xml"); Properties exportParams = new Properties(); exportParams.put(CgmesExport.EXPORT_ALL_LIMITS_GROUP, true); diff --git a/cgmes/cgmes-conversion/src/test/resources/OperationalLimits.xml b/cgmes/cgmes-conversion/src/test/resources/issues/operational-limits/multiple_limitsets_on_same_terminal.xml similarity index 100% rename from cgmes/cgmes-conversion/src/test/resources/OperationalLimits.xml rename to cgmes/cgmes-conversion/src/test/resources/issues/operational-limits/multiple_limitsets_on_same_terminal.xml