Merge branch 'refs/heads/main' into no-g-b-on-nonimpedant-branches

powsybl · Jul 29, 2024 · 3f3b3f7 · 3f3b3f7
2 parents 9865419 + 6b191c5
commit 3f3b3f7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/open-reac/pom.xml b/open-reac/pom.xml
@@ -22,8 +22,8 @@
     <description>OpenReac optimizer</description>
 
     <properties>
-        <powsybl-core.version>6.3.0</powsybl-core.version>
-        <powsybl-open-loadflow.version>1.9.0</powsybl-open-loadflow.version>
+        <powsybl-core.version>6.4.1</powsybl-core.version>
+        <powsybl-open-loadflow.version>1.12.1</powsybl-open-loadflow.version>
     </properties>
 
     <developers>

diff --git a/open-reac/src/test/java/com/powsybl/openreac/OpenReacRunnerTest.java b/open-reac/src/test/java/com/powsybl/openreac/OpenReacRunnerTest.java
@@ -39,6 +39,7 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ForkJoinPool;
 import java.util.stream.Collectors;
@@ -67,7 +68,7 @@ void tearDown() throws IOException {
 
     private void assertEqualsToRef(Path p, String refFileName) throws IOException {
         try (InputStream actual = Files.newInputStream(p)) {
-            ComparisonUtils.compareTxt(getClass().getResourceAsStream(refFileName), actual);
+            ComparisonUtils.assertTxtEquals(Objects.requireNonNull(getClass().getResourceAsStream(refFileName)), actual);
         }
     }
 

diff --git a/...reac/src/test/java/com/powsybl/openreac/parameters/input/json/OpenReacJsonModuleTest.java b/...reac/src/test/java/com/powsybl/openreac/parameters/input/json/OpenReacJsonModuleTest.java
@@ -51,7 +51,7 @@ void testOpenReacParametersLists() throws IOException {
         parameters.addConfiguredReactiveSlackBuses(List.of("bus1", "bus2"));
 
         String json = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(parameters);
-        ComparisonUtils.compareTxt(Objects.requireNonNull(getClass().getResourceAsStream("/parametersLists.json")), json);
+        ComparisonUtils.assertTxtEquals(Objects.requireNonNull(getClass().getResourceAsStream("/parametersLists.json")), json);
 
         OpenReacParameters parameters2 = objectMapper.readValue(json, OpenReacParameters.class);
         // List of voltage limit overrides
@@ -98,7 +98,7 @@ void testOpenReacParametersThresholds() throws IOException {
         parameters.setTwoWindingTransformerRatioVariableScalingFactor(0.005);
 
         String json = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(parameters);
-        ComparisonUtils.compareTxt(Objects.requireNonNull(getClass().getResourceAsStream("/parametersThresholds.json")), json);
+        ComparisonUtils.assertTxtEquals(Objects.requireNonNull(getClass().getResourceAsStream("/parametersThresholds.json")), json);
         OpenReacParameters parameters2 = objectMapper.readValue(json, OpenReacParameters.class);
 
         assertEquals(5, parameters2.getObjectiveDistance());