Skip to content

Commit 2466738

Browse files
wikumChamithwikumChamith
committed
Migrate apt-test
1 parent a9fd717 commit 2466738

File tree

414 files changed

+27390
-327
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

414 files changed

+27390
-327
lines changed

‎api-tests/src/test/java/org/openmrs/module/reporting/calculation/PatientDataCalculationBehaviorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ public class PatientDataCalculationBehaviorTest extends BaseModuleContextSensiti
3333

3434
protected static final String XML_DATASET_PATH = "org/openmrs/module/reporting/include/";
3535

36-
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset";
36+
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset.xml";
3737

3838
private PatientService ps;
3939

4040
@Before
4141
public void setup() throws Exception {
42-
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
42+
executeDataSet(XML_DATASET_PATH + XML_REPORT_TEST_DATASET);
4343
ps = Context.getPatientService();
4444
}
4545

‎api-tests/src/test/java/org/openmrs/module/reporting/cohort/definition/evaluator/AllPatientsCohortDefinitionEvaluatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ public class AllPatientsCohortDefinitionEvaluatorTest extends BaseModuleContextS
2929

3030
protected static final String XML_DATASET_PATH = "org/openmrs/module/reporting/include/";
3131

32-
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset";
32+
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset.xml";
3333

3434
@Before
3535
public void setup() throws Exception {
36-
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
36+
executeDataSet(XML_DATASET_PATH + XML_REPORT_TEST_DATASET);
3737
}
3838

3939
@Test

‎api-tests/src/test/java/org/openmrs/module/reporting/cohort/definition/evaluator/BirthAndDeathCohortDefinitionEvaluatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ public class BirthAndDeathCohortDefinitionEvaluatorTest extends BaseModuleContex
3131

3232
protected static final String XML_DATASET_PATH = "org/openmrs/module/reporting/include/";
3333

34-
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset";
34+
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset.xml";
3535

3636
@Before
3737
public void setup() throws Exception {
38-
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
38+
executeDataSet(XML_DATASET_PATH + XML_REPORT_TEST_DATASET);
3939
}
4040

