Skip to content

Commit eb52b0f

Browse files
loichenningerloichenninger
committed
fix: update test
1 parent ed944db commit eb52b0f

File tree

1 file changed

+89
-32
lines changed

1 file changed

+89
-32
lines changed

‎src/test/java/fr/insee/genesis/controller/rest/responses/ResponseControllerTest.java‎

Lines changed: 89 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -361,26 +361,38 @@ void saveEditedTest() {
361361
.collectedVariables(newVariables)
362362
.build();
363363

364+
// We need a response in database to retrieve campaignId from interrogationId and questionnaireId
365+
SurveyUnitModel suModel = SurveyUnitModel.builder()
366+
.campaignId(campaignId)
367+
.state(DataState.COLLECTED)
368+
.mode(Mode.WEB)
369+
.questionnaireId(questionnaireId)
370+
.interrogationId(DEFAULT_INTERROGATION_ID)
371+
.collectedVariables(List.of())
372+
.build();
373+
surveyUnitPersistencePortStub.getMongoStub().add(suModel);
374+
364375
//WHEN
365376
responseControllerStatic.saveEditedVariables(surveyUnitInputDto);
366377

367378
//THEN
368-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).hasSize(1);
369-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCampaignId()).isEqualTo(campaignId);
370-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getQuestionnaireId()).isEqualTo(questionnaireId);
371-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getMode()).isEqualTo(Mode.WEB);
372-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getState()).isEqualTo(DataState.EDITED);
373-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getFileDate()).isNull();
374-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getRecordDate()).isNotNull();
375-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getExternalVariables()).isEmpty();
376-
377-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCollectedVariables()).hasSize(1);
378-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCollectedVariables().getFirst().varId()).isEqualTo(varId);
379-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCollectedVariables().getFirst().scope()).isEqualTo(loopId);
380-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCollectedVariables().getFirst().parentId()).isEqualTo(Constants.ROOT_GROUP_NAME);
381-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCollectedVariables().getFirst().value()).isEqualTo(editedValue);
382-
383-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getModifiedBy()).isNull();
379+
SurveyUnitModel docSaved = surveyUnitPersistencePortStub.getMongoStub().get(1);
380+
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).hasSize(2);
381+
Assertions.assertThat(docSaved.getCampaignId()).isEqualTo(campaignId);
382+
Assertions.assertThat(docSaved.getQuestionnaireId()).isEqualTo(questionnaireId);
383+
Assertions.assertThat(docSaved.getMode()).isEqualTo(Mode.WEB);
384+
Assertions.assertThat(docSaved.getState()).isEqualTo(DataState.EDITED);
385+
Assertions.assertThat(docSaved.getFileDate()).isNull();
386+
Assertions.assertThat(docSaved.getRecordDate()).isNotNull();
387+
Assertions.assertThat(docSaved.getExternalVariables()).isEmpty();
388+
389+
Assertions.assertThat(docSaved.getCollectedVariables()).hasSize(1);
390+
Assertions.assertThat(docSaved.getCollectedVariables().getFirst().varId()).isEqualTo(varId);
391+
Assertions.assertThat(docSaved.getCollectedVariables().getFirst().scope()).isEqualTo(loopId);
392+
Assertions.assertThat(docSaved.getCollectedVariables().getFirst().parentId()).isEqualTo(Constants.ROOT_GROUP_NAME);
393+
Assertions.assertThat(docSaved.getCollectedVariables().getFirst().value()).isEqualTo(editedValue);
394+
395+
Assertions.assertThat(docSaved.getModifiedBy()).isNull();
384396
}
385397

