OpenmrsProfileAnnotation

api-reporting/src/main/java/org/openmrs/module/emrapi/adt/reporting/evaluator/AwaitingAdmissionVisitQueryEvaluator.java

@@ -3,6 +3,7 @@
 import org.openmrs.Location;
 import org.openmrs.Visit;
 import org.openmrs.annotation.Handler;
+import org.openmrs.annotation.OpenmrsProfile;
 import org.openmrs.module.emrapi.adt.AdtService;
 import org.openmrs.module.emrapi.adt.reporting.query.AwaitingAdmissionVisitQuery;
 import org.openmrs.module.reporting.evaluation.EvaluationContext;
@@ -17,6 +18,7 @@
 import java.util.List;
 
 @Handler(supports = AwaitingAdmissionVisitQuery.class)
+@OpenmrsProfile(modules = { "reporting:*" })
 public class AwaitingAdmissionVisitQueryEvaluator implements VisitQueryEvaluator {
 
     @Autowired

api-reporting/src/main/java/org/openmrs/module/emrapi/patient/reporting/library/EmrApiPatientDataLibrary.java

@@ -14,6 +14,7 @@
 package org.openmrs.module.emrapi.patient.reporting.library;
 
 import org.openmrs.PatientIdentifier;
+import org.openmrs.annotation.OpenmrsProfile;
 import org.openmrs.module.emrapi.EmrApiProperties;
 import org.openmrs.module.reporting.data.converter.PropertyConverter;
 import org.openmrs.module.reporting.data.patient.definition.ConvertedPatientDataDefinition;
@@ -27,7 +28,7 @@
 /**
  * Basic patient data columns provided by emr-api module
  */
-@Component
+@OpenmrsProfile(modules = { "reporting:*" })
 public class EmrApiPatientDataLibrary extends BaseDefinitionLibrary<PatientDataDefinition> {
 
     @Autowired

api-reporting/src/main/java/org/openmrs/module/emrapi/visit/reporting/library/EmrApiVisitDataLibrary.java

@@ -1,5 +1,6 @@
 package org.openmrs.module.emrapi.visit.reporting.library;
 
+import org.openmrs.annotation.OpenmrsProfile;
 import org.openmrs.module.emrapi.adt.reporting.definition.MostRecentAdmissionRequestVisitDataDefinition;
 import org.openmrs.module.reporting.data.visit.definition.VisitDataDefinition;
 import org.openmrs.module.reporting.definition.library.BaseDefinitionLibrary;
@@ -9,7 +10,7 @@
 /**
  * Basic visit data columns provided by module
  */
-@Component
+@OpenmrsProfile(modules = { "reporting:*" })
 public class EmrApiVisitDataLibrary extends BaseDefinitionLibrary<VisitDataDefinition> {
 
 

api-reporting/src/test/java/org/openmrs/module/emrapi/BaseReportingTest.java

@@ -0,0 +1,19 @@
+package org.openmrs.module.emrapi;
+
+import org.openmrs.module.Module;
+import org.openmrs.module.ModuleFactory;
+import org.openmrs.test.BaseModuleContextSensitiveTest;
+
+import java.io.File;
+
+public abstract class BaseReportingTest extends BaseModuleContextSensitiveTest {
+
+    public BaseReportingTest() {
+        super();
+        {
+            Module mod = new Module("", "reporting", "", "", "", "1.25.0");
+            mod.setFile(new File(""));
+            ModuleFactory.getStartedModulesMap().put(mod.getModuleId(), mod);
+        }
+    }
+}

api-reporting/src/test/java/org/openmrs/module/emrapi/adt/reporting/evaluator/AwaitingAdmissionVisitQueryEvaluatorTest.java

@@ -13,6 +13,7 @@
 import org.openmrs.api.ConceptService;
 import org.openmrs.contrib.testdata.TestDataManager;
 import org.openmrs.contrib.testdata.builder.ObsBuilder;
+import org.openmrs.module.emrapi.BaseReportingTest;
 import org.openmrs.module.emrapi.EmrApiConstants;
 import org.openmrs.module.emrapi.EmrApiProperties;
 import org.openmrs.module.emrapi.adt.reporting.query.AwaitingAdmissionVisitQuery;
@@ -25,7 +26,6 @@
 import org.openmrs.module.reporting.query.visit.VisitIdSet;
 import org.openmrs.module.reporting.query.visit.VisitQueryResult;
 import org.openmrs.module.reporting.query.visit.service.VisitQueryService;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 
@@ -35,7 +35,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
-public class AwaitingAdmissionVisitQueryEvaluatorTest extends BaseModuleContextSensitiveTest {
+public class AwaitingAdmissionVisitQueryEvaluatorTest extends BaseReportingTest {
 
     @Autowired
     private ConceptService conceptService;

api-reporting/src/test/java/org/openmrs/module/emrapi/adt/reporting/evaluator/MostRecentAdmissionRequestVisitDataEvaluatorTest.java

@@ -13,6 +13,7 @@
 import org.openmrs.api.ConceptService;
 import org.openmrs.api.context.Context;
 import org.openmrs.contrib.testdata.TestDataManager;
+import org.openmrs.module.emrapi.BaseReportingTest;
 import org.openmrs.module.emrapi.EmrApiConstants;
 import org.openmrs.module.emrapi.EmrApiProperties;
 import org.openmrs.module.emrapi.adt.reporting.definition.MostRecentAdmissionRequestVisitDataDefinition;
@@ -26,7 +27,6 @@
 import org.openmrs.module.reporting.data.visit.service.VisitDataService;
 import org.openmrs.module.reporting.evaluation.context.VisitEvaluationContext;
 import org.openmrs.module.reporting.query.visit.VisitIdSet;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Date;
@@ -36,7 +36,7 @@
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertThat;
 
-public class MostRecentAdmissionRequestVisitDataEvaluatorTest extends BaseModuleContextSensitiveTest {
+public class MostRecentAdmissionRequestVisitDataEvaluatorTest extends BaseReportingTest {
 
     @Autowired
     private VisitDataService visitDataService;

api-reporting/src/test/java/org/openmrs/module/emrapi/patient/EmrApiPatientDataLibraryComponentTest.java

@@ -4,22 +4,22 @@
 import org.junit.Test;
 import org.openmrs.Cohort;
 import org.openmrs.api.PatientService;
+import org.openmrs.module.emrapi.BaseReportingTest;
 import org.openmrs.module.emrapi.patient.reporting.library.EmrApiPatientDataLibrary;
 import org.openmrs.module.reporting.common.DateUtil;
 import org.openmrs.module.reporting.data.patient.EvaluatedPatientData;
 import org.openmrs.module.reporting.data.patient.definition.PatientDataDefinition;
 import org.openmrs.module.reporting.data.patient.service.PatientDataService;
 import org.openmrs.module.reporting.evaluation.EvaluationContext;
 import org.openmrs.module.reporting.evaluation.EvaluationException;
-import org.openmrs.test.BaseModuleContextSensitiveTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.Arrays;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 
-public class EmrApiPatientDataLibraryComponentTest extends BaseModuleContextSensitiveTest {
+public class EmrApiPatientDataLibraryComponentTest extends BaseReportingTest {
 
     @Autowired
     private PatientDataService pds;