Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,11 @@
</developers>

<properties>
<gridsuite-dependencies.version>46.0.0</gridsuite-dependencies.version>
<gridsuite-dependencies.version>47.0.0</gridsuite-dependencies.version>
<jib.from.image>powsybl/java-dynawo:3.1.0</jib.from.image>
<liquibase-hibernate-package>org.gridsuite.dynamicsecurityanalysis.server</liquibase-hibernate-package>
<sonar.organization>gridsuite</sonar.organization>
<sonar.projectKey>org.gridsuite:dynamic-security-analysis-server</sonar.projectKey>
<!-- To remove after when using gridsuite dependencies release and computation version containing merged PR: https://github.com/gridsuite/computation/pull/19 -->
<gridsuite-computation.version>1.8.0</gridsuite-computation.version>
<powsybl-ws-commons.version>1.34.0</powsybl-ws-commons.version>
</properties>

<build>
Expand Down Expand Up @@ -89,18 +86,6 @@
<dependencyManagement>
<dependencies>
<!-- overrides of imports -->
<dependency>
<groupId>com.powsybl</groupId>
<artifactId>powsybl-ws-commons</artifactId>
<version>${powsybl-ws-commons.version}</version>
</dependency>

<dependency>
<groupId>org.gridsuite</groupId>
<artifactId>gridsuite-computation</artifactId>
<version>${gridsuite-computation.version}</version>
</dependency>

<!-- imports -->
<dependency>
<groupId>org.gridsuite</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -405,8 +405,11 @@ private UUID runAndCancel(CountDownLatch cancelLatch, int cancelDelay) throws Ex

assertResultStatus(runUuid, DynamicSecurityAnalysisStatus.RUNNING);

