From be75734475242a4c0754970299b247748bf318b2 Mon Sep 17 00:00:00 2001 From: flaminiaScarciofolo Date: Thu, 28 Nov 2024 15:35:17 +0100 Subject: [PATCH] [SELC-6086] clean tests and remove unused swagger reference --- .../resources/swagger/swagger_en.properties | 1 - .../web/controller/UserV2ControllerTest.java | 25 ------------------- .../web/model/UpdateUserDtoTest.java | 5 ++-- 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/web/src/main/resources/swagger/swagger_en.properties b/web/src/main/resources/swagger/swagger_en.properties index 9be851718..e4ccc5e96 100644 --- a/web/src/main/resources/swagger/swagger_en.properties +++ b/web/src/main/resources/swagger/swagger_en.properties @@ -101,7 +101,6 @@ swagger.dashboard.user.model.name=User's name swagger.dashboard.user.model.surname=User's surname swagger.dashboard.user.model.birthDate=User's birth date swagger.dashboard.user.model.email=User's personal email -swagger.dashboard.user.model.phone=User's personal phone Number swagger.dashboard.user.model.workContacts=User's workcontacts, contains the emails associated to every institution the user is assigned to swagger.dashboard.user.model.institutionalEmail=User's institutional email swagger.dashboard.user.model.institutionalPhone=User's institutional phone number diff --git a/web/src/test/java/it/pagopa/selfcare/dashboard/web/controller/UserV2ControllerTest.java b/web/src/test/java/it/pagopa/selfcare/dashboard/web/controller/UserV2ControllerTest.java index c2b32db5c..de0f7020c 100644 --- a/web/src/test/java/it/pagopa/selfcare/dashboard/web/controller/UserV2ControllerTest.java +++ b/web/src/test/java/it/pagopa/selfcare/dashboard/web/controller/UserV2ControllerTest.java @@ -409,31 +409,6 @@ void search_EmptyObject() throws Exception { Mockito.verifyNoMoreInteractions(userServiceMock); } - @Test - void updateUser_EmptyObject() throws Exception { - //given - final String id = "userId"; - final String institutionId = "institutionId"; - - byte[] userStream = Files.readAllBytes(Paths.get("src/test/resources/stubs/updateUserDto.json")); - UpdateUserDto updateUserDto = objectMapper.readValue(userStream, UpdateUserDto.class); - - //when - mockMvc.perform(MockMvcRequestBuilders - .put(BASE_URL + "/{id}", id) - .queryParam("institutionId", institutionId) - .content(userStream) - .contentType(MediaType.APPLICATION_JSON_VALUE) - .accept(MediaType.APPLICATION_JSON_VALUE)) - .andExpect(status().isNoContent()) - .andExpect(content().string(emptyString())); - //then - verify(userServiceMock, times(1)) - .updateUser(id, institutionId, userMapper.fromUpdateUser(updateUserDto)); - - Mockito.verifyNoMoreInteractions(userServiceMock); - } - @Test void getUsers_institutionIdProductIdValid_EmptyObject() throws Exception { // given diff --git a/web/src/test/java/it/pagopa/selfcare/dashboard/web/model/UpdateUserDtoTest.java b/web/src/test/java/it/pagopa/selfcare/dashboard/web/model/UpdateUserDtoTest.java index 6bd5c9810..a5fc3a280 100644 --- a/web/src/test/java/it/pagopa/selfcare/dashboard/web/model/UpdateUserDtoTest.java +++ b/web/src/test/java/it/pagopa/selfcare/dashboard/web/model/UpdateUserDtoTest.java @@ -13,7 +13,6 @@ import java.util.HashMap; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -46,7 +45,7 @@ void validateNullFields() { Class annotationToCheck = toCheckMap.get(violation.getPropertyPath().toString()); return !violation.getConstraintDescriptor().getAnnotation().annotationType().equals(annotationToCheck); }) - .collect(Collectors.toList()); + .toList(); assertTrue(filteredViolations.isEmpty()); } @@ -79,7 +78,7 @@ void validate_emailFieldsNotValid() { Class annotationToCheck = toCheckMap.get(violation.getPropertyPath().toString()); return !violation.getConstraintDescriptor().getAnnotation().annotationType().equals(annotationToCheck); }) - .collect(Collectors.toList()); + .toList(); assertTrue(filteredViolations.isEmpty()); }