From e4ce94bc7cb9c0ce4c5739bb82629073fdc90b5e Mon Sep 17 00:00:00 2001 From: Tadgh Date: Mon, 16 Nov 2020 20:06:46 -0500 Subject: [PATCH] Fix resourcemastchersvc tests --- .../java/ca/uhn/fhir/empi/rules/svc/BaseEmpiRulesR4Test.java | 2 ++ .../uhn/fhir/empi/rules/svc/EmpiResourceMatcherSvcR4Test.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/BaseEmpiRulesR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/BaseEmpiRulesR4Test.java index fee9512ff44..10b8254d31b 100644 --- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/BaseEmpiRulesR4Test.java +++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/BaseEmpiRulesR4Test.java @@ -12,6 +12,7 @@ import org.hl7.fhir.r4.model.Patient; import org.junit.jupiter.api.BeforeEach; import java.util.ArrayList; +import java.util.Arrays; public abstract class BaseEmpiRulesR4Test extends BaseR4Test { public static final String PATIENT_GIVEN = "patient-given"; @@ -65,6 +66,7 @@ public abstract class BaseEmpiRulesR4Test extends BaseR4Test { retval.addFilterSearchParam(activePatientsBlockingFilter); retval.addMatchField(myGivenNameMatchField); retval.addMatchField(lastNameMatchField); + retval.setMdmTypes(Arrays.asList("Patient", "Practitioner", "Medication")); retval.putMatchResult(myBothNameFields, EmpiMatchResultEnum.MATCH); retval.putMatchResult(PATIENT_GIVEN, EmpiMatchResultEnum.POSSIBLE_MATCH); return retval; diff --git a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceMatcherSvcR4Test.java b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceMatcherSvcR4Test.java index 9e0c814c51b..8f409913286 100644 --- a/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceMatcherSvcR4Test.java +++ b/hapi-fhir-server-empi/src/test/java/ca/uhn/fhir/empi/rules/svc/EmpiResourceMatcherSvcR4Test.java @@ -22,6 +22,8 @@ public class EmpiResourceMatcherSvcR4Test extends BaseEmpiRulesR4Test { when(mySearchParamRetriever.getActiveSearchParam("Patient", "birthdate")).thenReturn(mock(RuntimeSearchParam.class)); when(mySearchParamRetriever.getActiveSearchParam("Patient", "identifier")).thenReturn(mock(RuntimeSearchParam.class)); + when(mySearchParamRetriever.getActiveSearchParam("Practitioner", "identifier")).thenReturn(mock(RuntimeSearchParam.class)); + when(mySearchParamRetriever.getActiveSearchParam("Medication", "identifier")).thenReturn(mock(RuntimeSearchParam.class)); when(mySearchParamRetriever.getActiveSearchParam("Patient", "active")).thenReturn(mock(RuntimeSearchParam.class)); myEmpiResourceMatcherSvc = buildMatcher(buildActiveBirthdateIdRules());