// stop dynamic simulation
cancelLatch.await();
// stop dynamic security analysis, need a timeout to avoid test hangs if an exception occurs before latch countdown
boolean completed = cancelLatch.await(5, TimeUnit.SECONDS);
if (!completed) {
throw new AssertionError("Timed out waiting for cancelLatch, something might have crashed before latch countdown happens.");
}
// custom additional wait
await().pollDelay(cancelDelay, TimeUnit.MILLISECONDS).until(() -> true);

Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/data/ieee14/_01/input/dynamicModel.dmp
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"model":"GeneratorSynchronousThreeWindingsProportionalRegulations","group":"IEEE14","groupType":"PREFIX","properties":[{"name":"staticId","value":"_GEN____6_SM","propertyClass":"java.lang.String"}]},{"model":"GeneratorSynchronousThreeWindingsProportionalRegulations","group":"IEEE14","groupType":"PREFIX","properties":[{"name":"staticId","value":"_GEN____8_SM","propertyClass":"java.lang.String"}]},{"model":"GeneratorSynchronousFourWindingsProportionalRegulations","group":"IEEE14","groupType":"PREFIX","properties":[{"name":"staticId","value":"_GEN____1_SM","propertyClass":"java.lang.String"}]},{"model":"GeneratorSynchronousFourWindingsProportionalRegulations","group":"IEEE14","groupType":"PREFIX","properties":[{"name":"staticId","value":"_GEN____2_SM","propertyClass":"java.lang.String"}]},{"model":"GeneratorSynchronousFourWindingsProportionalRegulations","group":"IEEE14","groupType":"PREFIX","properties":[{"name":"staticId","value":"_GEN____3_SM","propertyClass":"java.lang.String"}]},{"model":"StaticVarCompensator","group":"SVarCT","groupType":"FIXED","properties":[{"name":"staticId","value":"SVC2","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD__10_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD__11_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD__12_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD__13_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD__14_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD___2_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD___3_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD___9_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD___4_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD___6_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD___5_EC","propertyClass":"java.lang.String"}]},{"model":"OverloadManagementSystem","group":"CLA_2_4","groupType":"FIXED","properties":[{"name":"dynamicModelId","value":"CLA_1","propertyClass":"java.lang.String"},{"name":"iMeasurement","value":"_BUS____2-BUS____4-1_AC","propertyClass":"java.lang.String"},{"name":"iMeasurementSide","value":"TWO","propertyClass":"com.powsybl.iidm.network.TwoSides"},{"name":"controlledBranch","value":"_BUS____2-BUS____4-1_AC","propertyClass":"java.lang.String"}]},{"model":"OverloadManagementSystem","group":"CLA_2_5","groupType":"FIXED","properties":[{"name":"dynamicModelId","value":"CLA_2","propertyClass":"java.lang.String"},{"name":"iMeasurement","value":"_BUS____2-BUS____5-1_AC","propertyClass":"java.lang.String"},{"name":"iMeasurementSide","value":"TWO","propertyClass":"com.powsybl.iidm.network.TwoSides"},{"name":"controlledBranch","value":"_BUS____2-BUS____5-1_AC","propertyClass":"java.lang.String"}]},{"model":"TapChangerBlockingAutomaton","group":"TCB_2_4","groupType":"FIXED","properties":[{"name":"dynamicModelId","value":"TCB_1","propertyClass":"java.lang.String"},{"name":"uMeasurements","value":["_BUS___11_TN","_BUS___12_TN"],"propertyClass":"java.util.Collection"},{"name":"transformers","value":["_LOAD__11_EC","_LOAD__12_EC"],"propertyClass":"java.util.Collection"}]},{"model":"TapChangerBlockingAutomaton","group":"TCB_2_5","groupType":"FIXED","properties":[{"name":"dynamicModelId","value":"TCB_2","propertyClass":"java.lang.String"},{"name":"uMeasurements","value":"_BUS____4_TN","propertyClass":"java.lang.String"},{"name":"transformers","value":"_BUS____4-BUS____9-1_PT","propertyClass":"java.lang.String"}]}]
[{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD__10_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD__11_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD__12_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD__13_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD__14_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD___2_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD___3_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD___9_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD___4_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD___6_EC","propertyClass":"java.lang.String"}]},{"model":"LoadAlphaBeta","group":"LAB","groupType":"FIXED","properties":[{"name":"staticId","value":"_LOAD___5_EC","propertyClass":"java.lang.String"}]},{"model":"GeneratorSynchronousThreeWindingsProportionalRegulations","group":"IEEE14","groupType":"PREFIX","properties":[{"name":"staticId","value":"_GEN____6_SM","propertyClass":"java.lang.String"}]},{"model":"GeneratorSynchronousThreeWindingsProportionalRegulations","group":"IEEE14","groupType":"PREFIX","properties":[{"name":"staticId","value":"_GEN____8_SM","propertyClass":"java.lang.String"}]},{"model":"GeneratorSynchronousFourWindingsProportionalRegulations","group":"IEEE14","groupType":"PREFIX","properties":[{"name":"staticId","value":"_GEN____1_SM","propertyClass":"java.lang.String"}]},{"model":"GeneratorSynchronousFourWindingsProportionalRegulations","group":"IEEE14","groupType":"PREFIX","properties":[{"name":"staticId","value":"_GEN____2_SM","propertyClass":"java.lang.String"}]},{"model":"GeneratorSynchronousFourWindingsProportionalRegulations","group":"IEEE14","groupType":"PREFIX","properties":[{"name":"staticId","value":"_GEN____3_SM","propertyClass":"java.lang.String"}]},{"model":"StaticVarCompensator","group":"SVarCT","groupType":"FIXED","properties":[{"name":"staticId","value":"SVC2","propertyClass":"java.lang.String"}]},{"model":"OverloadManagementSystem","group":"CLA_2_4","groupType":"FIXED","properties":[{"name":"dynamicModelId","value":"CLA_1","propertyClass":"java.lang.String"},{"name":"iMeasurement","value":"_BUS____2-BUS____4-1_AC","propertyClass":"java.lang.String"},{"name":"iMeasurementSide","value":"TWO","propertyClass":"com.powsybl.iidm.network.TwoSides"},{"name":"controlledBranch","value":"_BUS____2-BUS____4-1_AC","propertyClass":"java.lang.String"}]},{"model":"OverloadManagementSystem","group":"CLA_2_5","groupType":"FIXED","properties":[{"name":"dynamicModelId","value":"CLA_2","propertyClass":"java.lang.String"},{"name":"iMeasurement","value":"_BUS____2-BUS____5-1_AC","propertyClass":"java.lang.String"},{"name":"iMeasurementSide","value":"TWO","propertyClass":"com.powsybl.iidm.network.TwoSides"},{"name":"controlledBranch","value":"_BUS____2-BUS____5-1_AC","propertyClass":"java.lang.String"}]},{"model":"TapChangerBlockingAutomaton","group":"TCB_2_4","groupType":"FIXED","properties":[{"name":"dynamicModelId","value":"TCB_1","propertyClass":"java.lang.String"},{"name":"uMeasurements","value":["_BUS___11_TN","_BUS___12_TN"],"propertyClass":"java.util.Collection"},{"name":"transformers","value":["_LOAD__11_EC","_LOAD__12_EC"],"propertyClass":"java.util.Collection"}]},{"model":"TapChangerBlockingAutomaton","group":"TCB_2_5","groupType":"FIXED","properties":[{"name":"dynamicModelId","value":"TCB_2","propertyClass":"java.lang.String"},{"name":"uMeasurements","value":"_BUS____4_TN","propertyClass":"java.lang.String"},{"name":"transformers","value":"_BUS____4-BUS____9-1_PT","propertyClass":"java.lang.String"}]}]

Large diffs are not rendered by default.

Binary file modified src/test/resources/data/ieee14/_01/input/outputState.dmp.gz
Binary file not shown.