diff --git a/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java b/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java index c12a66b08..b2028a7af 100644 --- a/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java +++ b/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java @@ -103,7 +103,7 @@ public class ModificationControllerTest { private static final String URI_NETWORK_WITH_TEE_POINT_MODIF = URI_NETWORK_MODIF_BASE + "?networkUuid=" + TEST_NETWORK_WITH_TEE_POINT_ID + URI_NETWORK_MODIF_PARAMS; private static final String URI_LINE_CATALOG = URI_NETWORK_MODIF_BASE + "/catalog/line_types"; - private static final String LINE_TYPES_CATALOG_JSON_FILE_1 = "/line_types_catalog_1.json"; + private static final String LINE_TYPES_CATALOG_JSON_FILE_1 = "/lines-catalog.json"; private static final String LINE_TYPES_CATALOG_JSON_FILE_2 = "/line_types_catalog_2.json"; @Autowired diff --git a/src/test/resources/line_types_catalog_1.json b/src/test/resources/lines-catalog.json similarity index 86% rename from src/test/resources/line_types_catalog_1.json rename to src/test/resources/lines-catalog.json index 2dda777cb..860e3fca4 100644 --- a/src/test/resources/line_types_catalog_1.json +++ b/src/test/resources/lines-catalog.json @@ -3,7 +3,7 @@ "category": "AERIAL", "type": "TEST1 123AB", "voltage": 63, - "conductorType": "AL - Aluminium", + "conductorType": "AL - Aluminum", "section": 27.5, "conductorsNumber": 1, "circuitsNumber": 1, @@ -16,7 +16,7 @@ "category": "AERIAL", "type": "TEST1 123AB", "voltage": 45, - "conductorType": "AL - Aluminium", + "conductorType": "AL - Aluminum", "section": 27.5, "conductorsNumber": 1, "circuitsNumber": 1, @@ -29,7 +29,7 @@ "category": "AERIAL", "type": "TEST2 456CD", "voltage": 90, - "conductorType": "CU - Cuivre", + "conductorType": "CO - Copper", "section": 1700, "conductorsNumber": 3, "circuitsNumber": 2, @@ -42,7 +42,7 @@ "category": "AERIAL", "type": "TEST3 789EF", "voltage": 225, - "conductorType": "CU - Cuivre", + "conductorType": "CO - Copper", "section": 15, "conductorsNumber": 4, "circuitsNumber": 1, @@ -55,7 +55,7 @@ "category": "AERIAL", "type": "TEST3 789EF", "voltage": 225, - "conductorType": "AL - Aluminium", + "conductorType": "AL - Aluminum", "section": 15, "conductorsNumber": 4, "circuitsNumber": 1, @@ -68,7 +68,7 @@ "category": "AERIAL", "type": "TEST3 789EF", "voltage": 225, - "conductorType": "AL - Aluminium", + "conductorType": "AL - Aluminum", "section": 15, "conductorsNumber": 4, "circuitsNumber": 1, @@ -81,10 +81,10 @@ "category": "UNDERGROUND", "type": "CS1 123AB", "voltage": 400, - "conductorType": "Aluminium", + "conductorType": "Aluminum", "section": 24, "insulator": "AB", - "screen": "Aluminium", + "screen": "Aluminum", "linearResistance": 0.010, "linearReactance": 0.120, "linearCapacity": 0.000000123 @@ -93,10 +93,10 @@ "category": "UNDERGROUND", "type": "CS2 456CD", "voltage": 225, - "conductorType": "Cuivre", + "conductorType": "Copper", "section": 25, "insulator": "CD", - "screen": "Alu v2", + "screen": "Copper", "linearResistance": 0.017, "linearReactance": 0.150, "linearCapacity": 0.000000456 @@ -105,7 +105,7 @@ "category": "UNDERGROUND", "type": "CS2 789EF", "voltage": 400, - "conductorType": "Aluminium", + "conductorType": "Aluminum", "section": 26, "insulator": "CD", "screen": "Alu v2", @@ -117,7 +117,7 @@ "category": "UNDERGROUND", "type": "CS2 789EF", "voltage": 400, - "conductorType": "Aluminium", + "conductorType": "Aluminum", "section": 26, "insulator": "CD", "screen": "Alu v2", @@ -126,4 +126,3 @@ "linearCapacity": 0.000000789 } ] -