Skip to content

Commit

Permalink
Repair cucumber tests when correct unit was better then correct DC, t…
Browse files Browse the repository at this point in the history 
…ests with explicit MW and AC are not fixed

Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
  • Loading branch information
Pauline Jean-Marie committed Sep 24, 2024
1 parent 3c4c646 commit 32a537a
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions tests/src/test/resources/com/powsybl/openrao/tests/features/epic11_mnec/US11_3.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Feature: US 11.3: Handle mnecs in search tree with only network actions
Scenario: US 11.3.2: margin on MNEC should stay positive (initial margin > 180MW)
Given network file is "common/TestCase12Nodes.uct" for CORE CC
Given crac file is "epic11/ls_mnec_networkAction_3_2.json"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin180.json"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_mnecDimin180.json"
When I launch search_tree_rao
Then the remedial action "Open line FR1- FR2" is used in preventive
And line "FFR1AA1 FFR2AA1 1" in network file with PRA has connection status to "false"
Expand All @@ -34,7 +34,7 @@ Feature: US 11.3: Handle mnecs in search tree with only network actions
Scenario: US 11.3.3: margin on MNEC should stay above initial value - 180 MW
Given network file is "common/TestCase12Nodes.uct" for CORE CC
Given crac file is "epic11/ls_mnec_networkAction_3_3.json"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin180.json"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_mnecDimin180.json"
When I launch search_tree_rao
Then the remedial action "PST BE setpoint" is used in preventive
And PST "BBE2AA1 BBE3AA1 1" in network file with PRA is on tap -16
Expand Down
6 changes: 3 additions & 3 deletions tests/src/test/resources/com/powsybl/openrao/tests/features/epic11_mnec/US11_4.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Feature: US 11.4: Handle mnecs in search tree with range actions and network act
Scenario: US 11.4.2: margin on MNEC should stay positive
Given network file is "common/TestCase12Nodes.uct" for CORE CC
Given crac file is "epic11/ls_mixed_4_2.json"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin20.json"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_mnecDimin20.json"
When I launch search_tree_rao
Then the remedial action "Open line NL1-NL2" is used in preventive
And line "NNL1AA1 NNL2AA1 1" in network file with PRA has connection status to "false"
Expand All @@ -39,7 +39,7 @@ Feature: US 11.4: Handle mnecs in search tree with range actions and network act
Scenario: US 11.4.3: Search Tree RAO - 2 MNECs with one curative
Given network file is "common/TestCase12Nodes.uct" for CORE CC
Given crac file is "epic11/ls_mixed_4_3.json"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin20.json"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_mnecDimin20.json"
When I launch search_tree_rao
Then the remedial action "Open line NL1-NL2" is used in preventive
And line "NNL1AA1 NNL2AA1 1" in network file with PRA has connection status to "false"
Expand Down Expand Up @@ -70,7 +70,7 @@ Feature: US 11.4: Handle mnecs in search tree with range actions and network act
Scenario: US 11.4.4.b: margin on MNEC should stay positive
Given network file is "common/TestCase12Nodes.uct" for CORE CC
Given crac file is "epic11/MergedCB_4_4.xml"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin20.json"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_mnecDimin20.json"
When I launch search_tree_rao at "2019-01-08 12:00"
Then the remedial action "Open line NL1-NL2" is used in preventive
And line "NNL1AA1 NNL2AA1 1" in network file with PRA has connection status to "false"
Expand Down
2 changes: 1 addition & 1 deletion ...est/resources/com/powsybl/openrao/tests/features/epic12_export_improvement/US12_1.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Feature: US 12.1: handling of curative optimization in the CORE CNE export
Scenario: 12.1.2: Curative case with MNECs (copy of scenario 13.6.4)
Given network file is "epic13/TestCase12NodesDifferentPstTap.uct" for CORE CC
Given crac file is "epic13/MergedCB_ep13us6case4.xml"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin20.json"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_mnecDimin20.json"
Given RaoResult file is "epic12/RaoResult_12_1_2.json"
When I export CORE CNE at "2019-01-08 13:00"
Then the CORE CNE file is xsd-compliant
Expand Down
2 changes: 1 addition & 1 deletion ...est/resources/com/powsybl/openrao/tests/features/epic12_export_improvement/US12_9.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Feature: US 12.9: CORE CNE export for CBCORA with inverted branches
Scenario: 12.9.1: CBCORA with inverted branches
Given network file is "common/TestCase12Nodes.uct" for CORE CC
Given crac file is "epic12/MergedCB_12_6_4_withInvertedLines.xml"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin20.json"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_mnecDimin20.json"
Given RaoResult file is "epic12/RaoResult_12_6_4_withInvertedLines.json"
When I export CORE CNE at "2019-01-08 01:59"
Then the CORE CNE file is xsd-compliant
Expand Down
4 changes: 2 additions & 2 deletions tests/src/test/resources/com/powsybl/openrao/tests/features/epic13_curative/US13_6.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Feature: US 13.6: cross validation curative optimization and MNECs
Scenario: US 13.6.3: CBCORA - Curative MNECs limited by their initial margin - CRAs only
Given network file is "epic13/TestCase12NodesDifferentPstTap.uct" for CORE CC
Given crac file is "epic13/MergedCB_ep13us6case3.xml"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin20.json"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_mnecDimin20.json"
When I launch search_tree_rao at "2019-01-08 12:00"
Then the optimization steps executed by the RAO should be "FIRST_PREVENTIVE_FELLBACK_TO_INITIAL_SITUATION"
And the value of the objective function after CRA should be 286
Expand All @@ -57,7 +57,7 @@ Feature: US 13.6: cross validation curative optimization and MNECs
Scenario: US 13.6.4: CBCORA - Curative MNECs limited by their initial margin - PRAs and CRAs
Given network file is "epic13/TestCase12NodesDifferentPstTap.uct" for CORE CC
Given crac file is "epic13/MergedCB_ep13us6case4.xml"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_ac_mnecDimin20.json"
Given configuration file is "epic11/RaoParameters_maxMargin_megawatt_mnecDimin20.json"
When I launch search_tree_rao at "2019-01-08 12:00"
Then the margin on cnec "NL2-BE3-O - outage" after PRA should be -103.0 MW
And 1 remedial actions are used in preventive
Expand Down
2 changes: 1 addition & 1 deletion tests/src/test/resources/files/configurations/epic10/RaoParameters_relMargin_megawatt.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"shuntCompensatorVoltageControlOn" : false,
"readSlackBus" : true,
"writeSlackBus" : true,
"dc" : false,
"dc" : true,
"distributedSlack" : true,
"balanceType" : "PROPORTIONAL_TO_GENERATION_P",
"dcUseTransformerRatio" : true,
Expand Down
2 changes: 1 addition & 1 deletion ...s_maxMargin_megawatt_ac_mnecDimin180.json → ...ters_maxMargin_megawatt_mnecDimin180.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"shuntCompensatorVoltageControlOn" : false,
"readSlackBus" : true,
"writeSlackBus" : true,
"dc" : false,
"dc" : true,
"distributedSlack" : true,
"balanceType" : "PROPORTIONAL_TO_GENERATION_P",
"dcUseTransformerRatio" : true,
Expand Down
2 changes: 1 addition & 1 deletion ...rs_maxMargin_megawatt_ac_mnecDimin20.json → ...eters_maxMargin_megawatt_mnecDimin20.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"shuntCompensatorVoltageControlOn" : false,
"readSlackBus" : true,
"writeSlackBus" : true,
"dc" : false,
"dc" : true,
"distributedSlack" : true,
"balanceType" : "PROPORTIONAL_TO_GENERATION_P",
"dcUseTransformerRatio" : true,
Expand Down
2 changes: 1 addition & 1 deletion tests/src/test/resources/files/configurations/epic13/RaoParameters_13_6_11.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"shuntCompensatorVoltageControlOn" : false,
"readSlackBus" : true,
"writeSlackBus" : true,
"dc" : false,
"dc" : true,
"distributedSlack" : true,
"balanceType" : "PROPORTIONAL_TO_GENERATION_P",
"dcUseTransformerRatio" : true,
Expand Down
2 changes: 1 addition & 1 deletion tests/src/test/resources/files/configurations/epic13/RaoParameters_13_6_2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"shuntCompensatorVoltageControlOn" : false,
"readSlackBus" : true,
"writeSlackBus" : true,
"dc" : false,
"dc" : true,
"distributedSlack" : true,
"balanceType" : "PROPORTIONAL_TO_GENERATION_P",
"dcUseTransformerRatio" : true,
Expand Down
2 changes: 1 addition & 1 deletion ...test/resources/files/configurations/epic19/RaoParameters_maxMargin_megawatt_shareCra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"shuntCompensatorVoltageControlOn" : false,
"readSlackBus" : true,
"writeSlackBus" : true,
"dc" : false,
"dc" : true,
"distributedSlack" : true,
"balanceType" : "PROPORTIONAL_TO_GENERATION_P",
"dcUseTransformerRatio" : true,
Expand Down
2 changes: 1 addition & 1 deletion ...t/resources/files/configurations/epic19/RaoParameters_maxRelMargin_megawatt_shareCra.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"shuntCompensatorVoltageControlOn" : false,
"readSlackBus" : true,
"writeSlackBus" : true,
"dc" : false,
"dc" : true,
"distributedSlack" : true,
"balanceType" : "PROPORTIONAL_TO_GENERATION_P",
"dcUseTransformerRatio" : true,
Expand Down
2 changes: 1 addition & 1 deletion ...sources/files/configurations/epic19/RaoParameters_maxRelMargin_megawatt_shareCra_mip.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"shuntCompensatorVoltageControlOn" : false,
"readSlackBus" : true,
"writeSlackBus" : true,
"dc" : false,
"dc" : true,
"distributedSlack" : true,
"balanceType" : "PROPORTIONAL_TO_GENERATION_P",
"dcUseTransformerRatio" : true,
Expand Down
2 changes: 1 addition & 1 deletion tests/src/test/resources/files/configurations/epic20/RaoParameters_20_4.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"shuntCompensatorVoltageControlOn" : false,
"readSlackBus" : true,
"writeSlackBus" : true,
"dc" : false,
"dc" : true,
"distributedSlack" : true,
"balanceType" : "PROPORTIONAL_TO_GENERATION_P",
"dcUseTransformerRatio" : true,
Expand Down
2 changes: 1 addition & 1 deletion ...st/resources/files/configurations/epic5/RaoParameters_maxMargin_absoluteMinImpact195.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"shuntCompensatorVoltageControlOn" : false,
"readSlackBus" : true,
"writeSlackBus" : true,
"dc" : false,
"dc" : true,
"distributedSlack" : true,
"balanceType" : "PROPORTIONAL_TO_GENERATION_P",
"dcUseTransformerRatio" : true,
Expand Down

0 comments on commit 32a537a

Please sign in to comment.