add test

gridsuite · Dec 5, 2023 · 8b95765 · 8b95765
1 parent 5fd4ae2
commit 8b95765
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/src/main/java/org/gridsuite/filter/server/FilterController.java b/src/main/java/org/gridsuite/filter/server/FilterController.java
@@ -149,7 +149,7 @@ public ResponseEntity<List<IdentifiableAttributes>> exportFilter(@PathVariable("
     @PostMapping(value = "/filters/complexity", produces = MediaType.APPLICATION_JSON_VALUE)
     @Operation(summary = "Calculate filters complexity by given ids")
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The complexity")})
-    public ResponseEntity<Integer> exportFilter(@RequestBody Map<Integer, List<Map<String, List<UUID>>>> containerIdsMap,
+    public ResponseEntity<Integer> computeFiltersComplexity(@RequestBody Map<Integer, List<Map<String, List<UUID>>>> containerIdsMap,
                                                 @RequestParam(value = "networkUuid") UUID networkUuid,
                                                 @RequestParam(value = "variantId", required = false) String variantId) {
         Integer count = service.countComplexity(containerIdsMap, networkUuid, variantId);

diff --git a/src/test/java/org/gridsuite/filter/server/FilterEntityControllerTest.java b/src/test/java/org/gridsuite/filter/server/FilterEntityControllerTest.java
@@ -969,6 +969,25 @@ public void testExportFilters() throws Exception {
 
     }
 
+    @Test
+    public void testComputeFiltersComplexity() throws Exception {
+        final var json = "{\"3\":[{\"injections\":[\"cf399ef3-7f14-4884-8c82-1c90300da321\"],\"contingencies\":[\"cf399ef3-7f14-4884-8c82-1c90300da323\"],\"monitoredBranchs\":[\"cf399ef3-7f14-4884-8c82-1c90300da322\"]}],\"2\":[{\"injections\":[\"cf399ef3-7f14-4884-8c82-1c90300da322\"],\"contingencies\":[\"cf399ef3-7f14-4884-8c82-1c90300da323\"],\"monitoredBranchs\":[\"cf399ef3-7f14-4884-8c82-1c90300da321\"]}],\"1\":[{\"injections\":[\"cf399ef3-7f14-4884-8c82-1c90300da322\"],\"contingencies\":[\"cf399ef3-7f14-4884-8c82-1c90300da323\"],\"monitoredBranchs\":[\"cf399ef3-7f14-4884-8c82-1c90300da321\"]}],\"0\":[{\"injections\":[\"cf399ef3-7f14-4884-8c82-1c90300da321\"],\"contingencies\":[\"cf399ef3-7f14-4884-8c82-1c90300da323\"],\"monitoredBranchs\":[\"cf399ef3-7f14-4884-8c82-1c90300da322\"]}]}";
+        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
+        params.add("networkUuid", NETWORK_UUID.toString());
+        params.add("variantId", VARIANT_ID_1);
+
+        Integer filtersComplexityCount = objectMapper.readValue(
+                mvc.perform(post("/" + FilterApi.API_VERSION + "/filters/complexity")
+                                .params(params)
+                                .content(json)
+                                .contentType(APPLICATION_JSON))
+                        .andExpect(status().isOk())
+                        .andReturn().getResponse().getContentAsString(),
+                new TypeReference<>() {
+                });
+        assertEquals(Optional.of(4), Optional.ofNullable(filtersComplexityCount));
+    }
+
     private void checkFilterEquipments(List<FilterEquipments> filterEquipments1, List<FilterEquipments> filterEquipments2) {
         assertEquals(CollectionUtils.isEmpty(filterEquipments1), CollectionUtils.isEmpty(filterEquipments2));
         assertEquals(filterEquipments1.size(), filterEquipments2.size());