Skip to content

Commit dab0cf8

Browse files
ghazwarhilighazwarhili
committed
enhance coverage code
1 parent bd1c1c5 commit dab0cf8

16 files changed

+877
-39
lines changed

‎src/test/java/org/gridsuite/network/map/NetworkMapControllerTest.java‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,37 +1157,6 @@ void setUp() {
11571157
.withDirection(ConnectablePosition.Direction.TOP).add()
11581158
.add();
11591159

1160-
// Add new variant
1161-
network.getVariantManager().cloneVariant(VariantManagerConstants.INITIAL_VARIANT_ID, VARIANT_ID);
1162-
network.getVariantManager().setWorkingVariant(VARIANT_ID);
1163-
1164-
// Disconnect shunt compensator "SHUNT_VLNB" in variant VARIANT_ID to test SJB retrieval even if equipment disconnected
1165-
network.getSwitch("VL4_SHUNT_BREAKER").setOpen(true);
1166-
1167-
// Create a shunt compensator only in variant VARIANT_ID
1168-
ShuntCompensator shunt3 = vlgen3.newShuntCompensator()
1169-
.setId("SHUNT3")
1170-
.setName("SHUNT3")
1171-
.newLinearModel()
1172-
.setMaximumSectionCount(3)
1173-
.setBPerSection(1)
1174-
.setGPerSection(2)
1175-
.add()
1176-
.setSectionCount(2)
1177-
.setTargetV(225)
1178-
.setVoltageRegulatorOn(true)
1179-
.setTargetDeadband(10)
1180-
.setConnectableBus("NGEN3")
1181-
.setBus("NGEN3")
1182-
.add();
1183-
shunt3.getTerminal().setQ(90);
1184-
shunt3.newExtension(ConnectablePositionAdder.class)
1185-
.newFeeder()
1186-
.withName("feederName")
1187-
.withOrder(0)
1188-
.withDirection(ConnectablePosition.Direction.TOP).add()
1189-
.add();
1190-
11911160
/** VLGEN7 - Fork topology
11921161
*
11931162
* BUS1 ═══════X════════ BUS2 ═══════════════/════ BUS3
@@ -1404,6 +1373,37 @@ void setUp() {
14041373
.setTopologyKind(TopologyKind.BUS_BREAKER)
14051374
.add();
14061375

1376+
// Add new variant
1377+
network.getVariantManager().cloneVariant(VariantManagerConstants.INITIAL_VARIANT_ID, VARIANT_ID);
1378+
network.getVariantManager().setWorkingVariant(VARIANT_ID);
1379+
1380+
// Disconnect shunt compensator "SHUNT_VLNB" in variant VARIANT_ID to test SJB retrieval even if equipment disconnected
1381+
network.getSwitch("VL4_SHUNT_BREAKER").setOpen(true);
1382+
1383+
// Create a shunt compensator only in variant VARIANT_ID
1384+
ShuntCompensator shunt3 = vlgen3.newShuntCompensator()
1385+
.setId("SHUNT3")
1386+
.setName("SHUNT3")
1387+
.newLinearModel()
1388+
.setMaximumSectionCount(3)
1389+
.setBPerSection(1)
1390+
.setGPerSection(2)
1391+
.add()
1392+
.setSectionCount(2)
1393+
.setTargetV(225)
1394+
.setVoltageRegulatorOn(true)
1395+
.setTargetDeadband(10)
1396+
.setConnectableBus("NGEN3")
1397+
.setBus("NGEN3")
1398+
.add();
1399+
shunt3.getTerminal().setQ(90);
1400+
shunt3.newExtension(ConnectablePositionAdder.class)
1401+
.newFeeder()
1402+
.withName("feederName")
1403+
.withOrder(0)
1404+
.withDirection(ConnectablePosition.Direction.TOP).add()
1405+
.add();
1406+
14071407
network.getVariantManager().setWorkingVariant(VariantManagerConstants.INITIAL_VARIANT_ID);
14081408

14091409
Network network2 = NetworkTest1Factory.create(NETWORK_2_UUID.toString());
@@ -1920,10 +1920,10 @@ void shouldReturnLinesOperatingStatusData() throws Exception {
19201920

19211921
@Test
19221922
void shouldReturnLinesIds() throws Exception {
1923-
succeedingTestForElementsIds(NETWORK_UUID, null, List.of("NHV1_NHV2_1", "NHV1_NHV2_2", "LINE3", "LINE4").toString(), ElementType.LINE, null, null);
1924-
succeedingTestForElementsIds(NETWORK_UUID, null, List.of("NHV1_NHV2_1", "NHV1_NHV2_2", "LINE3", "LINE4").toString(), ElementType.LINE, null, List.of(24.0, 380.0));
1925-
succeedingTestForElementsIds(NETWORK_UUID, VARIANT_ID, List.of("NHV1_NHV2_1", "NHV1_NHV2_2", "LINE3", "LINE4").toString(), ElementType.LINE, null, null);
1926-
succeedingTestForElementsIds(NETWORK_UUID, VARIANT_ID, List.of("NHV1_NHV2_1", "NHV1_NHV2_2", "LINE3", "LINE4").toString(), ElementType.LINE, null, List.of(24.0, 380.0));
1923+
succeedingTestForElementsIds(NETWORK_UUID, null, List.of("NHV1_NHV2_1", "NHV1_NHV2_2", "LINE3", "LINE4", "LINE7_FORK", "LINE8_FORK", "LINE9_INDEPENDENT").toString(), ElementType.LINE, null, null);
1924+
succeedingTestForElementsIds(NETWORK_UUID, null, List.of("NHV1_NHV2_1", "NHV1_NHV2_2", "LINE3", "LINE4", "LINE7_FORK", "LINE8_FORK", "LINE9_INDEPENDENT").toString(), ElementType.LINE, null, List.of(24.0, 380.0));
1925+
succeedingTestForElementsIds(NETWORK_UUID, VARIANT_ID, List.of("NHV1_NHV2_1", "NHV1_NHV2_2", "LINE3", "LINE4", "LINE7_FORK", "LINE8_FORK", "LINE9_INDEPENDENT").toString(), ElementType.LINE, null, null);
1926+
succeedingTestForElementsIds(NETWORK_UUID, VARIANT_ID, List.of("NHV1_NHV2_1", "NHV1_NHV2_2", "LINE3", "LINE4", "LINE7_FORK", "LINE8_FORK", "LINE9_INDEPENDENT").toString(), ElementType.LINE, null, List.of(24.0, 380.0));
19271927
succeedingTestForElementsIds(NETWORK_UUID, VARIANT_ID, List.of("NHV1_NHV2_1", "NHV1_NHV2_2", "LINE3").toString(), ElementType.LINE, List.of("P1"), null);
19281928
succeedingTestForElementsIds(NETWORK_UUID, VARIANT_ID, List.of("NHV1_NHV2_1", "NHV1_NHV2_2", "LINE3").toString(), ElementType.LINE, List.of("P1"), List.of(24.0, 380.0));
19291929
succeedingTestForElementsIds(NETWORK_UUID, VARIANT_ID, List.of().toString(), ElementType.LINE, List.of("P1"), List.of(225.0));
@@ -2442,10 +2442,10 @@ void shouldReturnVotlageLevelsMapData() throws Exception {
24422442

24432443
@Test
24442444
void shouldReturnVoltageLevelsIds() throws Exception {
2445-
succeedingTestForElementsIds(NETWORK_UUID, null, List.of("VL", "VLGEN", "VLHV1", "VLHV2", "VLLOAD", "VLNEW2", "VLGEN3", "VLGEN4", "VLGEN5", "VLGEN6").toString(), ElementType.VOLTAGE_LEVEL, null, null);
2446-
succeedingTestForElementsIds(NETWORK_UUID, null, List.of("VL", "VLGEN", "VLHV1", "VLHV2", "VLLOAD", "VLNEW2", "VLGEN3", "VLGEN4", "VLGEN5", "VLGEN6").toString(), ElementType.VOLTAGE_LEVEL, null, List.of(24.0, 150.0, 225.0, 380.0));
2447-
succeedingTestForElementsIds(NETWORK_UUID, VARIANT_ID, List.of("VL", "VLGEN", "VLHV1", "VLHV2", "VLLOAD", "VLNEW2", "VLGEN3", "VLGEN4", "VLGEN5", "VLGEN6").toString(), ElementType.VOLTAGE_LEVEL, null, null);
2448-
succeedingTestForElementsIds(NETWORK_UUID, VARIANT_ID, List.of("VL", "VLGEN", "VLHV1", "VLHV2", "VLLOAD", "VLNEW2", "VLGEN3", "VLGEN4", "VLGEN5", "VLGEN6").toString(), ElementType.VOLTAGE_LEVEL, null, List.of(24.0, 150.0, 225.0, 380.0));
2445+
succeedingTestForElementsIds(NETWORK_UUID, null, List.of("VL", "VLGEN", "VLHV1", "VLHV2", "VLLOAD", "VLNEW2", "VLGEN3", "VLGEN4", "VLGEN5", "VLGEN6", "VLGEN7", "VLGEN8", "VLGEN9").toString(), ElementType.VOLTAGE_LEVEL, null, null);
2446+
succeedingTestForElementsIds(NETWORK_UUID, null, List.of("VL", "VLGEN", "VLHV1", "VLHV2", "VLLOAD", "VLNEW2", "VLGEN3", "VLGEN4", "VLGEN5", "VLGEN6", "VLGEN7", "VLGEN8", "VLGEN9").toString(), ElementType.VOLTAGE_LEVEL, null, List.of(24.0, 150.0, 225.0, 380.0));
2447+
succeedingTestForElementsIds(NETWORK_UUID, VARIANT_ID, List.of("VL", "VLGEN", "VLHV1", "VLHV2", "VLLOAD", "VLNEW2", "VLGEN3", "VLGEN4", "VLGEN5", "VLGEN6", "VLGEN7", "VLGEN8", "VLGEN9").toString(), ElementType.VOLTAGE_LEVEL, null, null);
2448+
succeedingTestForElementsIds(NETWORK_UUID, VARIANT_ID, List.of("VL", "VLGEN", "VLHV1", "VLHV2", "VLLOAD", "VLNEW2", "VLGEN3", "VLGEN4", "VLGEN5", "VLGEN6", "VLGEN7", "VLGEN8", "VLGEN9").toString(), ElementType.VOLTAGE_LEVEL, null, List.of(24.0, 150.0, 225.0, 380.0));
24492449
succeedingTestForElementsIds(NETWORK_UUID, VARIANT_ID, List.of("VLGEN", "VLHV1", "VLHV2", "VLLOAD", "VLNEW2", "VLGEN3", "VLGEN4", "VLGEN5", "VLGEN6").toString(), ElementType.VOLTAGE_LEVEL, List.of("P1", "P2", "P3", "P4", "P5", "P6"), null);
24502450
succeedingTestForElementsIds(NETWORK_UUID, VARIANT_ID, List.of("VLGEN", "VLHV1", "VLHV2", "VLLOAD", "VLNEW2", "VLGEN3", "VLGEN4", "VLGEN5", "VLGEN6").toString(), ElementType.VOLTAGE_LEVEL, List.of("P1", "P2", "P3", "P4", "P5", "P6"), List.of(24.0, 150.0, 225.0, 380.0));
24512451
}

‎src/test/resources/all-data-in-variant.json‎

Lines changed: 187 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,27 @@
219219
"ipMin": 0.0,
220220
"ipMax": 100.0
221221
}
222+
},
223+
{
224+
"id": "VLGEN7",
225+
"name": "Fork Distribution Point",
226+
"nominalV": 24.0,
227+
"lowVoltageLimit": 20.0,
228+
"highVoltageLimit": 30.0
229+
},
230+
{
231+
"id": "VLGEN8",
232+
"name": "Fork Destination Point 2",
233+
"nominalV": 24.0,
234+
"lowVoltageLimit": 20.0,
235+
"highVoltageLimit": 30.0
236+
},
237+
{
238+
"id": "VLGEN9",
239+
"name": "Independent Line Destination",
240+
"nominalV": 24.0,
241+
"lowVoltageLimit": 20.0,
242+
"highVoltageLimit": 30.0
222243
}
223244
],
224245
"lines": [
@@ -588,6 +609,64 @@
588609
"b1": 1.93E-4,
589610
"g2": 0.0,
590611
"b2": 1.93E-4
612+
},
613+
{
614+
"id": "LINE7_FORK",
615+
"name": "Fork Branch 1 - Primary Line",
616+
"type": "LINE",
617+
"voltageLevelId1": "VLGEN4",
618+
"voltageLevelId2": "VLGEN7",
619+
"voltageLevelName2": "Fork Distribution Point",
620+
"nominalVoltage1": 24.0,
621+
"nominalVoltage2": 24.0,
622+
"substationId1": "P4",
623+
"country1": "FR",
624+
"terminal1Connected": true,
625+
"terminal2Connected": true,
626+
"r": 3.0,
627+
"x": 33.0,
628+
"g1": 0.0,
629+
"b1": 1.93E-4,
630+
"g2": 0.0,
631+
"b2": 1.93E-4
632+
},
633+
{
634+
"id": "LINE8_FORK",
635+
"name": "Fork Branch 2 - Secondary Line",
636+
"type": "LINE",
637+
"voltageLevelId1": "VLGEN7",
638+
"voltageLevelId2": "VLGEN8",
639+
"voltageLevelName1": "Fork Distribution Point",
640+
"voltageLevelName2": "Fork Destination Point 2",
641+
"nominalVoltage1": 24.0,
642+
"nominalVoltage2": 24.0,
643+
"terminal1Connected": true,
644+
"terminal2Connected": false,
645+
"r": 2.5,
646+
"x": 28.0,
647+
"g1": 0.0,
648+
"b1": 1.6E-4,
649+
"g2": 0.0,
650+
"b2": 1.6E-4
651+
},
652+
{
653+
"id": "LINE9_INDEPENDENT",
654+
"name": "Independent Line from BUS4",
655+
"type": "LINE",
656+
"voltageLevelId1": "VLGEN7",
657+
"voltageLevelId2": "VLGEN9",
658+
"voltageLevelName1": "Fork Distribution Point",
659+
"voltageLevelName2": "Independent Line Destination",
660+
"nominalVoltage1": 24.0,
661+
"nominalVoltage2": 24.0,
662+
"terminal1Connected": true,
663+
"terminal2Connected": true,
664+
"r": 2.0,
665+
"x": 25.0,
666+
"g1": 0.0,
667+
"b1": 1.5E-4,
668+
"g2": 0.0,
669+
"b2": 1.5E-4
591670
}
592671
],
593672
"hvdcLines": [
@@ -2480,6 +2559,43 @@
24802559
"voltageLevelId": "VLGEN6",
24812560
"nominalVoltage": 24.0,
24822561
"country": "FR"
2562+
},
2563+
{
2564+
"id": "VLGEN4_0",
2565+
"v": "NaN",
2566+
"angle": "NaN",
2567+
"synchronousComponentNum": 1,
2568+
"connectedComponentNum": 1,
2569+
"voltageLevelId": "VLGEN4",
2570+
"nominalVoltage": 24.0,
2571+
"country": "FR"
2572+
},
2573+
{
2574+
"id": "VLGEN7_11",
2575+
"v": "NaN",
2576+
"angle": "NaN",
2577+
"synchronousComponentNum": 2,
2578+
"connectedComponentNum": 2,
2579+
"voltageLevelId": "VLGEN7",
2580+
"nominalVoltage": 24.0
2581+
},
2582+
{
2583+
"id": "VLGEN7_1",
2584+
"v": "NaN",
2585+
"angle": "NaN",
2586+
"synchronousComponentNum": 1,
2587+
"connectedComponentNum": 1,
2588+
"voltageLevelId": "VLGEN7",
2589+
"nominalVoltage": 24.0
2590+
},
2591+
{
2592+
"id": "VLGEN9_0",
2593+
"v": "NaN",
2594+
"angle": "NaN",
2595+
"synchronousComponentNum": 2,
2596+
"connectedComponentNum": 2,
2597+
"voltageLevelId": "VLGEN9",
2598+
"nominalVoltage": 24.0
24832599
}
24842600
],
24852601
"busbarSections": [
@@ -2510,6 +2626,31 @@
25102626
"id": "NGEN5_2_2",
25112627
"name": "NGEN5_2_2",
25122628
"voltageLevelId": "VLGEN5"
2629+
},
2630+
{
2631+
"id": "BUS1_NGEN7",
2632+
"name": "Primary Busbar VLGEN7",
2633+
"voltageLevelId": "VLGEN7"
2634+
},
2635+
{
2636+
"id": "BUS2_NGEN7",
2637+
"name": "Secondary Busbar VLGEN7",
2638+
"voltageLevelId": "VLGEN7"
2639+
},
2640+
{
2641+
"id": "BUS3_NGEN7",
2642+
"name": "Third Busbar VLGEN7",
2643+
"voltageLevelId": "VLGEN7"
2644+
},
2645+
{
2646+
"id": "BUS4_NGEN7",
2647+
"name": "Fourth Busbar VLGEN7",
2648+
"voltageLevelId": "VLGEN7"
2649+
},
2650+
{
2651+
"id": "BUS_NGEN9",
2652+
"name": "Main Busbar VLGEN9",
2653+
"voltageLevelId": "VLGEN9"
25132654
}
25142655
],
25152656
"branches": [
@@ -3096,6 +3237,52 @@
30963237
"value": 53.0,
30973238
"validity": false
30983239
}
3240+
},
3241+
{
3242+
"id": "LINE7_FORK",
3243+
"name": "Fork Branch 1 - Primary Line",
3244+
"type": "LINE",
3245+
"voltageLevelId1": "VLGEN4",
3246+
"voltageLevelId2": "VLGEN7",
3247+
"voltageLevelName2": "Fork Distribution Point",
3248+
"nominalVoltage1": 24.0,
3249+
"nominalVoltage2": 24.0,
3250+
"substationId1": "P4",
3251+
"country1": "FR",
3252+
"terminal1Connected": true,
3253+
"terminal2Connected": true,
3254+
"r": 3.0,
3255+
"x": 33.0
3256+
},
3257+
{
3258+
"id": "LINE8_FORK",
3259+
"name": "Fork Branch 2 - Secondary Line",
3260+
"type": "LINE",
3261+
"voltageLevelId1": "VLGEN7",
3262+
"voltageLevelId2": "VLGEN8",
3263+
"voltageLevelName1": "Fork Distribution Point",
3264+
"voltageLevelName2": "Fork Destination Point 2",
3265+
"nominalVoltage1": 24.0,
3266+
"nominalVoltage2": 24.0,
3267+
"terminal1Connected": true,
3268+
"terminal2Connected": false,
3269+
"r": 2.5,
3270+
"x": 28.0
3271+
},
3272+
{
3273+
"id": "LINE9_INDEPENDENT",
3274+
"name": "Independent Line from BUS4",
3275+
"type": "LINE",
3276+
"voltageLevelId1": "VLGEN7",
3277+
"voltageLevelId2": "VLGEN9",
3278+
"voltageLevelName1": "Fork Distribution Point",
3279+
"voltageLevelName2": "Independent Line Destination",
3280+
"nominalVoltage1": 24.0,
3281+
"nominalVoltage2": 24.0,
3282+
"terminal1Connected": true,
3283+
"terminal2Connected": true,
3284+
"r": 2.0,
3285+
"x": 25.0
30993286
}
31003287
]
31013288
}

0 commit comments

Comments
 (0)