Migrate tests to JUnit5 (#117)

Signed-off-by: Tristan Chuine <[email protected]>
powsybl · Oct 23, 2024 · edb8273 · edb8273
1 parent 3093e00
commit edb8273
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 177 deletions.
diff --git a/pom.xml b/pom.xml
@@ -121,6 +121,8 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+
+            <!-- project specific dependencies -->
         </dependencies>
     </dependencyManagement>
 
@@ -181,24 +183,9 @@
             <artifactId>powsybl-config-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-test-autoconfigure</artifactId>
+            <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/src/test/java/com/powsybl/sld/server/GeoDataServiceTest.java b/src/test/java/com/powsybl/sld/server/GeoDataServiceTest.java
@@ -7,12 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import com.powsybl.iidm.network.*;
+import com.powsybl.iidm.network.Country;
 import com.powsybl.network.store.client.NetworkStoreService;
 import com.powsybl.sld.server.dto.Coordinate;
 import com.powsybl.sld.server.dto.SubstationGeoData;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentMatchers;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
@@ -22,83 +22,29 @@
 import java.util.List;
 import java.util.UUID;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.when;
 
-public class GeoDataServiceTest {
+class GeoDataServiceTest {
+    private static final String BASE_URI = "http://geo-data-server/";
 
-    private static final String VARIANT_1_ID = "variant_1";
-    private static final String VARIANT_2_ID = "variant_2";
-    private final String baseUri = "http://geo-data-server/";
     @Mock
     private RestTemplate restTemplate;
+
     @InjectMocks
     private GeoDataService geoDataService;
+
     @Mock
     private NetworkStoreService networkStoreService;
 
-    public static Network createNetwork() {
-        Network network = Network.create("test", "test");
-        Substation substationFr1 = network.newSubstation()
-                .setId("subFr1")
-                .setCountry(Country.FR)
-                .setTso("RTE")
-                .add();
-        VoltageLevel voltageLevelFr1A = substationFr1.newVoltageLevel()
-                .setId("vlFr1A")
-                .setName("vlFr1A")
-                .setNominalV(440.0)
-                .setHighVoltageLimit(400.0)
-                .setLowVoltageLimit(200.0)
-                .setTopologyKind(TopologyKind.BUS_BREAKER)
-                .add();
-        voltageLevelFr1A.getBusBreakerView().newBus()
-                .setId("busFr1A")
-                .setName("busFr1A")
-                .add();
-        VoltageLevel voltageLevelFr1B = substationFr1.newVoltageLevel()
-                .setId("vlFr1B").setName("vlFr1B")
-                .setNominalV(200.0)
-                .setHighVoltageLimit(400.0)
-                .setLowVoltageLimit(200.0)
-                .setTopologyKind(TopologyKind.BUS_BREAKER)
-                .add();
-        voltageLevelFr1B.getBusBreakerView().newBus()
-                .setId("busFr1B")
-                .setName("busFr1B")
-                .add();
-
-        Substation substationFr2 = network.newSubstation()
-                .setId("subFr2")
-                .setCountry(Country.FR)
-                .setTso("RTE")
-                .add();
-        VoltageLevel voltageLevelFr2A = substationFr2.newVoltageLevel()
-                .setId("vlFr2A")
-                .setName("vlFr2A")
-                .setNominalV(440.0)
-                .setHighVoltageLimit(400.0)
-                .setLowVoltageLimit(200.0)
-                .setTopologyKind(TopologyKind.BUS_BREAKER)
-                .add();
-        voltageLevelFr2A.getBusBreakerView().newBus()
-                .setId("busFr2A")
-                .setName("busFr2A")
-                .add();
-        network.getVariantManager().cloneVariant(VariantManagerConstants.INITIAL_VARIANT_ID, VARIANT_1_ID);
-        network.getVariantManager().cloneVariant(VariantManagerConstants.INITIAL_VARIANT_ID, VARIANT_2_ID);
-
-        return network;
-    }
-
-    @Before
-    public void setUp() {
+    @BeforeEach
+    void setUp() {
         MockitoAnnotations.initMocks(this);
-        geoDataService.setGeoDataServerBaseUri(baseUri);
+        geoDataService.setGeoDataServerBaseUri(BASE_URI);
     }
 
     @Test
-    public void testGetSubstationsGraphics() {
+    void testGetSubstationsGraphics() {
         UUID networkUuid = UUID.randomUUID();
         String variantId = "variant2";
         List<String> substationsIds = List.of("subFr1", "subFr2");
@@ -113,7 +59,7 @@ public void testGetSubstationsGraphics() {
     }
 
     @Test
-    public void testGetSubstationsGraphicsWithoutVariantId() {
+    void testGetSubstationsGraphicsWithoutVariantId() {
         UUID networkUuid = UUID.randomUUID();
         List<String> substationsIds = List.of("subFr1");
         SubstationGeoData substationGeoData = new SubstationGeoData();