Skip to content

Commit dc4708b

Browse files
wikumChamithwikumChamith
committed
Fix dataset errors
1 parent b157ba8 commit dc4708b

File tree

18 files changed

+258
-224
lines changed

18 files changed

+258
-224
lines changed

‎api-tests/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,11 @@
7676
<artifactId>openmrs-web</artifactId>
7777
<version>${openMRSVersion}</version>
7878
</dependency>
79+
<dependency>
80+
<groupId>org.openmrs.module</groupId>
81+
<artifactId>reportingcompatibility-api</artifactId>
82+
<version>3.0.0-SNAPSHOT</version>
83+
</dependency>
7984
</dependencies>
8085

8186
<build>

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,10 @@
1414

1515
import org.junit.Before;
1616
import org.junit.Test;
17-
import org.junit.runner.RunWith;
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.BaseModuleContextSensitiveTest;
2219

23-
@RunWith(PowerMockRunner.class)
24-
@PrepareForTest(Context.class)
25-
public class PrivilegedDataConverterTest {
20+
public class PrivilegedDataConverterTest extends BaseModuleContextSensitiveTest {
2621

2722
public static final String INPUT = "input";
2823
public static final String REPLACEMENT = "****";
@@ -32,9 +27,8 @@ public class PrivilegedDataConverterTest {
3227

3328
@Before
3429
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);
30+
Context.addProxyPrivilege(HAS_PRIV);
31+
// Context.removeProxyPrivilege(DOES_NOT_HAVE_PRIV);
3832
}
3933

4034
@Test

‎api-tests/src/test/java/org/openmrs/module/reporting/data/encounter/evaluator/ObsForEncounterEvaluatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class ObsForEncounterEvaluatorTest extends BaseModuleContextSensitiveTest
4444

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

47-
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset";
47+
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset-openmrs-2.4.xml";
4848

4949
@Autowired
5050
private TestDataManager data;
@@ -68,7 +68,7 @@ public class ObsForEncounterEvaluatorTest extends BaseModuleContextSensitiveTest
6868
*/
6969
@Before
7070
public void setup() throws Exception {
71-
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
71+
executeDataSet(XML_DATASET_PATH + XML_REPORT_TEST_DATASET);
7272
}
7373

7474
@Test

‎api-tests/src/test/java/org/openmrs/module/reporting/data/person/evaluator/PersonAttributeDataEvaluatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class PersonAttributeDataEvaluatorTest extends BaseModuleContextSensitive
2828

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

31-
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset";
31+
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset-openmrs-2.4.xml";
3232

3333
/**
3434
* Run this before each unit test in this class. The "@Before" method in
@@ -38,7 +38,7 @@ public class PersonAttributeDataEvaluatorTest extends BaseModuleContextSensitive
3838
*/
3939
@Before
4040
public void setup() throws Exception {
41-
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
41+
executeDataSet(XML_DATASET_PATH +XML_REPORT_TEST_DATASET);
4242
}
4343

4444
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ public class HqlQueryBuilderTest extends BaseModuleContextSensitiveTest {
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-openmrs-2.4.xml";
4949

5050
@Autowired
5151
EvaluationService evaluationService;
5252

5353
@Before
5454
public void setup() throws Exception {
55-
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
55+
executeDataSet(XML_DATASET_PATH + XML_REPORT_TEST_DATASET);
5656
}
5757

5858
@Test

‎api-tests/src/test/java/org/openmrs/module/reporting/query/encounter/service/EncounterQueryServiceImplTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class EncounterQueryServiceImplTest extends BaseModuleContextSensitiveTes
2828

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

31-
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset";
31+
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset-openmrs-2.4.xml";
3232

3333
/**
3434
* Run this before each unit test in this class. The "@Before" method in
@@ -38,7 +38,7 @@ public class EncounterQueryServiceImplTest extends BaseModuleContextSensitiveTes
3838
*/
3939
@Before
4040
public void setup() throws Exception {
41-
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
41+
executeDataSet(XML_DATASET_PATH + XML_REPORT_TEST_DATASET);
4242
}
4343

4444
/**

‎api-tests/src/test/java/org/openmrs/module/reporting/query/obs/evaluator/AllObsQueryEvaluatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@ public class AllObsQueryEvaluatorTest extends BaseModuleContextSensitiveTest {
3030

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

33-
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset";
33+
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset-openmrs-2.4.xml";
3434

3535
@Autowired
3636
ObsQueryService obsQueryService;
3737

3838
@Before
3939
public void setup() throws Exception {
40-
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
40+
executeDataSet(XML_DATASET_PATH + XML_REPORT_TEST_DATASET);
4141
}
4242

4343
@Test

‎api-tests/src/test/java/org/openmrs/module/reporting/query/obs/evaluator/BasicObsQueryEvaluatorTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class BasicObsQueryEvaluatorTest extends BaseModuleContextSensitiveTest {
3434

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

37-
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset";
37+
protected static final String XML_REPORT_TEST_DATASET = "ReportTestDataset-openmrs-2.4.xml";
3838

3939
@Autowired
4040
ObsQueryService obsQueryService;
@@ -47,7 +47,7 @@ public class BasicObsQueryEvaluatorTest extends BaseModuleContextSensitiveTest {
4747

4848
@Before
4949
public void setup() throws Exception {
50-
executeDataSet(XML_DATASET_PATH + new TestUtil().getTestDatasetFilename(XML_REPORT_TEST_DATASET));
50+
executeDataSet(XML_DATASET_PATH + XML_REPORT_TEST_DATASET);
5151
}
5252

5353
@Test

‎api-tests/src/test/java/org/openmrs/module/reporting/query/obs/evaluator/SqlObsQueryEvaluatorTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class SqlObsQueryEvaluatorTest extends BaseModuleContextSensitiveTest {
3434

3535
@Before
3636
public void setup() throws Exception {
37-
executeDataSet("org/openmrs/module/reporting/include/" + new TestUtil().getTestDatasetFilename("ReportTestDataset"));
37+
executeDataSet("org/openmrs/module/reporting/include/ReportTestDataset-openmrs-2.4.xml");
3838
}
3939

4040
@Test

‎api-tests/src/test/java/org/openmrs/module/reporting/query/obs/service/ObsQueryServiceImplTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class ObsQueryServiceImplTest extends BaseModuleContextSensitiveTest {
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-openmrs-2.4.xml";
3333

3434
/**
3535
* Run this before each unit test in this class. The "@Before" method in
@@ -39,7 +39,7 @@ public class ObsQueryServiceImplTest extends BaseModuleContextSensitiveTest {
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
/**

0 commit comments

Comments
 (0)