Refactor all context sensitive tests to extend a base class that rese…

…ts the static global property holder
openmrs · Dec 20, 2024 · 66f7a5f · 66f7a5f
1 parent 7f58602
commit 66f7a5f
Show file tree

Hide file tree

Showing 45 changed files with 119 additions and 231 deletions.
diff --git a/api/src/test/java/org/openmrs/module/fhir2/BaseFhirContextSensitiveTest.java b/api/src/test/java/org/openmrs/module/fhir2/BaseFhirContextSensitiveTest.java
@@ -0,0 +1,24 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public License,
+ * v. 2.0. If a copy of the MPL was not distributed with this file, You can
+ * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+ * the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+ *
+ * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+ * graphic logo is a trademark of OpenMRS Inc.
+ */
+package org.openmrs.module.fhir2;
+
+import org.junit.Before;
+import org.openmrs.module.fhir2.api.util.FhirGlobalPropertyHolder;
+import org.openmrs.test.BaseModuleContextSensitiveTest;
+import org.springframework.test.context.ContextConfiguration;
+
+@ContextConfiguration(classes = { TestFhirSpringConfiguration.class }, inheritLocations = false)
+public abstract class BaseFhirContextSensitiveTest extends BaseModuleContextSensitiveTest {
+
+	@Before
+	public void setupBaseFhirContextSensitive() {
+		FhirGlobalPropertyHolder.reset();
+	}
+}
diff --git a/...rc/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirAllergyIntoleranceDaoImplTest.java b/...rc/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirAllergyIntoleranceDaoImplTest.java
@@ -21,15 +21,12 @@
 import org.openmrs.Allergy;
 import org.openmrs.AllergyReaction;
 import org.openmrs.Concept;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.openmrs.module.fhir2.api.dao.FhirAllergyIntoleranceDao;
 import org.openmrs.module.fhir2.api.dao.FhirConceptDao;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirAllergyIntoleranceDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirAllergyIntoleranceDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	private static final String ALLERGY_INTOLERANCE_INITIAL_DATA_XML = "org/openmrs/module/fhir2/api/dao/impl/FhirAllergyIntoleranceDaoImplTest_initial_data.xml";
 

diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirConceptDaoImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirConceptDaoImplTest.java
@@ -29,15 +29,12 @@
 import org.openmrs.ConceptSource;
 import org.openmrs.api.ConceptService;
 import org.openmrs.api.context.Context;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.openmrs.module.fhir2.api.dao.FhirConceptDao;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirConceptDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirConceptDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	private static final String CONCEPT_DATA_XML = "org/openmrs/api/include/ConceptServiceTest-initialConcepts.xml";
 

diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirConceptSourceDaoImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirConceptSourceDaoImplTest.java
@@ -28,15 +28,12 @@
 import org.junit.Test;
 import org.openmrs.ConceptSource;
 import org.openmrs.api.ConceptService;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.openmrs.module.fhir2.FhirTestConstants;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
 import org.openmrs.module.fhir2.model.FhirConceptSource;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirConceptSourceDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirConceptSourceDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	private static final String CONCEPT_SOURCE_FHIR_DATA = "org/openmrs/module/fhir2/api/dao/impl/FhirConceptSourceDaoImplTest_initial_data.xml";
 

diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirConditionDaoImpl_Test.java b/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirConditionDaoImpl_Test.java
@@ -26,14 +26,11 @@
 import org.openmrs.ConditionVerificationStatus;
 import org.openmrs.api.ConceptService;
 import org.openmrs.api.PatientService;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirConditionDaoImpl_Test extends BaseModuleContextSensitiveTest {
+public class FhirConditionDaoImpl_Test extends BaseFhirContextSensitiveTest {
 
 	private static final String CONDITION_UUID = "2cc6880e-2c46-15e4-9038-a6c5e4d22fb7";
 

diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirContactPointMapDaoImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirContactPointMapDaoImplTest.java
@@ -26,15 +26,12 @@
 import org.openmrs.api.LocationService;
 import org.openmrs.api.PersonService;
 import org.openmrs.api.ProviderService;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.openmrs.module.fhir2.api.FhirContactPointMapService;
 import org.openmrs.module.fhir2.model.FhirContactPointMap;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirContactPointMapDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirContactPointMapDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	@Autowired
 	private SessionFactory sessionFactory;

diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirDiagnosticReportDaoImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirDiagnosticReportDaoImplTest.java
@@ -23,15 +23,12 @@
 import org.openmrs.api.ConceptService;
 import org.openmrs.api.ObsService;
 import org.openmrs.api.PatientService;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.openmrs.module.fhir2.model.FhirDiagnosticReport;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirDiagnosticReportDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirDiagnosticReportDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	private static final String DATA_XML = "org/openmrs/module/fhir2/api/dao/impl/FhirDiagnosticReportDaoImplTest_initial_data.xml";
 

diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirEncounterDaoImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirEncounterDaoImplTest.java
@@ -29,16 +29,13 @@
 import org.openmrs.Encounter;
 import org.openmrs.Order;
 import org.openmrs.api.context.Context;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.openmrs.module.fhir2.FhirConstants;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
 import org.openmrs.module.fhir2.api.search.param.SearchParameterMap;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirEncounterDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirEncounterDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	private static final String ENCOUNTER_UUID = "430bbb70-6a9c-4e1e-badb-9d1034b1b5e9";
 

diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirEpisodeOfCareDaoImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirEpisodeOfCareDaoImplTest.java
@@ -18,14 +18,11 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.openmrs.PatientProgram;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirEpisodeOfCareDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirEpisodeOfCareDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	private static final String ENCOUNTER_INITIAL_DATA_XML = "org/openmrs/module/fhir2/api/dao/impl/FhirEpisodeOfCareDaoImpl_2_2Test_initial_data.xml";
 

diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirGroupDaoImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirGroupDaoImplTest.java
@@ -19,14 +19,11 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.openmrs.Cohort;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirGroupDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirGroupDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	private static final String COHORT_UUID = "1d64befb-3b2e-48e5-85f5-353d43e23e46";
 

diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirLocationDaoImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirLocationDaoImplTest.java
@@ -24,14 +24,11 @@
 import org.openmrs.LocationTag;
 import org.openmrs.api.LocationService;
 import org.openmrs.customdatatype.datatype.FreeTextDatatype;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.openmrs.module.fhir2.api.dao.FhirLocationDao;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirLocationDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirLocationDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	private static final String LOCATION_UUID = "c0938432-1691-11df-97a5-7038c432";
 

diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirMedicationDaoImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirMedicationDaoImplTest.java
@@ -23,15 +23,12 @@
 import org.openmrs.Concept;
 import org.openmrs.Drug;
 import org.openmrs.DrugIngredient;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.openmrs.module.fhir2.api.dao.FhirConceptDao;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirMedicationDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirMedicationDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	private static final String MEDICATION_UUID = "1085AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA";
 

diff --git a/...src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirMedicationRequestDaoImplTest.java b/...src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirMedicationRequestDaoImplTest.java
@@ -31,16 +31,13 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.openmrs.DrugOrder;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.openmrs.module.fhir2.FhirConstants;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
 import org.openmrs.module.fhir2.api.search.param.SearchParameterMap;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirMedicationRequestDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirMedicationRequestDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	private static final String DRUG_ORDER_UUID = "6d0ae116-707a-4629-9850-f15206e63ab0";
 

diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirObservationDaoImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirObservationDaoImplTest.java
@@ -21,16 +21,13 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.openmrs.Obs;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.openmrs.module.fhir2.FhirConstants;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
 import org.openmrs.module.fhir2.api.dao.FhirObservationDao;
 import org.openmrs.module.fhir2.api.search.param.SearchParameterMap;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirObservationDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirObservationDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	private static final String OBS_DATA_XML = "org/openmrs/module/fhir2/api/dao/impl/FhirObservationDaoImplTest_initial_data_suppl.xml";
 

diff --git a/...t/java/org/openmrs/module/fhir2/api/dao/impl/FhirPatientDaoImplPatientIdentifierTest.java b/...t/java/org/openmrs/module/fhir2/api/dao/impl/FhirPatientDaoImplPatientIdentifierTest.java
@@ -18,13 +18,10 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.openmrs.PatientIdentifierType;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirPatientDaoImplPatientIdentifierTest extends BaseModuleContextSensitiveTest {
+public class FhirPatientDaoImplPatientIdentifierTest extends BaseFhirContextSensitiveTest {
 
 	private static final String PATIENT_IDENTIFIER_TYPE_NAME = "Test Identifier Type";
 

diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirPatientDaoImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirPatientDaoImplTest.java
@@ -24,15 +24,12 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.openmrs.Patient;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.openmrs.module.fhir2.FhirConstants;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
 import org.openmrs.module.fhir2.api.search.param.SearchParameterMap;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirPatientDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirPatientDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	private static final String PATIENT_UUID = "256ccf6d-6b41-455c-9be2-51ff4386ae76";
 

diff --git a/...st/java/org/openmrs/module/fhir2/api/dao/impl/FhirPatientIdentifierSystemDaoImplTest.java b/...st/java/org/openmrs/module/fhir2/api/dao/impl/FhirPatientIdentifierSystemDaoImplTest.java
@@ -24,15 +24,12 @@
 import org.junit.Test;
 import org.openmrs.PatientIdentifierType;
 import org.openmrs.api.PatientService;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.openmrs.module.fhir2.api.FhirPatientIdentifierSystemService;
 import org.openmrs.module.fhir2.model.FhirPatientIdentifierSystem;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirPatientIdentifierSystemDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirPatientIdentifierSystemDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	private FhirPatientIdentifierSystemDaoImpl dao;
 

diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirPersonDaoImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirPersonDaoImplTest.java
@@ -24,14 +24,11 @@
 import org.openmrs.Person;
 import org.openmrs.PersonAttribute;
 import org.openmrs.api.context.Context;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirPersonDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirPersonDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	private static final String PERSON_UUID = "61b38324-e2fd-4feb-95b7-9e9a2a4400df";
 

diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirPractitionerDaoImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirPractitionerDaoImplTest.java
@@ -19,14 +19,11 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.openmrs.ProviderAttribute;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirPractitionerDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirPractitionerDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	private static final String PRACTITIONER_INITIAL_DATA_XML = "org/openmrs/module/fhir2/api/dao/impl/FhirPractitionerDaoImplTest_initial_data.xml";
 

diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirRelatedPersonDaoImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirRelatedPersonDaoImplTest.java
@@ -18,14 +18,11 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.openmrs.Relationship;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirRelatedPersonDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirRelatedPersonDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	private static final String RELATIONSHIP_UUID = "c3c91630-8563-481b-8efa-48e10c139a3d";
 

diff --git a/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirServiceRequestDaoImplTest.java b/api/src/test/java/org/openmrs/module/fhir2/api/dao/impl/FhirServiceRequestDaoImplTest.java
@@ -20,14 +20,11 @@
 import org.junit.Test;
 import org.openmrs.OrderType;
 import org.openmrs.TestOrder;
-import org.openmrs.module.fhir2.TestFhirSpringConfiguration;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
+import org.openmrs.module.fhir2.BaseFhirContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.test.context.ContextConfiguration;
 
-@ContextConfiguration(classes = TestFhirSpringConfiguration.class, inheritLocations = false)
-public class FhirServiceRequestDaoImplTest extends BaseModuleContextSensitiveTest {
+public class FhirServiceRequestDaoImplTest extends BaseFhirContextSensitiveTest {
 
 	private static final String TEST_ORDER_UUID = "7d96f25c-4949-4f72-9931-d808fbc226de";