dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15065
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-04-28 15:56:59 +0200
message:
  Test fix
modified:
  dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceTest.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-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceTest.java	2014-04-20 00:18:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalServiceTest.java	2014-04-28 13:56:59 +0000
@@ -265,12 +265,12 @@
         organisationUnitE.setLevel( 3 );
         organisationUnitF.setLevel( 4 );
 
-        organisationUnitService.addOrganisationUnit( organisationUnitA );
-        organisationUnitService.addOrganisationUnit( organisationUnitB );
-        organisationUnitService.addOrganisationUnit( organisationUnitC );
-        organisationUnitService.addOrganisationUnit( organisationUnitD );
-        organisationUnitService.addOrganisationUnit( organisationUnitE );
-        organisationUnitService.addOrganisationUnit( organisationUnitF );
+        organisationUnitService.addOrganisationUnit( organisationUnitA, false );
+        organisationUnitService.addOrganisationUnit( organisationUnitB, false );
+        organisationUnitService.addOrganisationUnit( organisationUnitC, false );
+        organisationUnitService.addOrganisationUnit( organisationUnitD, false );
+        organisationUnitService.addOrganisationUnit( organisationUnitE, false );
+        organisationUnitService.addOrganisationUnit( organisationUnitF, false );
 
         level1 = new DataApprovalLevel( "level1", 1, null );
         level2 = new DataApprovalLevel( "level2", 2, null );
@@ -385,10 +385,10 @@
     @Test
     public void testAddAndGetDataApproval() throws Exception
     {
-        dataApprovalLevelService.addDataApprovalLevel( level1 );
-        dataApprovalLevelService.addDataApprovalLevel( level2 );
-        dataApprovalLevelService.addDataApprovalLevel( level3 );
-        dataApprovalLevelService.addDataApprovalLevel( level4 );
+        dataApprovalLevelService.addDataApprovalLevel( level1, 1 );
+        dataApprovalLevelService.addDataApprovalLevel( level2, 2 );
+        dataApprovalLevelService.addDataApprovalLevel( level3, 3 );
+        dataApprovalLevelService.addDataApprovalLevel( level4, 4 );
 
         Set<OrganisationUnit> units = new HashSet<OrganisationUnit>();
         units.add( organisationUnitA );