Skip to content

Commit 9d97d24

Browse files
VaishSiddharthVaishSiddharth
committed
Fix unit tests
1 parent 25d795a commit 9d97d24

9 files changed

Lines changed: 33 additions & 10 deletions

‎api/src/test/java/org/openmrs/module/commonreports/reports/MSPPAntenatalReportManagerTest.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.openmrs.module.commonreports.reports;
22

3+
import java.util.Arrays;
34
import static org.junit.Assert.assertEquals;
45
import static org.junit.Assert.assertNotNull;
56

@@ -80,6 +81,7 @@ public void testReport() throws Exception {
8081
EvaluationContext context = new EvaluationContext();
8182
context.addParameterValue("startDate", DateUtil.parseDate("2021-06-01", "yyyy-MM-dd"));
8283
context.addParameterValue("endDate", DateUtil.parseDate("2021-06-30", "yyyy-MM-dd"));
84+
context.addParameterValue("locationList", Arrays.asList("Unknown Location", "Xanadu", "Never Never Land"));
8385

8486
ReportDefinition rd = manager.constructReportDefinition();
8587
ReportData data = rds.evaluate(rd, context);

‎api/src/test/java/org/openmrs/module/commonreports/reports/MSPPChildCareReportManagerTest.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package org.openmrs.module.commonreports.reports;
22

3+
import java.util.Arrays;
34
import static org.hamcrest.CoreMatchers.is;
45
import static org.junit.Assert.assertThat;
56
import java.io.File;
67
import java.sql.SQLException;
8+
import java.util.Collections;
79
import java.util.HashMap;
810
import java.util.Iterator;
911
import java.util.Map;
@@ -43,7 +45,7 @@ public MSPPChildCareReportManagerTest() throws SQLException {
4345

4446
@Autowired
4547
private ReportDefinitionService rds;
46-
48+
4749
@Autowired
4850
private MSPPChildCareReportManager manager;
4951

@@ -79,7 +81,8 @@ public void testReport() throws Exception {
7981
EvaluationContext context = new EvaluationContext();
8082
context.addParameterValue("startDate", DateUtil.parseDate("2021-06-01", "yyyy-MM-dd"));
8183
context.addParameterValue("endDate", DateUtil.parseDate("2021-06-30", "yyyy-MM-dd"));
82-
84+
context.addParameterValue("locationList", Arrays.asList("Unknown Location", "Xanadu", "Never Never Land"));
85+
8386
ReportDefinition rd = manager.constructReportDefinition();
8487
ReportData data = rds.evaluate(rd, context);
8588
data.getDataSets();

‎api/src/test/java/org/openmrs/module/commonreports/reports/MSPPChronicIllnessesReportManagerTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package org.openmrs.module.commonreports.reports;
22

3+
import java.util.Arrays;
34
import static org.hamcrest.CoreMatchers.is;
45
import static org.junit.Assert.assertThat;
56
import java.io.File;
7+
import java.util.Collections;
68
import java.util.HashMap;
79
import java.util.Iterator;
810
import java.util.Map;
@@ -12,6 +14,7 @@
1214
import org.junit.Test;
1315
import org.openmrs.Cohort;
1416
import org.openmrs.api.ConceptService;
17+
import org.openmrs.api.LocationService;
1518
import org.openmrs.module.commonreports.ActivatedReportManager;
1619
import org.openmrs.module.initializer.Domain;
1720
import org.openmrs.module.initializer.api.InitializerService;
@@ -79,6 +82,7 @@ public void testReport() throws Exception {
7982
context.addParameterValue("startedOnOrAfter", DateUtil.parseDate("2008-08-01", "yyyy-MM-dd"));
8083
context.addParameterValue("startDate", DateUtil.parseDate("2021-06-01", "yyyy-MM-dd"));
8184
context.addParameterValue("endDate", DateUtil.parseDate("2021-06-30", "yyyy-MM-dd"));
85+
context.addParameterValue("locationList", Arrays.asList("Unknown Location", "Xanadu", "Never Never Land"));
8286

8387
ReportDefinition rd = manager.constructReportDefinition();
8488
ReportData data = rds.evaluate(rd, context);

‎api/src/test/java/org/openmrs/module/commonreports/reports/MSPPEmergencyReportManagerTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.openmrs.module.commonreports.reports;
22

3+
import java.util.Arrays;
34
import static org.hamcrest.CoreMatchers.is;
45
import static org.junit.Assert.assertThat;
56
import java.io.File;
@@ -42,7 +43,7 @@ public class MSPPEmergencyReportManagerTest extends BaseModuleContextSensitiveTe
4243
@Autowired
4344
@Qualifier("conceptService")
4445
private ConceptService cs;
45-
46+
4647
@Autowired
4748
private MSPPEmergencyReportManager manager;
4849

@@ -78,7 +79,8 @@ public void testReport() throws Exception {
7879
EvaluationContext context = new EvaluationContext();
7980
context.addParameterValue("startDate", DateUtil.parseDate("2019-08-01", "yyyy-MM-dd"));
8081
context.addParameterValue("endDate", DateUtil.parseDate("2021-09-30", "yyyy-MM-dd"));
81-
82+
context.addParameterValue("locationList", Arrays.asList("Unknown Location", "Xanadu", "Never Never Land"));
83+
8284
ReportDefinition rd = manager.constructReportDefinition();
8385
ReportData data = rds.evaluate(rd, context);
8486

‎api/src/test/java/org/openmrs/module/commonreports/reports/MSPPFamilyPlanningReportManagerTest.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.io.File;
44
import java.sql.SQLException;
5+
import java.util.Arrays;
6+
import java.util.Collections;
57
import java.util.Iterator;
68
import org.junit.Assert;
79
import static org.junit.Assert.assertEquals;
@@ -41,7 +43,7 @@ public MSPPFamilyPlanningReportManagerTest() throws SQLException {
4143

4244
@Autowired
4345
private ReportDefinitionService rds;
44-
46+
4547
@Autowired
4648
@Qualifier(CommonReportsConstants.COMPONENT_REPORTMANAGER_FAMILY_PLANNING)
4749
private ActivatedReportManager manager;
@@ -78,6 +80,7 @@ public void testReport_shouldEvaluateReportWithCorrectData() throws Exception {
7880
EvaluationContext context = new EvaluationContext();
7981
context.addParameterValue("startDate", DateUtil.parseDate("2021-07-01", "yyyy-MM-dd"));
8082
context.addParameterValue("endDate", DateUtil.parseDate("2021-07-30", "yyyy-MM-dd"));
83+
context.addParameterValue("locationList", Arrays.asList("Unknown Location", "Xanadu", "Never Never Land"));
8184

8285
// replay
8386
ReportDefinition rd = manager.constructReportDefinition();

‎api/src/test/java/org/openmrs/module/commonreports/reports/MSPPLabReportManagerTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.io.File;
44
import java.sql.Connection;
55
import java.sql.SQLException;
6+
import java.util.Arrays;
67
import java.util.Iterator;
78
import java.util.List;
89
import org.dbunit.DatabaseUnitException;
@@ -61,7 +62,7 @@ public MSPPLabReportManagerTest() throws SQLException {
6162
@Autowired
6263
@Qualifier("conceptService")
6364
private ConceptService cs;
64-
65+
6566
@Autowired
6667
private MSPPLabReportManager manager;
6768

@@ -124,6 +125,7 @@ public void testReport() throws Exception {
124125
EvaluationContext context = new EvaluationContext();
125126
context.addParameterValue("startDate", DateUtil.parseDate("2021-06-01", "yyyy-MM-dd"));
126127
context.addParameterValue("endDate", DateUtil.parseDate("2021-07-01", "yyyy-MM-dd"));
128+
context.addParameterValue("locationList", Arrays.asList("Unknown Location", "Xanadu", "Never Never Land"));
127129

128130
// replay
129131
ReportDefinition rd = manager.constructReportDefinition();

‎api/src/test/java/org/openmrs/module/commonreports/reports/MSPPNewEpisodesOfDiseasesReportManagerTest.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.math.BigDecimal;
55
import java.sql.Connection;
66
import java.sql.SQLException;
7+
import java.util.Arrays;
78
import java.util.Iterator;
89
import org.dbunit.DatabaseUnitException;
910
import org.dbunit.DatabaseUnitRuntimeException;
@@ -62,7 +63,7 @@ public MSPPNewEpisodesOfDiseasesReportManagerTest() throws SQLException {
6263
@Autowired
6364
@Qualifier("conceptService")
6465
private ConceptService cs;
65-
66+
6667
@Autowired
6768
private MSPPNewEpisodesOfDiseasesReportManager manager;
6869

@@ -126,6 +127,8 @@ public void testReport() throws Exception {
126127
EvaluationContext context = new EvaluationContext();
127128
context.addParameterValue("startDate", DateUtil.parseDate("2008-08-01", "yyyy-MM-dd"));
128129
context.addParameterValue("endDate", DateUtil.parseDate("2009-09-30", "yyyy-MM-dd"));
130+
context.addParameterValue("locationList", Arrays.asList("Unknown Location", "Xanadu", "Never Never Land"));
131+
129132
boolean malariaVerified = false;
130133
boolean feverVerified = false;
131134
boolean diabetesVerified = false;

‎api/src/test/java/org/openmrs/module/commonreports/reports/MSPPVaccinationReportManagerTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.openmrs.module.commonreports.reports;
22

3+
import java.util.Arrays;
34
import static org.junit.Assert.assertEquals;
45
import static org.junit.Assert.assertNotNull;
56

@@ -80,7 +81,8 @@ public void testReport() throws Exception {
8081
EvaluationContext context = new EvaluationContext();
8182
context.addParameterValue("startDate", DateUtil.parseDate("2021-06-01", "yyyy-MM-dd"));
8283
context.addParameterValue("endDate", DateUtil.parseDate("2021-06-30", "yyyy-MM-dd"));
83-
84+
context.addParameterValue("locationList", Arrays.asList("Unknown Location", "Xanadu", "Never Never Land"));
85+
8486
ReportDefinition rd = manager.constructReportDefinition();
8587
ReportData data = rds.evaluate(rd, context);
8688

‎api/src/test/java/org/openmrs/module/commonreports/reports/MSPPVisitsReportManagerTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.io.File;
44
import java.sql.Connection;
55
import java.sql.SQLException;
6+
import java.util.Arrays;
67
import java.util.HashMap;
78
import java.util.Iterator;
89
import java.util.Map;
@@ -55,7 +56,7 @@ public MSPPVisitsReportManagerTest() throws SQLException {
5556

5657
@Autowired
5758
private ReportDefinitionService rds;
58-
59+
5960
@Autowired
6061
private MSPPVisitsReportManager manager;
6162

@@ -133,7 +134,8 @@ public void testReport() throws Exception {
133134
EvaluationContext context = new EvaluationContext();
134135
context.addParameterValue("startDate", DateUtil.parseDate("2021-03-10", "yyyy-MM-dd"));
135136
context.addParameterValue("endDate", DateUtil.parseDate("2021-06-20", "yyyy-MM-dd"));
136-
137+
context.addParameterValue("locationList", Arrays.asList("Unknown Location", "Xanadu", "Never Never Land"));
138+
137139
// replay
138140
ReportDefinition rd = manager.constructReportDefinition();
139141
ReportData data = rds.evaluate(rd, context);

0 commit comments

Comments
 (0)