Skip to content

Commit afe6fb9

Browse files
wikumChamithwikumChamith
committed
Fix test errors
1 parent bba7a63 commit afe6fb9

File tree

5 files changed

+84
-3
lines changed

5 files changed

+84
-3
lines changed

‎api-1.10/pom.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,16 @@
4545
<type>test-jar</type>
4646
<version>${openMRSVersion}</version>
4747
<scope>test</scope>
48+
<exclusions>
49+
<exclusion>
50+
<groupId>org.powermock</groupId>
51+
<artifactId>powermock-api-mockito</artifactId>
52+
</exclusion>
53+
<exclusion>
54+
<groupId>org.powermock</groupId>
55+
<artifactId>powermock-api-mockito2</artifactId>
56+
</exclusion>
57+
</exclusions>
4858
</dependency>
4959

5060
<dependency>
@@ -53,6 +63,16 @@
5363
<version>${openMRSVersion}</version>
5464
<type>pom</type>
5565
<scope>test</scope>
66+
<exclusions>
67+
<exclusion>
68+
<groupId>org.powermock</groupId>
69+
<artifactId>powermock-api-mockito</artifactId>
70+
</exclusion>
71+
<exclusion>
72+
<groupId>org.powermock</groupId>
73+
<artifactId>powermock-api-mockito2</artifactId>
74+
</exclusion>
75+
</exclusions>
5676
</dependency>
5777

5878
</dependencies>

‎api-2.0/pom.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,16 @@
3737
<type>test-jar</type>
3838
<version>${openMRSVersion}</version>
3939
<scope>test</scope>
40+
<exclusions>
41+
<exclusion>
42+
<groupId>org.powermock</groupId>
43+
<artifactId>powermock-api-mockito</artifactId>
44+
</exclusion>
45+
<exclusion>
46+
<groupId>org.powermock</groupId>
47+
<artifactId>powermock-api-mockito2</artifactId>
48+
</exclusion>
49+
</exclusions>
4050
</dependency>
4151

4252
<dependency>
@@ -45,6 +55,16 @@
4555
<version>${openMRSVersion}</version>
4656
<type>pom</type>
4757
<scope>test</scope>
58+
<exclusions>
59+
<exclusion>
60+
<groupId>org.powermock</groupId>
61+
<artifactId>powermock-api-mockito</artifactId>
62+
</exclusion>
63+
<exclusion>
64+
<groupId>org.powermock</groupId>
65+
<artifactId>powermock-api-mockito2</artifactId>
66+
</exclusion>
67+
</exclusions>
4868
</dependency>
4969

5070
</dependencies>

‎api-2.2/pom.xml‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,17 @@
3636
<artifactId>openmrs-test</artifactId>
3737
<type>pom</type>
3838
<scope>test</scope>
39-
<version>${openMRSVersion}</version>
39+
<version>${openMRSVersion}</version>
40+
<exclusions>
41+
<exclusion>
42+
<groupId>org.powermock</groupId>
43+
<artifactId>powermock-api-mockito</artifactId>
44+
</exclusion>
45+
<exclusion>
46+
<groupId>org.powermock</groupId>
47+
<artifactId>powermock-api-mockito2</artifactId>
48+
</exclusion>
49+
</exclusions>
4050
</dependency>
4151
<dependency>
4252
<groupId>org.openmrs.api</groupId>
@@ -50,6 +60,16 @@
5060
<type>test-jar</type>
5161
<scope>test</scope>
5262
<version>${openMRSVersion}</version>
63+
<exclusions>
64+
<exclusion>
65+
<groupId>org.powermock</groupId>
66+
<artifactId>powermock-api-mockito</artifactId>
67+
</exclusion>
68+
<exclusion>
69+
<groupId>org.powermock</groupId>
70+
<artifactId>powermock-api-mockito2</artifactId>
71+
</exclusion>
72+
</exclusions>
5373
</dependency>
5474

5575
<dependency>

‎api-2.4/pom.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,16 @@
3737
<type>test-jar</type>
3838
<version>${openMRSVersion}</version>
3939
<scope>test</scope>
40+
<exclusions>
41+
<exclusion>
42+
<groupId>org.powermock</groupId>
43+
<artifactId>powermock-api-mockito</artifactId>
44+
</exclusion>
45+
<exclusion>
46+
<groupId>org.powermock</groupId>
47+
<artifactId>powermock-api-mockito2</artifactId>
48+
</exclusion>
49+
</exclusions>
4050
</dependency>
4151

4252
<dependency>
@@ -45,6 +55,16 @@
4555
<version>${openMRSVersion}</version>
4656
<type>pom</type>
4757
<scope>test</scope>
58+
<exclusions>
59+
<exclusion>
60+
<groupId>org.powermock</groupId>
61+
<artifactId>powermock-api-mockito</artifactId>
62+
</exclusion>
63+
<exclusion>
64+
<groupId>org.powermock</groupId>
65+
<artifactId>powermock-api-mockito2</artifactId>
66+
</exclusion>
67+
</exclusions>
4868
</dependency>
4969

5070
</dependencies>

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import org.springframework.beans.factory.annotation.Autowired;
3636

3737
import java.util.Arrays;
38+
import java.util.Collections;
3839

3940
import static org.hamcrest.core.Is.is;
4041
import static org.hamcrest.core.IsNull.nullValue;
@@ -159,7 +160,7 @@ private CohortDefinition setUpTestPatientCohortDefinition(PersonAttributeType te
159160
PersonAttributeCohortDefinition cohortDefinition = new PersonAttributeCohortDefinition();
160161
cohortDefinition.setName("Test Patients");
161162
cohortDefinition.setAttributeType(testAttributeType);
162-
cohortDefinition.setValues(Arrays.asList("true"));
163+
cohortDefinition.setValues(Collections.singletonList("true"));
163164
Context.getService(CohortDefinitionService.class).saveDefinition(cohortDefinition);
164165
return cohortDefinition;
165166
}
@@ -199,7 +200,7 @@ public String getKeyPrefix() {
199200
public CohortDefinition getTestPatients() {
200201
PersonAttributeCohortDefinition cohortDefinition = new PersonAttributeCohortDefinition();
201202
cohortDefinition.setAttributeType(Context.getPersonService().getPersonAttributeTypeByUuid(TEST_PATIENT_ATTR_TYPE_UUID));
202-
cohortDefinition.setValues(Arrays.asList("true"));
203+
cohortDefinition.setValues(Collections.singletonList("true"));
203204
return cohortDefinition;
204205
}
205206

0 commit comments

Comments
 (0)