4141
/**

‎api-tests/src/test/java/org/openmrs/module/reporting/cohort/definition/evaluator/CodedObsCohortDefinitionEvaluatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ public class CodedObsCohortDefinitionEvaluatorTest extends BaseModuleContextSens
3737

3838
protected static final String XML_DATASET_PATH = "org/openmrs/module/reporting/include/";
3939

40-
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset";
40+
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset.xml";
4141

4242
@Before
4343
public void setup() throws Exception {
44-
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
44+
executeDataSet(XML_DATASET_PATH + XML_REPORT_TEST_DATASET);
4545
}
4646

4747
/**

‎api-tests/src/test/java/org/openmrs/module/reporting/cohort/definition/evaluator/CompositionCohortDefinitionEvaluatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,11 @@ public class CompositionCohortDefinitionEvaluatorTest extends BaseModuleContextS
5656

5757
protected final Log log = LogFactory.getLog(getClass());
5858
protected static final String XML_DATASET_PATH = "org/openmrs/module/reporting/include/";
59-
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset";
59+
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset.xml";
6060

6161
@Before
6262
public void setup() throws Exception {
63-
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
63+
executeDataSet(XML_DATASET_PATH + XML_REPORT_TEST_DATASET);
6464
}
6565

6666
public CompositionCohortDefinition getBaseDefinition() {

‎api-tests/src/test/java/org/openmrs/module/reporting/cohort/definition/evaluator/ConditionCohortDefinitionEvaluatorTest.java‎

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
/**
2+
* This Source Code Form is subject to the terms of the Mozilla Public License,
3+
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
4+
* obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
5+
* the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
6+
*
7+
* Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
8+
* graphic logo is a trademark of OpenMRS Inc.
9+
*/
10+
package org.openmrs.module.reporting.cohort.definition.evaluator;
11+
12+
import org.junit.After;
13+
import org.junit.Assert;
14+
import org.junit.Before;
15+
import org.junit.Test;
16+
import org.openmrs.Cohort;
17+
import org.openmrs.Concept;
18+
import org.openmrs.api.context.Context;
19+
import org.openmrs.module.reporting.cohort.definition.ConditionCohortDefinition;
20+
import org.openmrs.module.reporting.cohort.definition.service.CohortDefinitionService;
21+
import org.openmrs.module.reporting.common.DateUtil;
22+
import org.openmrs.test.BaseModuleContextSensitiveTest;
23+
24+
public class ConditionCohortDefinitionEvaluatorTest extends BaseModuleContextSensitiveTest {
25+
26+
protected static final String CONDITION_TEST_DATASET = "org/openmrs/module/reporting/include/ConditionCohortDefinitionEvaluatorTestDataSet.xml";
27+
28+
private ConditionCohortDefinition cd;
29+
30+
@Before
31+
public void setup() throws Exception {
32+
initializeInMemoryDatabase();
33+
cd = new ConditionCohortDefinition();
34+
executeDataSet(CONDITION_TEST_DATASET);
35+
}
36+
37+
@After
38+
public void tearDown() {
39+
cd = null;
40+
}
41+
42+
@Test
43+
public void evaluateShouldReturnAllPatients() throws Exception {
44+
Cohort cohort = Context.getService(CohortDefinitionService.class).evaluate(cd, null);
45+
Assert.assertTrue(cohort.contains(1));
46+
Assert.assertTrue(cohort.contains(2));
47+
Assert.assertTrue(cohort.contains(3));
48+
Assert.assertTrue(cohort.contains(4));
49+
Assert.assertTrue(cohort.contains(5));
50+
Assert.assertEquals(5, cohort.size());
51+
}
52+
53+
@Test
54+
public void evaluateShouldFilterPatientsWithConcept() throws Exception {
55+
Concept concept = Context.getConceptService().getConcept(409);
56+
cd.setConditionCoded(concept);
57+
Cohort cohort = Context.getService(CohortDefinitionService.class).evaluate(cd, null);
58+
Assert.assertTrue(cohort.contains(1));
59+
Assert.assertTrue(cohort.contains(2));
60+
Assert.assertTrue(cohort.contains(3));
61+
Assert.assertTrue(cohort.contains(4));
62+
Assert.assertEquals(4, cohort.size());
63+
}
64+
65+
@Test
66+
public void evaluateShouldFilterPatientsWithConceptAndNonCodedValue() throws Exception {
67+
cd.setConditionNonCoded("NON-CODED-CONDITION");
68+
Cohort cohort = Context.getService(CohortDefinitionService.class).evaluate(cd, null);
69+
Assert.assertTrue(cohort.contains(4));
70+
Assert.assertTrue(cohort.contains(4));
71+
Assert.assertEquals(2, cohort.size());
72+
}
73+
74+
@Test
75+
public void evaluateShouldFilterPatientsWithCreatedOnOrAfter() throws Exception {
76+
Concept concept = Context.getConceptService().getConcept(409);
77+
cd.setConditionCoded(concept);
78+
cd.setCreatedOnOrAfter(DateUtil.getDateTime(2014, 03, 12));
79+
Cohort cohort = Context.getService(CohortDefinitionService.class).evaluate(cd, null);
80+
Assert.assertTrue(cohort.contains(1));
81+
Assert.assertTrue(cohort.contains(2));
82+
Assert.assertTrue(cohort.contains(3));
83+
Assert.assertEquals(3, cohort.size());
84+
}
85+
86+
@Test
87+
public void evaluateShouldFilterPatientsWithOnSetDateOnOrAfter() throws Exception {
88+
Concept concept = Context.getConceptService().getConcept(409);
89+
cd.setConditionCoded(concept);
90+
cd.setOnsetDateOnOrAfter(DateUtil.getDateTime(2014, 03, 12));
91+
Cohort cohort = Context.getService(CohortDefinitionService.class).evaluate(cd, null);
92+
Assert.assertTrue(cohort.contains(1));
93+
Assert.assertTrue(cohort.contains(2));
94+
Assert.assertTrue(cohort.contains(3));
95+
Assert.assertEquals(3, cohort.size());
96+
}
97+
98+
@Test
99+
public void evaluateShouldFilterPatientsWithEndDateOnOrAfter() throws Exception {
100+
Concept concept = Context.getConceptService().getConcept(409);
101+
cd.setConditionCoded(concept);
102+
cd.setEndDateOnOrAfter(DateUtil.getDateTime(2016, 05, 12));
103+
Cohort cohort = Context.getService(CohortDefinitionService.class).evaluate(cd, null);
104+
Assert.assertTrue(cohort.contains(1));
105+
Assert.assertTrue(cohort.contains(2));
106+
Assert.assertTrue(cohort.contains(3));
107+
Assert.assertEquals(3, cohort.size());
108+
}
109+
110+
111+
112+
@Test
113+
public void evaluateShouldFilterPatientsWithCreatedOnOrBefore() throws Exception {
114+
Concept concept = Context.getConceptService().getConcept(409);
115+
cd.setConditionCoded(concept);
116+
cd.setCreatedOnOrBefore(DateUtil.getDateTime(2014, 03, 12));
117+
Cohort cohort = Context.getService(CohortDefinitionService.class).evaluate(cd, null);
118+
Assert.assertTrue(cohort.contains(3));
119+
Assert.assertTrue(cohort.contains(4));
120+
Assert.assertEquals(2, cohort.size());
121+
}
122+
123+
@Test
124+
public void evaluateShouldFilterPatientsWithOnSetDateOnOrBefore() throws Exception {
125+
Concept concept = Context.getConceptService().getConcept(409);
126+
cd.setConditionCoded(concept);
127+
cd.setOnsetDateOnOrBefore(DateUtil.getDateTime(2014, 03, 12));
128+
Cohort cohort = Context.getService(CohortDefinitionService.class).evaluate(cd, null);
129+
Assert.assertTrue(cohort.contains(3));
130+
Assert.assertTrue(cohort.contains(4));
131+
Assert.assertEquals(2, cohort.size());
132+
}
133+
134+
@Test
135+
public void evaluateShouldFilterPatientsWithEndDateOnOrBefore() throws Exception {
136+
Concept concept = Context.getConceptService().getConcept(409);
137+
cd.setConditionCoded(concept);
138+
cd.setEndDateOnOrBefore(DateUtil.getDateTime(2016, 05, 12));
139+
Cohort cohort = Context.getService(CohortDefinitionService.class).evaluate(cd, null);
140+
Assert.assertTrue(cohort.contains(4));
141+
Assert.assertEquals(1, cohort.size());
142+
}
143+
144+
145+
146+
@Test
147+
public void evaluateShouldFilterPatientsBetweenDateRanges() throws Exception {
148+
Concept concept = Context.getConceptService().getConcept(409);
149+
cd.setConditionCoded(concept);
150+
cd.setCreatedOnOrAfter(DateUtil.getDateTime(2014, 02, 12));
151+
cd.setCreatedOnOrBefore(DateUtil.getDateTime(2014, 04, 12));
152+
Cohort cohort = Context.getService(CohortDefinitionService.class).evaluate(cd, null);
153+
Assert.assertTrue(cohort.contains(3));
154+
Assert.assertEquals(1, cohort.size());
155+
}
156+
157+
@Test
158+
public void evaluateShouldFilterPatientsWithActiveOnDate() throws Exception {
159+
Concept concept = Context.getConceptService().getConcept(409);
160+
cd.setConditionCoded(concept);
161+
cd.setActiveOnDate(DateUtil.getDateTime(2014, 04, 12));
162+
Cohort cohort = Context.getService(CohortDefinitionService.class).evaluate(cd, null);
163+
Assert.assertTrue(cohort.contains(3));
164+
Assert.assertTrue(cohort.contains(4));
165+
Assert.assertEquals(2, cohort.size());
166+
}
167+
168+
@Test
169+
public void evaluateShouldFilterPatientsWithAllParams() throws Exception {
170+
Concept concept = Context.getConceptService().getConcept(409);
171+
cd.setCreatedOnOrAfter(DateUtil.getDateTime(2015, 01, 10));
172+
cd.setCreatedOnOrBefore(DateUtil.getDateTime(2015, 01, 14));
173+
cd.setConditionCoded(concept);
174+
cd.setConditionNonCoded("NON-CODED-CONDITION2");
175+
Cohort cohort = Context.getService(CohortDefinitionService.class).evaluate(cd, null);
176+
Assert.assertTrue(cohort.contains(1));
177+
Assert.assertTrue(cohort.contains(2));
178+
Assert.assertEquals(2, cohort.size());
179+
}
180+
}

