dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2171
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2010-11-25 17:25:59 +0700
message:
  Missing updated
modified:
  dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/databrowser/DataBrowserServiceTest.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-administration/src/test/java/org/hisp/dhis/databrowser/DataBrowserServiceTest.java'
--- dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/databrowser/DataBrowserServiceTest.java	2010-11-17 06:42:38 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/test/java/org/hisp/dhis/databrowser/DataBrowserServiceTest.java	2010-11-25 10:25:59 +0000
@@ -324,13 +324,13 @@
         assertEquals( "Period column header", "2005-05-01", table.getColumns().get( 1 ).getName() );
 
         // dataSetC has two dataElements - sorted by name
-        assertEquals( "Metarows", 2, table.getRows().size() );
+        assertEquals( "Metarows", 3, table.getRows().size() );
         assertEquals( dataElementC.getName(), table.getRows().get( 0 ).getName() );
         assertEquals( dataElementC.getId(), table.getRows().get( 0 ).getId().intValue() );
         assertEquals( dataElementE.getName(), table.getRows().get( 1 ).getName() );
         assertEquals( dataElementE.getId(), table.getRows().get( 1 ).getId().intValue() );
 
-        assertEquals( "Row count entries", 2, table.getCounts().size() );
+        assertEquals( "Row count entries", 3, table.getCounts().size() );
         assertEquals( "DataValues in dataElementC", 3, table.getRowBasedOnRowName( dataElementC.getName() ).get( 0 )
             .intValue() );
         assertEquals( "DataValues in dataElementE", 3, table.getRowBasedOnRowName( dataElementE.getName() ).get( 0 )
@@ -382,13 +382,13 @@
         assertEquals( "Period column header", "2005-05-01", table.getColumns().get( 1 ).getName() );
 
         // dataElementGroupC has two dataElements - sorted by name
-        assertEquals( "Metarows", 2, table.getRows().size() );
+        assertEquals( "Metarows", 3, table.getRows().size() );
         assertEquals( dataElementC.getName(), table.getRows().get( 0 ).getName() );
         assertEquals( dataElementC.getId(), table.getRows().get( 0 ).getId().intValue() );
         assertEquals( dataElementE.getName(), table.getRows().get( 1 ).getName() );
         assertEquals( dataElementE.getId(), table.getRows().get( 1 ).getId().intValue() );
 
-        assertEquals( "Row count entries", 2, table.getCounts().size() );
+        assertEquals( "Row count entries", 3, table.getCounts().size() );
         assertEquals( "DataValues in dataElementC", 3, table.getRowBasedOnRowName( dataElementC.getName() ).get( 0 )
             .intValue() );
         assertEquals( "DataValues in dataElementE", 3, table.getRowBasedOnRowName( dataElementE.getName() ).get( 0 )
@@ -492,7 +492,7 @@
         // two data values for B count
         // one data value for D count
 
-        assertEquals( "Metarows", 3, table.getRows().size() );
+        assertEquals( "Metarows", 4, table.getRows().size() );
 
         assertEquals( dataElementA.getName(), table.getRows().get( 0 ).getName() );
         assertEquals( dataElementA.getId(), table.getRows().get( 0 ).getId().intValue() );
@@ -501,7 +501,7 @@
         assertEquals( dataElementD.getName(), table.getRows().get( 2 ).getName() );
         assertEquals( dataElementD.getId(), table.getRows().get( 2 ).getId().intValue() );
 
-        assertEquals( "Row count entries", 3, table.getCounts().size() );
+        assertEquals( "Row count entries", 4, table.getCounts().size() );
 
         assertEquals( "DataValues in dataElementA for periodA", 1, table.getRowBasedOnRowName( dataElementA.getName() )
             .get( 0 ).intValue() );