dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1315
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-01-19 15:24:53 +0100
message:
  Updated test dxf import files to reflect the change in the orgunit groupset model, which fixed a test error in import-export module.
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java
  dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf/DXFImportServiceTest.java
  dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.zip
  dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfB.zip
  dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfC.zip
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties


--
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-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java	2010-01-15 11:32:18 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroup.java	2010-01-19 14:24:53 +0000
@@ -27,6 +27,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -41,7 +42,7 @@
  */
 
 public class OrganisationUnitGroup
-    implements DimensionOption
+    implements DimensionOption, Serializable
 {
     private int id;
     

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf/DXFImportServiceTest.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf/DXFImportServiceTest.java	2009-10-18 22:44:41 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf/DXFImportServiceTest.java	2010-01-19 14:24:53 +0000
@@ -391,11 +391,6 @@
         
         assertEquals( organisationUnitGroupService.getAllOrganisationUnitGroupSets().size(), expectedSize );
         
-        for ( OrganisationUnitGroupSet groupSet : organisationUnitGroupService.getAllOrganisationUnitGroupSets() )
-        {
-            assertEquals( groupSet.getOrganisationUnitGroups().size(), expectedSize );
-        }
-        
         assertEquals( validationRuleService.getAllValidationRules().size(), expectedSize );
     }
 
@@ -436,7 +431,5 @@
         assertEquals( importObjectService.getImportObjects( GroupMemberType.DATASET ).size(), expectedSize * expectedSize );
         
         assertEquals( importObjectService.getImportObjects( GroupMemberType.ORGANISATIONUNITGROUP ).size(), expectedSize * expectedSize );
-        
-        assertEquals( importObjectService.getImportObjects( GroupMemberType.ORGANISATIONUNITGROUPSET ).size(), expectedSize * expectedSize );
     }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.zip'
Binary files dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.zip	2009-03-03 16:46:36 +0000 and dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.zip	2010-01-19 14:24:53 +0000 differ
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfB.zip'
Binary files dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfB.zip	2009-03-03 16:46:36 +0000 and dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfB.zip	2010-01-19 14:24:53 +0000 differ
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfC.zip'
Binary files dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfC.zip	2009-03-03 16:46:36 +0000 and dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfC.zip	2010-01-19 14:24:53 +0000 differ
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-01-19 13:50:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/org/hisp/dhis/dataadmin/i18n_module.properties	2010-01-19 14:24:53 +0000
@@ -10,7 +10,7 @@
 save																= Save
 cancel                                                              = Cancel
 done                    											= Done
-noaction                        									= Please Sellect Only Assigned or Locked Organisation Unit.
+noaction                        									= Please Select Only Assigned or Locked Organisation Unit.
 loading																= Loading, please wait...
 data_administration													= Data Administration
 period_type															= Period Type