‎api-tests/src/test/java/org/openmrs/module/reporting/cohort/definition/evaluator/ConditionalParameterCohortDefinitionEvaluatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class ConditionalParameterCohortDefinitionEvaluatorTest extends BaseModul
3535

3636
protected final Log log = LogFactory.getLog(getClass());
3737
protected static final String XML_DATASET_PATH = "org/openmrs/module/reporting/include/";
38-
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset";
38+
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset.xml";
3939

4040
@Autowired
4141
CohortDefinitionService cohortDefinitionService;
@@ -49,7 +49,7 @@ public class ConditionalParameterCohortDefinitionEvaluatorTest extends BaseModul
4949
*/
5050
@Before
5151
public void setup() throws Exception {
52-
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
52+
executeDataSet(XML_DATASET_PATH + XML_REPORT_TEST_DATASET);
5353
}
5454

5555
/**

‎api-tests/src/test/java/org/openmrs/module/reporting/cohort/definition/evaluator/DateObsCohortDefinitionEvaluatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ public class DateObsCohortDefinitionEvaluatorTest extends BaseModuleContextSensi
3535

3636
protected static final String XML_DATASET_PATH = "org/openmrs/module/reporting/include/";
3737

38-
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset";
38+
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset.xml";
3939

4040
@Before
4141
public void setup() throws Exception {
42-
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
42+
executeDataSet(XML_DATASET_PATH + XML_REPORT_TEST_DATASET);
4343
}
4444

4545
/**

‎api-tests/src/test/java/org/openmrs/module/reporting/cohort/definition/evaluator/DefinitionLibraryCohortDefinitionEvaluatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ public class DefinitionLibraryCohortDefinitionEvaluatorTest extends BaseModuleCo
4545

4646
protected static final String XML_DATASET_PATH = "org/openmrs/module/reporting/include/";
4747

48-
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset";
48+
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset.xml";
4949

5050
@Before
5151
public void setup() throws Exception {
52-
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
52+
executeDataSet(XML_DATASET_PATH + XML_REPORT_TEST_DATASET);
5353
}
5454

5555
@Test

‎api-tests/src/test/java/org/openmrs/module/reporting/cohort/definition/evaluator/EncounterCohortDefinitionEvaluatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ public class EncounterCohortDefinitionEvaluatorTest extends BaseModuleContextSen
4141

4242
protected static final String XML_DATASET_PATH = "org/openmrs/module/reporting/include/";
4343

44-
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset";
44+
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset.xml";
4545

4646
@Before
4747
public void setup() throws Exception {
48-
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
48+
executeDataSet(XML_DATASET_PATH + XML_REPORT_TEST_DATASET);
4949
}
5050

5151
/**

0 commit comments

Comments
 (0)