386398
@Test
@@ -425,26 +437,37 @@ void saveEditedTest_DocumentEdited() {
425437
.collectedVariables(newVariables)
426438
.build();
427439

440+
// We need a response in database to retrieve campaignId from interrogationId and questionnaireId
441+
SurveyUnitModel suModel = SurveyUnitModel.builder()
442+
.campaignId(campaignId)
443+
.state(DataState.COLLECTED)
444+
.mode(Mode.WEB)
445+
.questionnaireId(questionnaireId)
446+
.interrogationId(DEFAULT_INTERROGATION_ID)
447+
.collectedVariables(List.of())
448+
.build();
449+
surveyUnitPersistencePortStub.getMongoStub().add(suModel);
450+
428451
//WHEN
429452
responseControllerStatic.saveEditedVariables(surveyUnitInputDto);
430453

431454
//THEN
432455
//EDITED document assertions
433-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).hasSize(2);
434-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCampaignId()).isEqualTo(campaignId);
435-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getQuestionnaireId()).isEqualTo(questionnaireId);
436-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getState()).isEqualTo(DataState.EDITED);
437-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getMode()).isEqualTo(Mode.WEB);
438-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getFileDate()).isNull();
439-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getRecordDate()).isNotNull();
440-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getExternalVariables()).isEmpty();
441-
442-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCollectedVariables()).hasSize(2);
443-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCollectedVariables().getFirst().varId()).isEqualTo(varId);
444-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCollectedVariables().getFirst().scope()).isEqualTo(loopId);
445-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCollectedVariables().getFirst().parentId()).isEqualTo(Constants.ROOT_GROUP_NAME);
446-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getCollectedVariables().getFirst().value()).isEqualTo(editedValue);
447-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getFirst().getModifiedBy()).isNull();
456+
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).hasSize(3);
457+
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getCampaignId()).isEqualTo(campaignId);
458+
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getQuestionnaireId()).isEqualTo(questionnaireId);
459+
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getState()).isEqualTo(DataState.EDITED);
460+
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getMode()).isEqualTo(Mode.WEB);
461+
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getFileDate()).isNull();
462+
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getRecordDate()).isNotNull();
463+
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getExternalVariables()).isEmpty();
464+
465+
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getCollectedVariables()).hasSize(2);
466+
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getCollectedVariables().getFirst().varId()).isEqualTo(varId);
467+
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getCollectedVariables().getFirst().scope()).isEqualTo(loopId);
468+
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getCollectedVariables().getFirst().parentId()).isEqualTo(Constants.ROOT_GROUP_NAME);
469+
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getCollectedVariables().getFirst().value()).isEqualTo(editedValue);
470+
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().get(1).getModifiedBy()).isNull();
448471
}
449472

450473
@Test
@@ -489,11 +512,22 @@ void saveEditedTest_DocumentFormatted() {
489512
.collectedVariables(newVariables)
490513
.build();
491514

515+
// We need a response in database to retrieve campaignId from interrogationId and questionnaireId
516+
SurveyUnitModel suModel = SurveyUnitModel.builder()
517+
.campaignId(campaignId)
518+
.state(DataState.COLLECTED)
519+
.mode(Mode.WEB)
520+
.questionnaireId(questionnaireId)
521+
.interrogationId(DEFAULT_INTERROGATION_ID)
522+
.collectedVariables(List.of())
523+
.build();
524+
surveyUnitPersistencePortStub.getMongoStub().add(suModel);
525+
492526
//WHEN
493527
responseControllerStatic.saveEditedVariables(surveyUnitInputDto);
494528

495529
//THEN
496-
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).hasSize(2);
530+
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub()).hasSize(3);
497531

498532
//FORMATTED document assertions
499533
Assertions.assertThat(surveyUnitPersistencePortStub.getMongoStub().getLast().getCampaignId()).isEqualTo(campaignId);
@@ -539,6 +573,18 @@ void saveEditedTest_No_Metadata_Error() {
539573
.collectedVariables(newVariables)
540574
.build();
541575

576+
// We need a response in database to retrieve campaignId from interrogationId and questionnaireId
577+
SurveyUnitModel suModel = SurveyUnitModel.builder()
578+
.campaignId(campaignId)
579+
.state(DataState.COLLECTED)
580+
.mode(Mode.WEB)
581+
.questionnaireId(DEFAULT_QUESTIONNAIRE_ID)
582+
.interrogationId(DEFAULT_INTERROGATION_ID)
583+
.collectedVariables(List.of())
584+
.build();
585+
surveyUnitPersistencePortStub.getMongoStub().add(suModel);
586+
587+
542588
Assertions.assertThat(
543589
responseControllerStatic.saveEditedVariables(
544590
surveyUnitInputDto
@@ -573,6 +619,17 @@ void saveTest_With_Collected_State_Error(){
573619
.collectedVariables(newVariables)
574620
.build();
575621

622+
// We need a response in database to retrieve campaignId from interrogationId and questionnaireId
623+
SurveyUnitModel suModel = SurveyUnitModel.builder()
624+
.campaignId(CAMPAIGN_ID_WITH_DDI)
625+
.state(DataState.COLLECTED)
626+
.mode(Mode.WEB)
627+
.questionnaireId(DEFAULT_QUESTIONNAIRE_ID)
628+
.interrogationId(DEFAULT_INTERROGATION_ID)
629+
.collectedVariables(List.of())
630+
.build();
631+
surveyUnitPersistencePortStub.getMongoStub().add(suModel);
632+
576633
Assertions.assertThat(responseControllerStatic.saveEditedVariables(surveyUnitInputDto).getStatusCode()).isEqualTo(HttpStatusCode.valueOf(400));
577634
}
578635
}

0 commit comments

Comments
 (0)