Skip to content

Commit 2c8e57e

Browse files
wikumChamithwikumChamith
authored
REPORT-912: Update to OpenMRS platform 2.7.3 and Support Java 21 (#261)
* Update to Platform 2.7.0 and Support Java 21 * Migrate to org.openmrs.test.jupiter.BaseModuleContextSensitiveTest * Add the EvaluationProfilerTest24On
1 parent ac35bc7 commit 2c8e57e

File tree

21 files changed

+144
-106
lines changed

21 files changed

+144
-106
lines changed

‎.github/workflows/maven.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
platform: [ ubuntu-latest ]
16-
java-version: [ 8 ]
16+
java-version: [ 8, 11, 17, 21, 24 ]
1717

1818
runs-on: ${{ matrix.platform }}
1919
env:

‎api-tests/pom.xml‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.openmrs.module</groupId>
66
<artifactId>reporting</artifactId>
7-
<version>1.29.0-SNAPSHOT</version>
7+
<version>2.0.0-SNAPSHOT</version>
88
</parent>
99

1010
<artifactId>reporting-api-tests</artifactId>
@@ -40,6 +40,14 @@
4040
<artifactId>javassist</artifactId>
4141
<groupId>javassist</groupId>
4242
</exclusion>
43+
<exclusion>
44+
<groupId>org.powermock</groupId>
45+
<artifactId>powermock-api-mockito2</artifactId>
46+
</exclusion>
47+
<exclusion>
48+
<groupId>org.powermock</groupId>
49+
<artifactId>powermock-api-mockito</artifactId>
50+
</exclusion>
4351
</exclusions>
4452
</dependency>
4553
<dependency>
@@ -52,6 +60,14 @@
5260
<artifactId>javassist</artifactId>
5361
<groupId>javassist</groupId>
5462
</exclusion>
63+
<exclusion>
64+
<groupId>org.powermock</groupId>
65+
<artifactId>powermock-api-mockito2</artifactId>
66+
</exclusion>
67+
<exclusion>
68+
<groupId>org.powermock</groupId>
69+
<artifactId>powermock-api-mockito</artifactId>
70+
</exclusion>
5571
</exclusions>
5672
</dependency>
5773
<dependency>
@@ -64,6 +80,14 @@
6480
<artifactId>javassist</artifactId>
6581
<groupId>javassist</groupId>
6682
</exclusion>
83+
<exclusion>
84+
<groupId>org.powermock</groupId>
85+
<artifactId>powermock-api-mockito2</artifactId>
86+
</exclusion>
87+
<exclusion>
88+
<groupId>org.powermock</groupId>
89+
<artifactId>powermock-api-mockito</artifactId>
90+
</exclusion>
6791
</exclusions>
6892
</dependency>
6993
<dependency>

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
import java.util.Collections;
1515

1616
import org.junit.Assert;
17-
import org.junit.Before;
18-
import org.junit.Ignore;
19-
import org.junit.Test;
17+
import org.junit.jupiter.api.BeforeEach;
18+
import org.junit.jupiter.api.Disabled;
19+
import org.junit.jupiter.api.Test;
2020
import org.openmrs.Cohort;
2121
import org.openmrs.Encounter;
2222
import org.openmrs.EncounterType;
@@ -34,17 +34,21 @@
3434
import org.openmrs.module.reporting.common.TimeQualifier;
3535
import org.openmrs.module.reporting.definition.DefinitionContext;
3636
import org.openmrs.module.reporting.evaluation.EvaluationContext;
37-
import org.openmrs.test.BaseModuleContextSensitiveTest;
37+
import org.openmrs.test.SkipBaseSetup;
3838
import org.openmrs.test.Verifies;
39+
import org.openmrs.test.jupiter.BaseModuleContextSensitiveTest;
3940

41+
@SkipBaseSetup
4042
public class EncounterCohortDefinitionEvaluatorTest extends BaseModuleContextSensitiveTest {
4143

4244
protected static final String XML_DATASET_PATH = "org/openmrs/module/reporting/include/";
4345

4446
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset";
4547

46-
@Before
48+
@BeforeEach
4749
public void setup() throws Exception {
50+
initializeInMemoryDatabase();
51+
authenticate();
4852
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
4953
}
5054

@@ -201,7 +205,7 @@ public void evaluate_shouldReturnCorrectPatientsWhenTimeQualifierParametersAreSe
201205
* @see EncounterCohortDefinitionEvaluator#evaluate(CohortDefinition,EvaluationContext)
202206
* @verifies return correct patients when provider parameters are set
203207
*/
204-
@Ignore
208+
@Disabled
205209
@Test
206210
public void evaluate_shouldReturnCorrectPatientsWhenProviderParametersAreSet() throws Exception {
207211
EncounterCohortDefinition cd = new EncounterCohortDefinition();
@@ -212,7 +216,7 @@ public void evaluate_shouldReturnCorrectPatientsWhenProviderParametersAreSet() t
212216
/**
213217
* @see {@link EncounterCohortDefinitionEvaluator#evaluate(CohortDefinition,EvaluationContext)}
214218
*/
215-
@Ignore
219+
@Disabled
216220
@Test
217221
@Verifies(value = "should not return voided patients", method = "evaluate(CohortDefinition,EvaluationContext)")
218222
public void evaluate_shouldNotReturnVoidedPatients() throws Exception {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void setUp() throws Exception {
6868
@Test
6969
public void testEvaluateWithNoProperties() throws Exception {
7070
Cohort c = cohortDefinitionService.evaluate(cd, null);
71-
assertThat(c.size(), is(2));
71+
assertThat(c.size(), is(3));
7272
}
7373

7474
@Test

‎api-tests/src/test/java/org/openmrs/module/reporting/data/converter/PrivilegedDataConverterTest.java‎

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,39 @@
1212
import static org.hamcrest.core.Is.is;
1313
import static org.junit.Assert.assertThat;
1414

15-
import org.junit.Before;
16-
import org.junit.Test;
17-
import org.junit.runner.RunWith;
15+
import org.junit.jupiter.api.BeforeEach;
16+
import org.junit.jupiter.api.Test;
1817
import org.openmrs.api.context.Context;
19-
import org.powermock.api.mockito.PowerMockito;
20-
import org.powermock.core.classloader.annotations.PrepareForTest;
21-
import org.powermock.modules.junit4.PowerMockRunner;
18+
import org.openmrs.test.SkipBaseSetup;
19+
import org.openmrs.test.jupiter.BaseModuleContextSensitiveTest;
2220

23-
@RunWith(PowerMockRunner.class)
24-
@PrepareForTest(Context.class)
25-
public class PrivilegedDataConverterTest {
21+
@SkipBaseSetup
22+
public class PrivilegedDataConverterTest extends BaseModuleContextSensitiveTest {
2623

2724
public static final String INPUT = "input";
2825
public static final String REPLACEMENT = "****";
2926

3027
public static final String HAS_PRIV = "A privilege I have";
3128
public static final String DOES_NOT_HAVE_PRIV = "A privilege I do not have";
3229

33-
@Before
30+
@BeforeEach
3431
public void setUp() throws Exception {
35-
PowerMockito.mockStatic(Context.class);
36-
PowerMockito.when(Context.hasPrivilege(HAS_PRIV)).thenReturn(true);
37-
PowerMockito.when(Context.hasPrivilege(DOES_NOT_HAVE_PRIV)).thenReturn(false);
32+
initializeInMemoryDatabase();
33+
executeDataSet("org/openmrs/module/reporting/include/PrivilegeTest.xml");
3834
}
3935

4036
@Test
41-
public void testConvertWithPrivilege() throws Exception {
42-
PrivilegedDataConverter converter = new PrivilegedDataConverter(HAS_PRIV);
43-
converter.setReplacement(REPLACEMENT);
44-
assertThat((String) converter.convert(INPUT), is(INPUT));
37+
public void testConvertWithPrivilege() {
38+
try {
39+
Context.addProxyPrivilege(HAS_PRIV);
40+
Context.hasPrivilege(HAS_PRIV);
41+
PrivilegedDataConverter converter = new PrivilegedDataConverter(HAS_PRIV);
42+
converter.setReplacement(REPLACEMENT);
43+
assertThat((String) converter.convert(INPUT), is(INPUT));
44+
}
45+
finally {
46+
Context.removeProxyPrivilege(HAS_PRIV);
47+
}
4548
}
4649

4750
@Test

‎api-tests/src/test/java/org/openmrs/module/reporting/data/patient/service/PatientDataServiceImplTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
package org.openmrs.module.reporting.data.patient.service;
1111

1212
import org.junit.Assert;
13-
import org.junit.Before;
14-
import org.junit.Test;
13+
import org.junit.jupiter.api.BeforeEach;
14+
import org.junit.jupiter.api.Test;
1515
import org.openmrs.Cohort;
1616
import org.openmrs.Patient;
1717
import org.openmrs.PersonAttribute;
@@ -31,10 +31,10 @@
3131
import org.openmrs.module.reporting.definition.library.DocumentedDefinition;
3232
import org.openmrs.module.reporting.evaluation.EvaluationContext;
3333
import org.openmrs.test.BaseContextSensitiveTest;
34-
import org.openmrs.test.BaseModuleContextSensitiveTest;
34+
import org.openmrs.test.jupiter.BaseModuleContextSensitiveTest;
3535
import org.springframework.beans.factory.annotation.Autowired;
3636

37-
import java.util.Arrays;
37+
import java.util.Collections;
3838

3939
import static org.hamcrest.core.Is.is;
4040
import static org.hamcrest.core.IsNull.nullValue;
@@ -59,7 +59,7 @@ public class PatientDataServiceImplTest extends BaseModuleContextSensitiveTest {
5959
*
6060
* @throws Exception
6161
*/
62-
@Before
62+
@BeforeEach
6363
public void setup() throws Exception {
6464
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
6565
}
@@ -159,7 +159,7 @@ private CohortDefinition setUpTestPatientCohortDefinition(PersonAttributeType te
159159
PersonAttributeCohortDefinition cohortDefinition = new PersonAttributeCohortDefinition();
160160
cohortDefinition.setName("Test Patients");
161161
cohortDefinition.setAttributeType(testAttributeType);
162-
cohortDefinition.setValues(Arrays.asList("true"));
162+
cohortDefinition.setValues(Collections.singletonList("true"));
163163
Context.getService(CohortDefinitionService.class).saveDefinition(cohortDefinition);
164164
return cohortDefinition;
165165
}
@@ -199,7 +199,7 @@ public String getKeyPrefix() {
199199
public CohortDefinition getTestPatients() {
200200
PersonAttributeCohortDefinition cohortDefinition = new PersonAttributeCohortDefinition();
201201
cohortDefinition.setAttributeType(Context.getPersonService().getPersonAttributeTypeByUuid(TEST_PATIENT_ATTR_TYPE_UUID));
202-
cohortDefinition.setValues(Arrays.asList("true"));
202+
cohortDefinition.setValues(Collections.singletonList("true"));
203203
return cohortDefinition;
204204
}
205205

‎api-tests/src/test/java/org/openmrs/module/reporting/data/visit/evaluator/VisitIdDataEvaluatorTest.java‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
package org.openmrs.module.reporting.data.visit.evaluator;
1111

1212
import org.junit.Assert;
13-
import org.junit.Before;
14-
import org.junit.Test;
13+
import org.junit.jupiter.api.BeforeEach;
14+
import org.junit.jupiter.api.Test;
1515
import org.openmrs.Cohort;
1616
import org.openmrs.api.context.Context;
1717
import org.openmrs.module.reporting.common.TestUtil;
@@ -21,9 +21,11 @@
2121
import org.openmrs.module.reporting.evaluation.EvaluationContext;
2222
import org.openmrs.module.reporting.evaluation.context.VisitEvaluationContext;
2323
import org.openmrs.module.reporting.query.visit.VisitIdSet;
24-
import org.openmrs.test.BaseModuleContextSensitiveTest;
24+
import org.openmrs.test.SkipBaseSetup;
25+
import org.openmrs.test.jupiter.BaseModuleContextSensitiveTest;
2526

26-
public class VisitIdDataEvaluatorTest extends BaseModuleContextSensitiveTest{
27+
@SkipBaseSetup
28+
public class VisitIdDataEvaluatorTest extends BaseModuleContextSensitiveTest {
2729

2830
protected static final String XML_DATASET_PATH = "org/openmrs/module/reporting/include/";
2931

@@ -35,8 +37,10 @@ public class VisitIdDataEvaluatorTest extends BaseModuleContextSensitiveTest{
3537
*
3638
* @throws Exception
3739
*/
38-
@Before
40+
@BeforeEach
3941
public void setup() throws Exception {
42+
initializeInMemoryDatabase();
43+
authenticate();
4044
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
4145
}
4246

‎api-tests/src/test/java/org/openmrs/module/reporting/dataset/definition/evaluator/RepeatPerTimePeriodDataSetEvaluatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import java.util.HashMap;
3131
import java.util.Map;
3232

33-
import static org.mockito.Matchers.argThat;
34-
import static org.mockito.Matchers.eq;
33+
import static org.mockito.ArgumentMatchers.argThat;
34+
import static org.mockito.ArgumentMatchers.eq;
3535
import static org.mockito.Mockito.mock;
3636
import static org.mockito.Mockito.verify;
3737

‎api-tests/src/test/java/org/openmrs/module/reporting/evaluation/EvaluationProfilerTest.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,23 @@
99
*/
1010
package org.openmrs.module.reporting.evaluation;
1111

12-
import static org.junit.Assume.assumeTrue;
13-
1412
import org.apache.log4j.Appender;
1513
import org.apache.log4j.Level;
1614
import org.apache.log4j.LogManager;
1715
import org.apache.log4j.Logger;
1816
import org.apache.log4j.PatternLayout;
1917
import org.apache.log4j.WriterAppender;
20-
import org.junit.After;
2118
import org.junit.Assert;
22-
import org.junit.Before;
23-
import org.junit.Test;
19+
import org.junit.jupiter.api.AfterEach;
20+
import org.junit.jupiter.api.BeforeEach;
21+
import org.junit.jupiter.api.Test;
2422
import org.openmrs.api.context.Context;
2523
import org.openmrs.module.reporting.cohort.definition.GenderCohortDefinition;
2624
import org.openmrs.module.reporting.indicator.CohortIndicator;
2725
import org.openmrs.module.reporting.indicator.service.IndicatorService;
2826
import org.openmrs.module.reporting.test.OpenmrsVersionTestListener;
2927
import org.openmrs.module.reporting.test.RequiresVersion;
30-
import org.openmrs.test.BaseModuleContextSensitiveTest;
28+
import org.openmrs.test.jupiter.BaseModuleContextSensitiveTest;
3129
import org.springframework.test.context.TestExecutionListeners;
3230

3331
import java.io.StringWriter;
@@ -52,7 +50,7 @@ public class EvaluationProfilerTest extends BaseModuleContextSensitiveTest {
5250
/**
5351
* Setup each test by configuring AOP on the relevant services and logging for the profiler class
5452
*/
55-
@Before
53+
@BeforeEach
5654
public void setup() {
5755
profiler1 = new EvaluationProfiler(new EvaluationContext());
5856
profiler2 = new EvaluationProfiler(new EvaluationContext());
@@ -70,7 +68,7 @@ public void setup() {
7068
/**
7169
* Cleanup after tests by removing AOP and resetting logging
7270
*/
73-
@After
71+
@AfterEach
7472
public void cleanup() {
7573
logger.setLevel(startingLevel);
7674
for (Appender appender : startingAppenders) {

‎api-tests/src/test/java/org/openmrs/module/reporting/evaluation/EvaluationProfilerTest24On.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,14 @@
1515
import org.junit.BeforeClass;
1616
import org.junit.Test;
1717
import org.openmrs.api.context.Context;
18+
import org.openmrs.logging.MemoryAppender;
19+
import org.openmrs.logging.OpenmrsLoggingUtil;
1820
import org.openmrs.module.reporting.cohort.definition.GenderCohortDefinition;
1921
import org.openmrs.module.reporting.indicator.CohortIndicator;
2022
import org.openmrs.module.reporting.indicator.service.IndicatorService;
2123
import org.openmrs.module.reporting.test.OpenmrsVersionTestListener;
2224
import org.openmrs.module.reporting.test.RequiresVersion;
2325
import org.openmrs.test.BaseModuleContextSensitiveTest;
24-
import org.openmrs.util.MemoryAppender;
2526
import org.openmrs.util.OpenmrsUtil;
2627
import org.springframework.test.context.TestExecutionListeners;
2728

@@ -38,7 +39,7 @@ public class EvaluationProfilerTest24On extends BaseModuleContextSensitiveTest {
3839

3940
@BeforeClass
4041
public static void beforeClass() {
41-
appender = OpenmrsUtil.getMemoryAppender();
42+
appender = OpenmrsLoggingUtil.getMemoryAppender();
4243

4344
if (appender == null) {
4445
LoggerContext context = (LoggerContext) LogManager.getContext(false);

0 commit comments

Comments
 (0)