Skip to content

Commit 7b3c7a0

Browse files
committed
fix: fixed legacy process test
1 parent 256b1e0 commit 7b3c7a0

1 file changed

Lines changed: 24 additions & 33 deletions

File tree

src/test/java/fr/insee/genesis/domain/converter/rawdata/LunaticJsonRawDataConverterTest.java

Lines changed: 24 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
1010
import fr.insee.genesis.domain.parser.rawdata.LunaticJsonRawDataPayloadParser;
1111
import fr.insee.genesis.domain.service.surveyunit.SurveyUnitService;
12+
import org.assertj.core.api.Assertions;
1213
import org.junit.jupiter.api.DisplayName;
1314
import org.junit.jupiter.api.Nested;
1415
import org.junit.jupiter.api.Test;
@@ -17,22 +18,21 @@
1718
import org.junit.jupiter.params.provider.ValueSource;
1819
import org.mockito.InjectMocks;
1920
import org.mockito.Mock;
20-
import org.mockito.MockedStatic;
2121
import org.mockito.junit.jupiter.MockitoExtension;
2222

2323
import java.time.LocalDateTime;
2424
import java.util.ArrayList;
2525
import java.util.LinkedHashMap;
2626
import java.util.List;
2727
import java.util.Map;
28+
import java.util.Optional;
29+
import java.util.Set;
2830

2931
import static org.assertj.core.api.Assertions.assertThat;
30-
import static org.mockito.ArgumentMatchers.any;
3132
import static org.mockito.ArgumentMatchers.anySet;
3233
import static org.mockito.ArgumentMatchers.eq;
3334
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
3435
import static org.mockito.Mockito.mock;
35-
import static org.mockito.Mockito.mockStatic;
3636
import static org.mockito.Mockito.when;
3737

3838
@ExtendWith(MockitoExtension.class)
@@ -76,40 +76,31 @@ void shouldCreateCollectedAndEditedSurveyUnitsFromLegacyRawData() {
7676
)
7777
));
7878

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+
);
9984

100-
assertThat(result).hasSize(2);
85+
assertThat(result).hasSize(2);
10186

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);
10590

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())
107102
.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");
113104
}
114105
}
115106

0 commit comments

Comments
 (0)