Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use english and rename line catalog test file #532

Merged
merged 3 commits into from
Sep 10, 2024
Merged

Use english and rename line catalog test file #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
606f9c5
use english and rename cause will be used by demo azure
dbraquart Sep 6, 2024
5c6cd8b
Merge branch 'main' into use-english-in-line-catalog-example
dbraquart Sep 9, 2024
031ffe0
Merge branch 'main' into use-english-in-line-catalog-example
dbraquart Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 12 additions & 13 deletions src/test/resources/line_types_catalog_1.json → src/test/resources/lines-catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"category": "AERIAL",
"type": "TEST1 123AB",
"voltage": 63,
"conductorType": "AL - Aluminium",
"conductorType": "AL - Aluminum",
"section": 27.5,
"conductorsNumber": 1,
"circuitsNumber": 1,
Expand All @@ -16,7 +16,7 @@
"category": "AERIAL",
"type": "TEST1 123AB",
"voltage": 45,
"conductorType": "AL - Aluminium",
"conductorType": "AL - Aluminum",
"section": 27.5,
"conductorsNumber": 1,
"circuitsNumber": 1,
Expand All @@ -29,7 +29,7 @@
"category": "AERIAL",
"type": "TEST2 456CD",
"voltage": 90,
"conductorType": "CU - Cuivre",
"conductorType": "CO - Copper",
"section": 1700,
"conductorsNumber": 3,
"circuitsNumber": 2,
Expand All @@ -42,7 +42,7 @@
"category": "AERIAL",
"type": "TEST3 789EF",
"voltage": 225,
"conductorType": "CU - Cuivre",
"conductorType": "CO - Copper",
"section": 15,
"conductorsNumber": 4,
"circuitsNumber": 1,
Expand All @@ -55,7 +55,7 @@
"category": "AERIAL",
"type": "TEST3 789EF",
"voltage": 225,
"conductorType": "AL - Aluminium",
"conductorType": "AL - Aluminum",
"section": 15,
"conductorsNumber": 4,
"circuitsNumber": 1,
Expand All @@ -68,7 +68,7 @@
"category": "AERIAL",
"type": "TEST3 789EF",
"voltage": 225,
"conductorType": "AL - Aluminium",
"conductorType": "AL - Aluminum",
"section": 15,
"conductorsNumber": 4,
"circuitsNumber": 1,
Expand All @@ -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
Expand All @@ -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
Expand All @@ -105,7 +105,7 @@
"category": "UNDERGROUND",
"type": "CS2 789EF",
"voltage": 400,
"conductorType": "Aluminium",
"conductorType": "Aluminum",
"section": 26,
"insulator": "CD",
"screen": "Alu v2",
Expand All @@ -117,7 +117,7 @@
"category": "UNDERGROUND",
"type": "CS2 789EF",
"voltage": 400,
"conductorType": "Aluminium",
"conductorType": "Aluminum",
"section": 26,
"insulator": "CD",
"screen": "Alu v2",
Expand All @@ -126,4 +126,3 @@
"linearCapacity": 0.000000789
}
]

Loading