|
9 | 9 | import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel; |
10 | 10 | import fr.insee.genesis.domain.parser.rawdata.LunaticJsonRawDataPayloadParser; |
11 | 11 | import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService; |
| 12 | +import org.assertj.core.api.Assertions; |
12 | 13 | import org.junit.jupiter.api.DisplayName; |
13 | 14 | import org.junit.jupiter.api.Nested; |
14 | 15 | import org.junit.jupiter.api.Test; |
|
17 | 18 | import org.junit.jupiter.params.provider.ValueSource; |
18 | 19 | import org.mockito.InjectMocks; |
19 | 20 | import org.mockito.Mock; |
20 | | -import org.mockito.MockedStatic; |
21 | 21 | import org.mockito.junit.jupiter.MockitoExtension; |
22 | 22 |
|
23 | 23 | import java.time.LocalDateTime; |
24 | 24 | import java.util.ArrayList; |
25 | 25 | import java.util.LinkedHashMap; |
26 | 26 | import java.util.List; |
27 | 27 | import java.util.Map; |
| 28 | +import java.util.Optional; |
| 29 | +import java.util.Set; |
28 | 30 |
|
29 | 31 | import static org.assertj.core.api.Assertions.assertThat; |
30 | | -import static org.mockito.ArgumentMatchers.any; |
31 | 32 | import static org.mockito.ArgumentMatchers.anySet; |
32 | 33 | import static org.mockito.ArgumentMatchers.eq; |
33 | 34 | import static org.mockito.Mockito.RETURNS_DEEP_STUBS; |
34 | 35 | import static org.mockito.Mockito.mock; |
35 | | -import static org.mockito.Mockito.mockStatic; |
36 | 36 | import static org.mockito.Mockito.when; |
37 | 37 |
|
38 | 38 | @ExtendWith(MockitoExtension.class) |
@@ -76,40 +76,31 @@ void shouldCreateCollectedAndEditedSurveyUnitsFromLegacyRawData() { |
76 | 76 | ) |
77 | 77 | )); |
78 | 78 |
|
79 | | - try (MockedStatic<RawResponseRawDataConverter> rawResponseConverter = mockStatic(RawResponseRawDataConverter.class)) { |
80 | | - rawResponseConverter |
81 | | - .when(() -> RawResponseRawDataConverter.processCollectedVariableForState(any(), any(), any(), any(), any(), any())) |
82 | | - .thenAnswer(invocation -> { |
83 | | - String state = invocation.getArgument(1); |
84 | | - List<VariableModel> destination = invocation.getArgument(4); |
85 | | - |
86 | | - destination.add(VariableModel.builder() |
87 | | - .varId("FIRST_NAME") |
88 | | - .value(state) |
89 | | - .build()); |
90 | | - |
91 | | - return null; |
92 | | - }); |
93 | | - |
94 | | - List<SurveyUnitModel> result = converter.convertRawData( |
95 | | - QUESTIONNAIRE_ID, |
96 | | - List.of(rawData), |
97 | | - variablesMap |
98 | | - ); |
| 79 | + List<SurveyUnitModel> result = converter.convertRawData( |
| 80 | + QUESTIONNAIRE_ID, |
| 81 | + List.of(rawData), |
| 82 | + variablesMap |
| 83 | + ); |
99 | 84 |
|
100 | | - assertThat(result).hasSize(2); |
| 85 | + assertThat(result).hasSize(2); |
101 | 86 |
|
102 | | - assertThat(result) |
103 | | - .extracting(SurveyUnitModel::getState) |
104 | | - .containsExactly(DataState.COLLECTED, DataState.EDITED); |
| 87 | + assertThat(result) |
| 88 | + .extracting(SurveyUnitModel::getState) |
| 89 | + .containsExactly(DataState.COLLECTED, DataState.EDITED); |
105 | 90 |
|
106 | | - assertThat(result.get(0).getCollectedVariables()) |
| 91 | + for(DataState dataState : Set.of(DataState.COLLECTED, DataState.EDITED)){ |
| 92 | + Optional<SurveyUnitModel> surveyUnitModelOptional = result.stream().filter( |
| 93 | + surveyUnitModel -> surveyUnitModel.getState().equals(dataState) |
| 94 | + ).findFirst(); |
| 95 | + |
| 96 | + Assertions.assertThat(surveyUnitModelOptional).isPresent(); |
| 97 | + SurveyUnitModel surveyUnitModel = surveyUnitModelOptional.get(); |
| 98 | + Assertions.assertThat(surveyUnitModel.getCollectedVariables()) |
| 99 | + .extracting(VariableModel::varId) |
| 100 | + .containsExactly("FIRST_NAME"); |
| 101 | + Assertions.assertThat(surveyUnitModel.getCollectedVariables()) |
107 | 102 | .extracting(VariableModel::value) |
108 | | - .containsExactly("COLLECTED"); |
109 | | - |
110 | | - assertThat(result.get(1).getCollectedVariables()) |
111 | | - .extracting( VariableModel::value) |
112 | | - .containsExactly("EDITED"); |
| 103 | + .containsExactly(dataState.equals(DataState.COLLECTED) ? "Alice" : "Alicia"); |
113 | 104 | } |
114 | 105 | } |
115 | 106 |
|
|
0 commit comments