From 080ece61755702961655f5663880c9f8d3342d31 Mon Sep 17 00:00:00 2001 From: lisrte Date: Thu, 27 Jun 2024 13:47:35 +0200 Subject: [PATCH 1/2] Rename SVC integration test folder and tests Signed-off-by: lisrte --- .../test/java/com/powsybl/dynawo/it/DynaWaltzTest.java | 10 +++++----- .../src/test/resources/{svc => svarc}/models.par | 0 .../src/test/resources/{svc => svarc}/network.par | 0 .../src/test/resources/{svc => svarc}/solvers.par | 0 4 files changed, 5 insertions(+), 5 deletions(-) rename dynawo-integration-tests/src/test/resources/{svc => svarc}/models.par (100%) rename dynawo-integration-tests/src/test/resources/{svc => svarc}/network.par (100%) rename dynawo-integration-tests/src/test/resources/{svc => svarc}/solvers.par (100%) diff --git a/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynaWaltzTest.java b/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynaWaltzTest.java index 89a42100c..cafc3845a 100644 --- a/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynaWaltzTest.java +++ b/dynawo-integration-tests/src/test/java/com/powsybl/dynawo/it/DynaWaltzTest.java @@ -149,16 +149,16 @@ void testIeee14WithDump() throws IOException { } @Test - void testSvc() { + void testSvarc() { Network network = SvcTestCaseFactory.create(); GroovyDynamicModelsSupplier dynamicModelsSupplier = new GroovyDynamicModelsSupplier( - getResourceAsStream("/svc/dynamicModels.groovy"), + getResourceAsStream("/svarc/dynamicModels.groovy"), GroovyExtension.find(DynamicModelGroovyExtension.class, DynaWaltzProvider.NAME)); - List modelsParameters = ParametersXml.load(getResourceAsStream("/svc/models.par")); - ParametersSet networkParameters = ParametersXml.load(getResourceAsStream("/svc/network.par"), "8"); - ParametersSet solverParameters = ParametersXml.load(getResourceAsStream("/svc/solvers.par"), "2"); + List modelsParameters = ParametersXml.load(getResourceAsStream("/svarc/models.par")); + ParametersSet networkParameters = ParametersXml.load(getResourceAsStream("/svarc/network.par"), "8"); + ParametersSet solverParameters = ParametersXml.load(getResourceAsStream("/svarc/solvers.par"), "2"); dynaWaltzParameters.setModelsParameters(modelsParameters) .setNetworkParameters(networkParameters) .setSolverParameters(solverParameters) diff --git a/dynawo-integration-tests/src/test/resources/svc/models.par b/dynawo-integration-tests/src/test/resources/svarc/models.par similarity index 100% rename from dynawo-integration-tests/src/test/resources/svc/models.par rename to dynawo-integration-tests/src/test/resources/svarc/models.par diff --git a/dynawo-integration-tests/src/test/resources/svc/network.par b/dynawo-integration-tests/src/test/resources/svarc/network.par similarity index 100% rename from dynawo-integration-tests/src/test/resources/svc/network.par rename to dynawo-integration-tests/src/test/resources/svarc/network.par diff --git a/dynawo-integration-tests/src/test/resources/svc/solvers.par b/dynawo-integration-tests/src/test/resources/svarc/solvers.par similarity index 100% rename from dynawo-integration-tests/src/test/resources/svc/solvers.par rename to dynawo-integration-tests/src/test/resources/svarc/solvers.par From 389990895ade4af0514a0d1d5c061ca3c35a6d6b Mon Sep 17 00:00:00 2001 From: lisrte Date: Thu, 27 Jun 2024 14:56:10 +0200 Subject: [PATCH 2/2] Fix groovy script Signed-off-by: lisrte --- .../src/test/resources/{svc => svarc}/dynamicModels.groovy | 1 + 1 file changed, 1 insertion(+) rename dynawo-integration-tests/src/test/resources/{svc => svarc}/dynamicModels.groovy (97%) diff --git a/dynawo-integration-tests/src/test/resources/svc/dynamicModels.groovy b/dynawo-integration-tests/src/test/resources/svarc/dynamicModels.groovy similarity index 97% rename from dynawo-integration-tests/src/test/resources/svc/dynamicModels.groovy rename to dynawo-integration-tests/src/test/resources/svarc/dynamicModels.groovy index 29b3539cc..c831ea369 100644 --- a/dynawo-integration-tests/src/test/resources/svc/dynamicModels.groovy +++ b/dynawo-integration-tests/src/test/resources/svarc/dynamicModels.groovy @@ -5,6 +5,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. * SPDX-License-Identifier: MPL-2.0 */ +package svarc LoadAlphaBeta { staticId "L2"