Skip to content

Commit 33e22d1

Browse files
TheMaskedTurtleTheMaskedTurtle
committed
fix: tests with branches
Signed-off-by: Joris Mancini <[email protected]>
1 parent e6e60e1 commit 33e22d1

File tree

2 files changed

+233
-0
lines changed

2 files changed

+233
-0
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,6 +1526,7 @@ private void succeedingTestForAllEquipmentsInfos(UUID networkUuid, String varian
15261526
Map<String, Map<String, String>> body;
15271527
if (withOptionalLoading) {
15281528
body = Map.of(
1529+
String.valueOf(ElementType.BRANCH), Map.of(QUERY_PARAM_LOAD_OPERATIONAL_LIMIT_GROUPS, String.valueOf(true)),
15291530
String.valueOf(ElementType.LINE), Map.of(QUERY_PARAM_LOAD_OPERATIONAL_LIMIT_GROUPS, String.valueOf(true)),
15301531
String.valueOf(ElementType.TWO_WINDINGS_TRANSFORMER), Map.of(QUERY_PARAM_LOAD_OPERATIONAL_LIMIT_GROUPS, String.valueOf(true)),
15311532
String.valueOf(ElementType.GENERATOR), Map.of(QUERY_PARAM_LOAD_REGULATING_TERMINALS, String.valueOf(true))

‎src/test/resources/all-data-without-optionals.json‎

Lines changed: 232 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2142,5 +2142,237 @@
21422142
"name": "NGEN5_2_2",
21432143
"voltageLevelId": "VLGEN5"
21442144
}
2145+
],
2146+
"branches": [
2147+
{
2148+
"id": "NHV1_NHV2_1",
2149+
"type": "LINE",
2150+
"voltageLevelId1": "VLHV1",
2151+
"voltageLevelId2": "VLHV2",
2152+
"nominalVoltage1": 380.0,
2153+
"nominalVoltage2": 380.0,
2154+
"substationId1": "P1",
2155+
"substationId2": "P2",
2156+
"country1": "FR",
2157+
"terminal1Connected": true,
2158+
"terminal2Connected": true,
2159+
"p1": 1.1,
2160+
"q1": 2.2,
2161+
"p2": 3.33,
2162+
"q2": 4.44,
2163+
"r": 9.0,
2164+
"x": 10.0,
2165+
"substationProperties1": {
2166+
"Country": "FR"
2167+
}
2168+
},
2169+
{
2170+
"id": "NHV1_NHV2_2",
2171+
"type": "LINE",
2172+
"voltageLevelId1": "VLHV1",
2173+
"voltageLevelId2": "VLHV2",
2174+
"nominalVoltage1": 380.0,
2175+
"nominalVoltage2": 380.0,
2176+
"substationId1": "P1",
2177+
"substationId2": "P2",
2178+
"country1": "FR",
2179+
"terminal1Connected": true,
2180+
"terminal2Connected": true,
2181+
"r": 3.0,
2182+
"x": 33.0,
2183+
"substationProperties1": {
2184+
"Country": "FR"
2185+
}
2186+
},
2187+
{
2188+
"id": "LINE3",
2189+
"type": "LINE",
2190+
"voltageLevelId1": "VLGEN",
2191+
"voltageLevelId2": "VLGEN3",
2192+
"voltageLevelName1": "VLGEN_Name",
2193+
"nominalVoltage1": 24.0,
2194+
"nominalVoltage2": 24.0,
2195+
"substationId1": "P1",
2196+
"substationId2": "P3",
2197+
"country1": "FR",
2198+
"country2": "FR",
2199+
"terminal1Connected": true,
2200+
"terminal2Connected": true,
2201+
"p1": 200.0,
2202+
"p2": 100.0,
2203+
"r": 3.0,
2204+
"x": 33.0,
2205+
"branchObservability": {
2206+
"qualityP1": {
2207+
"standardDeviation": 23.31,
2208+
"isRedundant": true
2209+
},
2210+
"qualityQ1": {
2211+
"standardDeviation": 23.25,
2212+
"isRedundant": true
2213+
},
2214+
"qualityP2": {
2215+
"standardDeviation": 23.31,
2216+
"isRedundant": true
2217+
},
2218+
"qualityQ2": {
2219+
"standardDeviation": 23.25,
2220+
"isRedundant": true
2221+
},
2222+
"observable": true
2223+
},
2224+
"substationProperties1": {
2225+
"Country": "FR"
2226+
},
2227+
"voltageLevelProperties1": {
2228+
"Country": "FR"
2229+
},
2230+
"substationProperties2": {
2231+
"Country": "FR"
2232+
},
2233+
"operatingStatus": "PLANNED_OUTAGE",
2234+
"measurementP1": {
2235+
"value": 11.0,
2236+
"validity": true
2237+
},
2238+
"measurementQ1": {
2239+
"value": 24.0,
2240+
"validity": false
2241+
},
2242+
"measurementQ2": {
2243+
"value": 45.0,
2244+
"validity": true
2245+
}
2246+
},
2247+
{
2248+
"id": "LINE4",
2249+
"type": "LINE",
2250+
"voltageLevelId1": "VLGEN6",
2251+
"voltageLevelId2": "VLGEN3",
2252+
"nominalVoltage1": 24.0,
2253+
"nominalVoltage2": 24.0,
2254+
"substationId1": "P6",
2255+
"substationId2": "P3",
2256+
"country1": "FR",
2257+
"country2": "FR",
2258+
"terminal1Connected": true,
2259+
"terminal2Connected": true,
2260+
"r": 3.0,
2261+
"x": 33.0,
2262+
"substationProperties2": {
2263+
"Country": "FR"
2264+
}
2265+
},
2266+
{
2267+
"id": "NGEN_NHV1",
2268+
"type": "TWO_WINDINGS_TRANSFORMER",
2269+
"voltageLevelId1": "VLGEN",
2270+
"voltageLevelId2": "VLHV1",
2271+
"voltageLevelName1": "VLGEN_Name",
2272+
"nominalVoltage1": 24.0,
2273+
"nominalVoltage2": 380.0,
2274+
"substationId1": "P1",
2275+
"substationId2": "P1",
2276+
"country1": "FR",
2277+
"country2": "FR",
2278+
"terminal1Connected": true,
2279+
"terminal2Connected": true,
2280+
"p1": 11.1,
2281+
"q1": 12.2,
2282+
"p2": 13.33,
2283+
"q2": 14.44,
2284+
"r": 0.26658461538461536,
2285+
"x": 11.104492831516762,
2286+
"substationProperties1": {
2287+
"Country": "FR"
2288+
},
2289+
"voltageLevelProperties1": {
2290+
"Country": "FR"
2291+
},
2292+
"substationProperties2": {
2293+
"Country": "FR"
2294+
},
2295+
"operatingStatus": "PLANNED_OUTAGE"
2296+
},
2297+
{
2298+
"id": "NHV2_NLOAD",
2299+
"type": "TWO_WINDINGS_TRANSFORMER",
2300+
"voltageLevelId1": "VLHV2",
2301+
"voltageLevelId2": "VLLOAD",
2302+
"nominalVoltage1": 380.0,
2303+
"nominalVoltage2": 150.0,
2304+
"substationId1": "P2",
2305+
"substationId2": "P2",
2306+
"terminal1Connected": true,
2307+
"terminal2Connected": true,
2308+
"p1": 5.5,
2309+
"q1": 6.6,
2310+
"p2": 7.77,
2311+
"q2": 8.88,
2312+
"r": 0.04724999999999999,
2313+
"x": 4.049724365620455,
2314+
"operatingStatus": "PLANNED_OUTAGE"
2315+
},
2316+
{
2317+
"id": "NGEN_NHV2",
2318+
"type": "TWO_WINDINGS_TRANSFORMER",
2319+
"voltageLevelId1": "VLGEN",
2320+
"voltageLevelId2": "VLHV1",
2321+
"voltageLevelName1": "VLGEN_Name",
2322+
"nominalVoltage1": 24.0,
2323+
"nominalVoltage2": 380.0,
2324+
"substationId1": "P1",
2325+
"substationId2": "P1",
2326+
"country1": "FR",
2327+
"country2": "FR",
2328+
"terminal1Connected": true,
2329+
"terminal2Connected": true,
2330+
"r": 47.0,
2331+
"x": 23.0,
2332+
"branchObservability": {
2333+
"qualityP1": {
2334+
"standardDeviation": 23.31,
2335+
"isRedundant": true
2336+
},
2337+
"qualityQ1": {
2338+
"standardDeviation": 23.25,
2339+
"isRedundant": true
2340+
},
2341+
"qualityP2": {
2342+
"standardDeviation": 23.31,
2343+
"isRedundant": true
2344+
},
2345+
"qualityQ2": {
2346+
"standardDeviation": 23.25,
2347+
"isRedundant": true
2348+
},
2349+
"observable": true
2350+
},
2351+
"substationProperties1": {
2352+
"Country": "FR"
2353+
},
2354+
"voltageLevelProperties1": {
2355+
"Country": "FR"
2356+
},
2357+
"substationProperties2": {
2358+
"Country": "FR"
2359+
},
2360+
"measurementP1": {
2361+
"value": 27.0,
2362+
"validity": true
2363+
},
2364+
"measurementQ1": {
2365+
"value": 13.0,
2366+
"validity": true
2367+
},
2368+
"measurementP2": {
2369+
"value": 68.0,
2370+
"validity": false
2371+
},
2372+
"measurementQ2": {
2373+
"value": 53.0,
2374+
"validity": false
2375+
}
2376+
}
21452377
]
21462378
}

0 commit comments

Comments
 (0)