fix tests

Signed-off-by: Joris Mancini <[email protected]>

Author: TheMaskedTurtle

src/main/java/org/gridsuite/network/map/dto/definition/bus/BusTabInfos.java

@@ -25,8 +25,10 @@ public class BusTabInfos extends ElementInfosWithProperties {
 
     private Double angle;
 
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     private Integer synchronousComponentNum;
 
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     private Integer connectedComponentNum;
 
     private String voltageLevelId;

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

@@ -76,6 +76,7 @@ class NetworkMapControllerTest {
     public static final String QUERY_PARAM_DC_POWER_FACTOR = "dcPowerFactor";
     public static final String QUERY_PARAM_LOAD_OPERATIONAL_LIMIT_GROUPS = "loadOperationalLimitGroups";
     public static final String QUERY_PARAM_LOAD_REGULATING_TERMINALS = "loadRegulatingTerminals";
+    public static final String QUERY_PARAM_LOAD_NETWORK_COMPONENTS = "loadNetworkComponents";
     public static final String QUERY_PARAM_NOMINAL_VOLTAGES = "nominalVoltages";
 
     @Autowired
@@ -1443,6 +1444,7 @@ private void succeedingTestForElementsInfos(UUID networkUuid, String variantId,
         if (withOptionalLoading) {
             queryParams.add(String.format(QUERY_FORMAT_ADDITIONAL_PARAMS, QUERY_PARAM_LOAD_OPERATIONAL_LIMIT_GROUPS), String.valueOf(true));
             queryParams.add(String.format(QUERY_FORMAT_ADDITIONAL_PARAMS, QUERY_PARAM_LOAD_REGULATING_TERMINALS), String.valueOf(true));
+            queryParams.add(String.format(QUERY_FORMAT_ADDITIONAL_PARAMS, QUERY_PARAM_LOAD_NETWORK_COMPONENTS), String.valueOf(true));
         }
         MvcResult mvcResult = mvc.perform(post("/v1/networks/{networkUuid}/elements", networkUuid)
                         .queryParams(queryParams)
@@ -1529,7 +1531,8 @@ private void succeedingTestForAllEquipmentsInfos(UUID networkUuid, String varian
                 String.valueOf(ElementType.BRANCH), Map.of(QUERY_PARAM_LOAD_OPERATIONAL_LIMIT_GROUPS, String.valueOf(true)),
                 String.valueOf(ElementType.LINE), Map.of(QUERY_PARAM_LOAD_OPERATIONAL_LIMIT_GROUPS, String.valueOf(true)),
                 String.valueOf(ElementType.TWO_WINDINGS_TRANSFORMER), Map.of(QUERY_PARAM_LOAD_OPERATIONAL_LIMIT_GROUPS, String.valueOf(true)),
-                String.valueOf(ElementType.GENERATOR), Map.of(QUERY_PARAM_LOAD_REGULATING_TERMINALS, String.valueOf(true))
+                String.valueOf(ElementType.GENERATOR), Map.of(QUERY_PARAM_LOAD_REGULATING_TERMINALS, String.valueOf(true)),
+                String.valueOf(ElementType.BUS), Map.of(QUERY_PARAM_LOAD_NETWORK_COMPONENTS, String.valueOf(true))
             );
         } else {
             body = Map.of();

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

@@ -2165,8 +2165,6 @@
       "id": "VLGEN_0",
       "v": "NaN",
       "angle": "NaN",
-      "synchronousComponentNum": 0,
-      "connectedComponentNum": 0,
       "voltageLevelId": "VLGEN",
       "nominalVoltage": 24.0,
       "country": "FR",
@@ -2181,8 +2179,6 @@
       "id": "VLHV1_0",
       "v": "NaN",
       "angle": "NaN",
-      "synchronousComponentNum": 0,
-      "connectedComponentNum": 0,
       "voltageLevelId": "VLHV1",
       "nominalVoltage": 380.0,
       "country": "FR",
@@ -2194,26 +2190,20 @@
       "id": "VLHV2_0",
       "v": "NaN",
       "angle": "NaN",
-      "synchronousComponentNum": 0,
-      "connectedComponentNum": 0,
       "voltageLevelId": "VLHV2",
       "nominalVoltage": 380.0
     },
     {
       "id": "VLLOAD_0",
       "v": "NaN",
       "angle": "NaN",
-      "synchronousComponentNum": 0,
-      "connectedComponentNum": 0,
       "voltageLevelId": "VLLOAD",
       "nominalVoltage": 150.0
     },
     {
       "id": "VLNEW2_0",
       "v": "NaN",
       "angle": "NaN",
-      "synchronousComponentNum": 0,
-      "connectedComponentNum": 0,
       "voltageLevelId": "VLNEW2",
       "nominalVoltage": 225.0,
       "country": "FR",
@@ -2228,8 +2218,6 @@
       "id": "VLGEN3_0",
       "v": "NaN",
       "angle": "NaN",
-      "synchronousComponentNum": 0,
-      "connectedComponentNum": 0,
       "voltageLevelId": "VLGEN3",
       "nominalVoltage": 24.0,
       "country": "FR",
@@ -2241,8 +2229,6 @@
       "id": "VLGEN6_0",
       "v": "NaN",
       "angle": "NaN",
-      "synchronousComponentNum": 0,
-      "connectedComponentNum": 0,
       "voltageLevelId": "VLGEN6",
       "nominalVoltage": 24.0,
       "country": "FR"
@@ -2251,8 +2237,6 @@
       "id": "VLGEN4_0",
       "v": "NaN",
       "angle": "NaN",
-      "synchronousComponentNum": 1,
-      "connectedComponentNum": 1,
       "voltageLevelId": "VLGEN4",
       "nominalVoltage": 24.0,
       "country": "FR"