dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2852
committer: Jo Størset <storset@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2011-02-15 14:33:06 +0530
message:
  Fixed failing tests
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/datavalueset/DataValueSetMapperTest.java
  dhis-2/dhis-services/dhis-service-importexport/src/test/resources/datavalueset/base.xml
  dhis-2/dhis-services/dhis-service-importexport/src/test/resources/datavalueset/dataValueSet.xml
  dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/rpc/RPCResource.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/datavalueset/DataValueSetMapperTest.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/datavalueset/DataValueSetMapperTest.java	2011-02-15 06:46:27 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/datavalueset/DataValueSetMapperTest.java	2011-02-15 09:03:06 +0000
@@ -54,8 +54,6 @@
 import org.hisp.dhis.importexport.ImportParams;
 import org.hisp.dhis.importexport.ImportService;
 import org.hisp.dhis.importexport.ImportStrategy;
-import org.hisp.dhis.importexport.datavalueset.DataValueSet;
-import org.hisp.dhis.importexport.datavalueset.DataValueSetMapper;
 import org.hisp.dhis.importexport.util.ImportExportUtils;
 import org.junit.Test;
 
@@ -140,7 +138,7 @@
 
         DataValueSet dxfDataValueSet = (DataValueSet) u.unmarshal( is );
         is.close();
-
+        
         assertEquals( dataValueSet.getDataSetUuid(), dxfDataValueSet.getDataSetUuid() );
         assertEquals( dataValueSet.getPeriodIsoDate(), dxfDataValueSet.getPeriodIsoDate() );
         assertEquals( dataValueSet.getOrganisationUnitUuid(), dxfDataValueSet.getOrganisationUnitUuid() );
@@ -216,7 +214,6 @@
         
         } catch (IllegalArgumentException e) {
             // Expected
-            System.out.println(e.getMessage());
         }
         
     }

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/datavalueset/base.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/datavalueset/base.xml	2011-02-15 06:46:27 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/datavalueset/base.xml	2011-02-15 09:03:06 +0000
@@ -103,6 +103,10 @@
   </dataSets>
 
   <dataSetMembers>
+    <dataSetMember>
+      <dataSet>20</dataSet>
+      <dataElement>21</dataElement>
+    </dataSetMember>
   </dataSetMembers>
 
   <organisationUnits>

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/datavalueset/dataValueSet.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/datavalueset/dataValueSet.xml	2011-02-15 06:46:27 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/datavalueset/dataValueSet.xml	2011-02-15 09:03:06 +0000
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 
-<dataValueSet xmlns="http://dhis2.org/schema/dxf/2.0.SNAPSHOT";
+<dataValueSet xmlns="http://dhis2.org/schema/dataValueSet/0.1";
   dataSet="16B2299E-ECD6-46CF-A61F-817D350C180D" period="2011W5"
   orgUnit="9C1B1B5E-3D65-48F2-8D1D-D36C60DD7344" storedBy="misterindia">
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/rpc/RPCResource.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/rpc/RPCResource.java	2011-02-15 06:53:26 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/web/api/rpc/RPCResource.java	2011-02-15 09:03:06 +0000
@@ -12,8 +12,6 @@
 import javax.ws.rs.Produces;
 import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
 import javax.ws.rs.core.UriInfo;
 
 import org.hisp.dhis.dataelement.DataElement;