dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18359
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-02-20 13:06:02 +0100
message:
  Data value set, more tests
added:
  dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/datavalueset/dataValueSetG.xml
modified:
  dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.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-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java	2015-02-19 22:45:27 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java	2015-02-20 12:06:02 +0000
@@ -253,8 +253,12 @@
         
         ImportSummary summary = dataValueSetService.saveDataValueSet( in );
 
+        assertEquals( 0, summary.getConflicts().size() );
+        assertEquals( 12, summary.getDataValueCount().getImported() );
+        assertEquals( 0, summary.getDataValueCount().getUpdated() );
+        assertEquals( 0, summary.getDataValueCount().getDeleted() );
+        assertEquals( 0, summary.getDataValueCount().getIgnored() );
         assertEquals( ImportStatus.SUCCESS, summary.getStatus() );
-        assertEquals( 0, summary.getConflicts().size() );
         
         assertImportDataValues( summary );
     }
@@ -268,8 +272,12 @@
         ImportOptions options = new ImportOptions( CODE, CODE, CODE, false, true, NEW_AND_UPDATES, false );
         ImportSummary summary = dataValueSetService.saveDataValueSet( in, options );
 
+        assertEquals( 0, summary.getConflicts().size() );
+        assertEquals( 12, summary.getDataValueCount().getImported() );
+        assertEquals( 0, summary.getDataValueCount().getUpdated() );
+        assertEquals( 0, summary.getDataValueCount().getDeleted() );
+        assertEquals( 0, summary.getDataValueCount().getIgnored() );
         assertEquals( ImportStatus.SUCCESS, summary.getStatus() );
-        assertEquals( 0, summary.getConflicts().size() );
         
         assertImportDataValues( summary );
     }
@@ -282,6 +290,11 @@
         
         ImportSummary summary = dataValueSetService.saveDataValueSetCsv( in, null, null );
 
+        assertEquals( 1, summary.getConflicts().size() ); // Header row
+        assertEquals( 12, summary.getDataValueCount().getImported() );
+        assertEquals( 0, summary.getDataValueCount().getUpdated() );
+        assertEquals( 0, summary.getDataValueCount().getDeleted() );
+        assertEquals( 1, summary.getDataValueCount().getIgnored() ); // Header row
         assertEquals( ImportStatus.SUCCESS, summary.getStatus() );
         
         assertImportDataValues( summary );
@@ -316,8 +329,13 @@
         
         ImportSummary summary = dataValueSetService.saveDataValueSet( in, options );
 
+        System.out.println("upd " + summary);
+        assertEquals( 0, summary.getConflicts().size() );
+        assertEquals( 0, summary.getDataValueCount().getImported() );
+        assertEquals( 0, summary.getDataValueCount().getUpdated() );
+        assertEquals( 0, summary.getDataValueCount().getDeleted() );
+        assertEquals( 12, summary.getDataValueCount().getIgnored() );
         assertEquals( ImportStatus.SUCCESS, summary.getStatus() );
-        assertEquals( 0, summary.getConflicts().size() );
         
         Collection<DataValue> dataValues = mockDataValueBatchHandler.getInserts();
         
@@ -331,8 +349,12 @@
     {
         ImportSummary summary = dataValueSetService.saveDataValueSet( new ClassPathResource( "datavalueset/dataValueSetC.xml" ).getInputStream() );
 
+        assertEquals( 0, summary.getConflicts().size() );
+        assertEquals( 3, summary.getDataValueCount().getImported() );
+        assertEquals( 0, summary.getDataValueCount().getUpdated() );
+        assertEquals( 0, summary.getDataValueCount().getDeleted() );
+        assertEquals( 0, summary.getDataValueCount().getIgnored() );
         assertEquals( ImportStatus.SUCCESS, summary.getStatus() );
-        assertEquals( 0, summary.getConflicts().size() );
         
         Collection<DataValue> dataValues = mockDataValueBatchHandler.getInserts();
         
@@ -368,11 +390,34 @@
         
         ImportSummary summary = dataValueSetService.saveDataValueSet( in );
 
-        Collection<DataValue> dataValues = mockDataValueBatchHandler.getInserts();
-        
-        assertNotNull( dataValues );
-        assertEquals( 0, dataValues.size() );
-        assertEquals( ImportStatus.ERROR, summary.getStatus() );     
+        assertEquals( 0, summary.getDataValueCount().getImported() );
+        assertEquals( ImportStatus.ERROR, summary.getStatus() );
+        
+        Collection<DataValue> dataValues = mockDataValueBatchHandler.getInserts();
+        
+        assertNotNull( dataValues );
+        assertEquals( 0, dataValues.size() );  
+    }
+
+    @Test
+    public void testImportDataValuesWithNonExistingDataElementOrgUnit()
+        throws Exception
+    {
+        in = new ClassPathResource( "datavalueset/dataValueSetG.xml" ).getInputStream();
+        
+        ImportSummary summary = dataValueSetService.saveDataValueSet( in );
+        
+        assertEquals( 3, summary.getConflicts().size() );
+        assertEquals( 1, summary.getDataValueCount().getImported() );
+        assertEquals( 0, summary.getDataValueCount().getUpdated() );
+        assertEquals( 0, summary.getDataValueCount().getDeleted() );
+        assertEquals( 3, summary.getDataValueCount().getIgnored() );
+        assertEquals( ImportStatus.SUCCESS, summary.getStatus() );
+
+        Collection<DataValue> dataValues = mockDataValueBatchHandler.getInserts();
+        
+        assertNotNull( dataValues );
+        assertEquals( 1, dataValues.size() ); 
     }
 
     // -------------------------------------------------------------------------

=== added file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/datavalueset/dataValueSetG.xml'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/datavalueset/dataValueSetG.xml	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/resources/datavalueset/dataValueSetG.xml	2015-02-20 12:06:02 +0000
@@ -0,0 +1,6 @@
+<dataValueSet xmlns="http://dhis2.org/schema/dxf/2.0"; dataSet="pBOMPrpg1QX">
+    <dataValue dataElement="nonEx1sting" period="201201" orgUnit="DiszpKrYNg8" value="10001" storedBy="john" timestamp="2012-01-01" comment="comment" followup="false"/>
+    <dataValue dataElement="nonEx1sting" period="201201" orgUnit="DiszpKrYNg8" value="10002" storedBy="john" timestamp="2012-01-02" comment="comment" followup="false"/>
+    <dataValue dataElement="f7n9E0hX8qk" period="201201" orgUnit="nonEx1sting" value="10004" storedBy="john" timestamp="2012-01-01" comment="comment" followup="false"/> 
+    <dataValue dataElement="eY5ehpbEsB7" period="201201" orgUnit="DiszpKrYNg8" value="10003" storedBy="john" timestamp="2012-01-03" comment="comment" followup="false"/>
+</dataValueSet>
\ No newline at end of file