Add configuration similar to the one in AbstractMainConnectedComponen…

…tWithSwitchTest, with buses in bus breaker view between retained switches and with no equipments.

Signed-off-by: Franck LECUYER <[email protected]>

network-store-iidm-impl/src/test/java/com/powsybl/network/store/iidm/impl/VoltageLevelSetVTest.java

@@ -16,6 +16,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertEquals;
@@ -27,13 +28,14 @@
 public class VoltageLevelSetVTest {
     @Test
     public void testWithMultipleBusInBusBreakerAndBusView() {
-        Network network = Network.create("test_mcc", "test");
-
-        VoltageLevelImpl vl1 = createNodeBreaker(network);
-        VoltageLevelImpl vl2 = createBusBreaker(network);
-
-        testSetVMultipleBusAcrossViews(vl1, NBVL_BUSBREAKERVIEWBUS_TO_BUSVIEWBUS, NBVL_BUSVIEWBUS_TO_BUSBREAKERVIEWBUS);
-        testSetVMultipleBusAcrossViews(vl2, BBVL_CONFIGUREDBUS_TO_BUSVIEWBUS, BBVL_BUSVIEWBUS_TO_CONFIGUREDBUS);
+        testSetVMultipleBusAcrossViews(() -> {
+            Network network = Network.create("test_mcc", "test");
+            return createNodeBreaker(network);
+        }, NBVL_BUSBREAKERVIEWBUS_TO_BUSVIEWBUS, NBVL_BUSVIEWBUS_TO_BUSBREAKERVIEWBUS);
+        testSetVMultipleBusAcrossViews(() -> {
+            Network network = Network.create("test_mcc", "test");
+            return createBusBreaker(network);
+        }, BBVL_CONFIGUREDBUS_TO_BUSVIEWBUS, BBVL_BUSVIEWBUS_TO_CONFIGUREDBUS);
     }
 
     private static final Map<String, String> NBVL_BUSBREAKERVIEWBUS_TO_BUSVIEWBUS = new TreeMap<>(Map.of(
@@ -260,22 +262,17 @@ private static VoltageLevelImpl createBusBreaker(Network network) {
         return (VoltageLevelImpl) vl2;
     }
 
-    private void testSetVMultipleBusAcrossViews(VoltageLevelImpl vl, Map<String, String> busBreakerViewBusToBusViewBus, Map<String, List<String>> busViewBusToBusBreakerViewBus) {
+    private void testSetVMultipleBusAcrossViews(Supplier<VoltageLevel> supplier, Map<String, String> busBreakerViewBusToBusViewBus, Map<String, List<String>> busViewBusToBusBreakerViewBus) {
+
+        VoltageLevel vl = supplier.get();
         for (Map.Entry<String, String > entry : busBreakerViewBusToBusViewBus.entrySet()) {
             String busbreakerviewbusid = entry.getKey();
             String busviewbusid = entry.getValue();
 
-
-            // should we replace with new network for each test ??
-            vl.invalidateCalculatedBuses(); // but this keeps previous v values
-            // TODO this forces a computation of all busviews
-            // need to test when views are not initialized
             for (Bus bbvb : vl.getBusBreakerView().getBuses()) {
-                System.out.println("Bus dans bus breaker view : " + bbvb.getId());
                 bbvb.setV(Double.NaN);
             }
             for (Bus bvb : vl.getBusView().getBuses()) {
-                System.out.println("Bus dans bus view : " + bvb.getId());
                 bvb.setV(Double.NaN);
             }
 
@@ -298,14 +295,11 @@ private void testSetVMultipleBusAcrossViews(VoltageLevelImpl vl, Map<String, Str
             }
         }
 
+        vl = supplier.get();
         for (Map.Entry<String, List<String> > entry : busViewBusToBusBreakerViewBus.entrySet()) {
             String busviewbusid = entry.getKey();
             List<String> busbreakerviewbusids = entry.getValue();
 
-            // should we replace with new network for each test ??
-            vl.invalidateCalculatedBuses(); // but this keeps previous v values
-            // TODO this forces a computation of all busviews
-            // need to test when views are not initialized
             for (Bus bbvb : vl.getBusBreakerView().getBuses()) {
                 bbvb.setV(Double.NaN);
             }