@@ -112,123 +112,149 @@ class EhrExtractMapperComponentTest {
112112 @ BeforeEach
113113 public void setUp () {
114114 getGpcStructuredTaskDefinition = GetGpcStructuredTaskDefinition .builder ()
115- .nhsNumber (TEST_NHS_NUMBER )
116- .conversationId (TEST_CONVERSATION_ID )
117- .requestId (TEST_REQUEST_ID )
118- .fromOdsCode (TEST_FROM_ODS_CODE )
119- .toOdsCode (TEST_TO_ODS_CODE )
120- .build ();
121-
122- when (randomIdGeneratorService .createNewId ()).thenReturn (TEST_ID_1 , TEST_ID_2 , TEST_ID_3 );
123- lenient ().when (randomIdGeneratorService .createNewOrUseExistingUUID (anyString ()))
124- .thenReturn (TEST_ID_3 );
125-
126- when (timestampService .now ()).thenReturn (Instant .parse (TEST_DATE_TIME ));
127- when (codeableConceptCdMapper .mapCodeableConceptToCd (any (CodeableConcept .class )))
128- .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
129- when (codeableConceptCdMapper .mapCodeableConceptForMedication (any (CodeableConcept .class )))
130- .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
131- when (codeableConceptCdMapper .mapCodeableConceptToCdForTransformedActualProblemHeader (any (CodeableConcept .class )))
132- .thenReturn (CodeableConceptMapperMockUtil .ACTUAL_PROBLEM_CODE );
133- when (codeableConceptCdMapper .mapToNullFlavorCodeableConcept (any (CodeableConcept .class )))
134- .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
135- when (codeableConceptCdMapper .mapCodeableConceptToCdForAllergy (any (CodeableConcept .class ),
136- any (AllergyIntolerance .AllergyIntoleranceClinicalStatus .class )))
137- .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
138- when (codeableConceptCdMapper .mapToNullFlavorCodeableConceptForAllergy (any (CodeableConcept .class ),
139- any (AllergyIntolerance .AllergyIntoleranceClinicalStatus .class )))
140- .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
141- when (codeableConceptCdMapper .getDisplayFromCodeableConcept (any (CodeableConcept .class )))
142- .thenCallRealMethod ();
143- when (codeableConceptCdMapper .mapCodeableConceptToCdForBloodPressure (any (CodeableConcept .class )))
144- .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
145- when (codeableConceptCdMapper .mapToCdForTopic (any (CodeableConcept .class )))
146- .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
147- when (codeableConceptCdMapper .mapToCdForTopic (any (CodeableConcept .class ), any (String .class )))
148- .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
149- when (codeableConceptCdMapper .mapToCdForTopic (any (String .class )))
150- .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
151- when (codeableConceptCdMapper .getCdForTopic ())
152- .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
153- when (codeableConceptCdMapper .mapToCdForCategory (any (String .class )))
154- .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
155- when (codeableConceptCdMapper .getCdForCategory ())
156- .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
115+ .nhsNumber (TEST_NHS_NUMBER )
116+ .conversationId (TEST_CONVERSATION_ID )
117+ .requestId (TEST_REQUEST_ID )
118+ .fromOdsCode (TEST_FROM_ODS_CODE )
119+ .toOdsCode (TEST_TO_ODS_CODE )
120+ .build ();
157121
122+ setupRandomIdMocks ();
123+ setupTimestampMock ();
124+ setupCodeableConceptMocks ();
158125
159126 messageContext = new MessageContext (randomIdGeneratorService );
160127
161128 ParticipantMapper participantMapper = new ParticipantMapper ();
162- StructuredObservationValueMapper structuredObservationValueMapper = new StructuredObservationValueMapper ();
163- ObservationMapper specimenObservationMapper = new ObservationMapper (
164- messageContext , structuredObservationValueMapper , codeableConceptCdMapper ,
165- participantMapper , randomIdGeneratorService , confidentialityService );
166- SpecimenMapper specimenMapper = new SpecimenMapper (messageContext , specimenObservationMapper ,
167- randomIdGeneratorService , confidentialityService );
168- DocumentReferenceToNarrativeStatementMapper documentReferenceToNarrativeStatementMapper
169- = new DocumentReferenceToNarrativeStatementMapper (
170- messageContext , new SupportedContentTypes (), participantMapper , confidentialityService );
129+ StructuredObservationValueMapper structuredObsValueMapper = new StructuredObservationValueMapper ();
171130
172- EncounterComponentsMapper encounterComponentsMapper = new EncounterComponentsMapper (
173- messageContext ,
174- new AllergyStructureMapper (messageContext , codeableConceptCdMapper , participantMapper , confidentialityService ),
175- new BloodPressureMapper (
176- messageContext , randomIdGeneratorService , new StructuredObservationValueMapper (),
177- codeableConceptCdMapper , new ParticipantMapper (), confidentialityService ),
178- new ConditionLinkSetMapper (
179- messageContext , randomIdGeneratorService , codeableConceptCdMapper , participantMapper , confidentialityService ),
180- new DiaryPlanStatementMapper (messageContext , codeableConceptCdMapper , participantMapper , confidentialityService ),
181- documentReferenceToNarrativeStatementMapper ,
182- new ImmunizationObservationStatementMapper (
131+ ObservationMapper specimenObservationMapper = new ObservationMapper (
183132 messageContext ,
133+ structuredObsValueMapper ,
184134 codeableConceptCdMapper ,
185135 participantMapper ,
136+ randomIdGeneratorService ,
186137 confidentialityService
187- ),
188- new MedicationStatementMapper (
138+ );
139+
140+ SpecimenMapper specimenMapper = new SpecimenMapper (
189141 messageContext ,
190- codeableConceptCdMapper ,
191- participantMapper ,
142+ specimenObservationMapper ,
192143 randomIdGeneratorService ,
193144 confidentialityService
194- ),
195- new ObservationToNarrativeStatementMapper (messageContext , participantMapper , confidentialityService ),
196- new ObservationStatementMapper (
145+ );
146+
147+ DocumentReferenceToNarrativeStatementMapper documentRefMapper =
148+ new DocumentReferenceToNarrativeStatementMapper (
149+ messageContext ,
150+ new SupportedContentTypes (),
151+ participantMapper ,
152+ confidentialityService
153+ );
154+
155+ EncounterComponentsMapper encounterComponentsMapper = new EncounterComponentsMapper (
197156 messageContext ,
198- new StructuredObservationValueMapper (),
199- new PertinentInformationObservationValueMapper (),
157+ new AllergyStructureMapper (messageContext , codeableConceptCdMapper , participantMapper , confidentialityService ),
158+ new BloodPressureMapper (messageContext , randomIdGeneratorService ,
159+ new StructuredObservationValueMapper (), codeableConceptCdMapper ,
160+ new ParticipantMapper (), confidentialityService ),
161+ new ConditionLinkSetMapper (messageContext , randomIdGeneratorService ,
162+ codeableConceptCdMapper , participantMapper , confidentialityService ),
163+ new DiaryPlanStatementMapper (messageContext , codeableConceptCdMapper ,
164+ participantMapper , confidentialityService ),
165+ documentRefMapper ,
166+ new ImmunizationObservationStatementMapper (messageContext , codeableConceptCdMapper ,
167+ participantMapper , confidentialityService ),
168+ new MedicationStatementMapper (messageContext , codeableConceptCdMapper ,
169+ participantMapper , randomIdGeneratorService , confidentialityService ),
170+ new ObservationToNarrativeStatementMapper (messageContext , participantMapper , confidentialityService ),
171+ new ObservationStatementMapper (messageContext ,
172+ new StructuredObservationValueMapper (), new PertinentInformationObservationValueMapper (),
173+ codeableConceptCdMapper , participantMapper , confidentialityService ),
174+ new RequestStatementMapper (messageContext , codeableConceptCdMapper , participantMapper , confidentialityService ),
175+ new DiagnosticReportMapper (messageContext , specimenMapper ,
176+ participantMapper , randomIdGeneratorService , confidentialityService ),
177+ new BloodPressureValidator (),
200178 codeableConceptCdMapper ,
201- participantMapper ,
202179 confidentialityService
203- ),
204- new RequestStatementMapper (messageContext , codeableConceptCdMapper , participantMapper , confidentialityService ),
205- new DiagnosticReportMapper (
206- messageContext , specimenMapper , participantMapper , randomIdGeneratorService , confidentialityService
207- ),
208- new BloodPressureValidator (),
209- codeableConceptCdMapper ,
210- confidentialityService
211180 );
212181
213182 AgentDirectoryMapper agentDirectoryMapper = new AgentDirectoryMapper (
214- messageContext ,
215- new AgentPersonMapper (messageContext )
183+ messageContext , new AgentPersonMapper (messageContext )
216184 );
217185
218- nonConsultationResourceMapper = new NonConsultationResourceMapper (messageContext ,
219- randomIdGeneratorService ,
220- encounterComponentsMapper ,
221- new BloodPressureValidator ()
186+ nonConsultationResourceMapper = new NonConsultationResourceMapper (
187+ messageContext , randomIdGeneratorService , encounterComponentsMapper , new BloodPressureValidator ()
222188 );
223189
224- ehrExtractMapper = new EhrExtractMapper (redactionsContext , randomIdGeneratorService ,
225- timestampService ,
226- new EncounterMapper (messageContext , encounterComponentsMapper , confidentialityService ),
227- nonConsultationResourceMapper ,
228- agentDirectoryMapper ,
229- messageContext );
190+ ehrExtractMapper = new EhrExtractMapper (
191+ redactionsContext ,
192+ randomIdGeneratorService ,
193+ timestampService ,
194+ new EncounterMapper (messageContext , encounterComponentsMapper , confidentialityService ),
195+ nonConsultationResourceMapper ,
196+ agentDirectoryMapper ,
197+ messageContext
198+ );
230199 }
231200
201+ private void setupRandomIdMocks () {
202+ when (randomIdGeneratorService .createNewId ())
203+ .thenReturn (TEST_ID_1 , TEST_ID_2 , TEST_ID_3 );
204+
205+ lenient ().when (randomIdGeneratorService .createNewOrUseExistingUUID (anyString ()))
206+ .thenReturn (TEST_ID_3 );
207+ }
208+
209+ private void setupTimestampMock () {
210+ when (timestampService .now ()).thenReturn (Instant .parse (TEST_DATE_TIME ));
211+ }
212+
213+ private void setupCodeableConceptMocks () {
214+ when (codeableConceptCdMapper .mapCodeableConceptToCd (any (CodeableConcept .class )))
215+ .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
216+
217+ when (codeableConceptCdMapper .mapCodeableConceptForMedication (any (CodeableConcept .class )))
218+ .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
219+
220+ when (codeableConceptCdMapper .mapCodeableConceptToCdForTransformedActualProblemHeader (any (CodeableConcept .class )))
221+ .thenReturn (CodeableConceptMapperMockUtil .ACTUAL_PROBLEM_CODE );
222+
223+ when (codeableConceptCdMapper .mapToNullFlavorCodeableConcept (any (CodeableConcept .class )))
224+ .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
225+
226+ when (codeableConceptCdMapper .mapCodeableConceptToCdForAllergy (any (CodeableConcept .class ), any ()))
227+ .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
228+
229+ when (codeableConceptCdMapper .mapToNullFlavorCodeableConceptForAllergy (any (CodeableConcept .class ), any ()))
230+ .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
231+
232+ when (codeableConceptCdMapper .getDisplayFromCodeableConcept (any (CodeableConcept .class )))
233+ .thenCallRealMethod ();
234+
235+ when (codeableConceptCdMapper .mapCodeableConceptToCdForBloodPressure (any (CodeableConcept .class )))
236+ .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
237+
238+ when (codeableConceptCdMapper .mapToCdForTopic (any (CodeableConcept .class )))
239+ .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
240+
241+ when (codeableConceptCdMapper .mapToCdForTopic (any (CodeableConcept .class ), any (String .class )))
242+ .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
243+
244+ when (codeableConceptCdMapper .mapToCdForTopic (any (String .class )))
245+ .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
246+
247+ when (codeableConceptCdMapper .getCdForTopic ())
248+ .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
249+
250+ when (codeableConceptCdMapper .mapToCdForCategory (any (String .class )))
251+ .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
252+
253+ when (codeableConceptCdMapper .getCdForCategory ())
254+ .thenReturn (CodeableConceptMapperMockUtil .NULL_FLAVOR_CODE );
255+ }
256+
257+
232258 @ AfterEach
233259 public void tearDown () {
234260 messageContext .resetMessageContext ();
0 commit comments