Fix test errors

Author: wikumChamith

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

@@ -32,7 +32,7 @@
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 
-public class VisitCohortDefinitionEvaluatorTest extends BaseModuleContextSensitiveTest {;
+public class VisitCohortDefinitionEvaluatorTest extends BaseModuleContextSensitiveTest {
 
     @Autowired
     LocationService locationService;
@@ -68,7 +68,7 @@ public void setUp() throws Exception {
     @Test
     public void testEvaluateWithNoProperties() throws Exception {
         Cohort c = cohortDefinitionService.evaluate(cd, null);
-        assertThat(c.size(), is(2));
+        assertThat(c.size(), is(3));
     }
 
     @Test

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

@@ -16,7 +16,9 @@
 import org.junit.Test;
 import org.openmrs.api.context.Context;
 import org.openmrs.test.BaseModuleContextSensitiveTest;
+import org.openmrs.test.SkipBaseSetup;
 
+@SkipBaseSetup
 public class PrivilegedDataConverterTest extends BaseModuleContextSensitiveTest {
 
     public static final String INPUT = "input";
@@ -27,15 +29,24 @@ public class PrivilegedDataConverterTest extends BaseModuleContextSensitiveTest
 
     @Before
     public void setUp() throws Exception {
-        Context.addProxyPrivilege(HAS_PRIV);
-//        Context.removeProxyPrivilege(DOES_NOT_HAVE_PRIV);
+        initializeInMemoryDatabase();
+        executeDataSet("org/openmrs/module/reporting/include/PrivilegeTest.xml");
+        Context.logout();
+        Context.authenticate("test", "test");
     }
 
     @Test
-    public void testConvertWithPrivilege() throws Exception {
-        PrivilegedDataConverter converter = new PrivilegedDataConverter(HAS_PRIV);
-        converter.setReplacement(REPLACEMENT);
-        assertThat((String) converter.convert(INPUT), is(INPUT));
+    public void testConvertWithPrivilege() {
+        try {
+            Context.addProxyPrivilege(HAS_PRIV);
+            Context.hasPrivilege(HAS_PRIV);
+            PrivilegedDataConverter converter = new PrivilegedDataConverter(HAS_PRIV);
+            converter.setReplacement(REPLACEMENT);
+            assertThat((String) converter.convert(INPUT), is(INPUT));
+        }
+        finally {
+            Context.removeProxyPrivilege(HAS_PRIV);
+        }
     }
 
     @Test

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

@@ -49,7 +49,7 @@ public void evaluate_shouldReturnVisitIdsForThePatientsGivenAnEvaluationContext(
         VisitIdDataDefinition d = new VisitIdDataDefinition();
         EvaluationContext context = new EvaluationContext();
         EvaluatedVisitData ed = Context.getService(VisitDataService.class).evaluate(d, context);
-        Assert.assertEquals(5, ed.getData().size());  // one visit in the sample data has been voided
+        Assert.assertEquals(6, ed.getData().size());  // one visit in the sample data has been voided
         for (Integer eId : ed.getData().keySet()) {
             Assert.assertEquals(eId, ed.getData().get(eId));
         }

api-tests/src/test/resources/org/openmrs/module/reporting/include/PrivilegeTest.xml

@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+
+    This Source Code Form is subject to the terms of the Mozilla Public License,
+    v. 2.0. If a copy of the MPL was not distributed with this file, You can
+    obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under
+    the terms of the Healthcare Disclaimer located at http://openmrs.org/license.
+
+    Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
+    graphic logo is a trademark of OpenMRS Inc.
+
+-->
+<dataset>
+    <person person_id="3" gender="" birthdate="1975-06-30" birthdate_estimated="false" dead="false" date_created="2005-01-01 00:00:00.0" voided="false" uuid="6adb7c42-cfd2-4301-b53b-ff17c5654ffa"/>
+    <users user_id="3" person_id="3" system_id="1-8" username="test" password="4a1750c8607d0fa237de36c6305715c223415189" salt="c788c6ad82a157b712392ca695dfcf2eed193d7f" secret_question="" creator="1" date_created="2005-01-01 00:00:00.0" changed_by="1" date_changed="2007-09-20 21:54:12.0" retired="false" retire_reason="" uuid="1010d442-e134-11de-babe-001e378eb67f"/>
+    <user_role user_id="1" role="Authenticated"/>
+</dataset>

api/src/main/java/org/openmrs/module/reporting/config/ReportLoader.java

@@ -91,7 +91,7 @@ public static void saveReportDefinition(ReportDefinition reportDefinition) {
     public static void saveReportDesigns(ReportDefinition reportDefinition, List<ReportDesign> reportDesigns) {
         // purging a ReportDesign doesn't trigger any extra logic, so we can just purge-and-recreate here
         List<ReportDesign> existingDesigns = Context.getService(ReportService.class).getReportDesigns(reportDefinition, null, true);
-        if (existingDesigns.size() > 0) {
+        if (!existingDesigns.isEmpty()) {
             log.debug("Deleting " + existingDesigns.size() + " old designs for " + reportDefinition.getName());
             for (ReportDesign design : existingDesigns) {
                 Context.getService(ReportService.class).purgeReportDesign(design);

api/src/main/java/org/openmrs/module/reporting/serializer/ReportingSerializer.java

@@ -21,6 +21,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.reporting.evaluation.parameter.Mapped;
+import org.openmrs.module.reporting.evaluation.parameter.Parameter;
 import org.openmrs.module.serialization.xstream.XStreamShortSerializer;
 import org.openmrs.module.serialization.xstream.mapper.CGLibMapper;
 import org.openmrs.module.serialization.xstream.mapper.HibernateCollectionMapper;
@@ -90,7 +91,7 @@ public Object unmarshal(HierarchicalStreamReader reader, Object root) {
 
 		xstream.registerConverter(new ReportDefinitionConverter(mapper, converterLookup));
 
-		xstream.allowTypes(new Class[] { Mapped.class });
+		xstream.allowTypes(new Class[] { Mapped.class, Parameter.class });
 	}
 
 	@Override