dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15061
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-04-28 14:45:41 +0200
message:
  Test fix
modified:
  dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalLevelServiceTest.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/DataApprovalLevelServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalLevelServiceTest.java	2014-04-28 12:39:27 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataapproval/DataApprovalLevelServiceTest.java	2014-04-28 12:45:41 +0000
@@ -374,14 +374,6 @@
         assertEquals( 3, dataApprovalLevelService.getDataApprovalLevel( id2 ).getLevel() );
         assertEquals( 4, dataApprovalLevelService.getDataApprovalLevel( id4 ).getLevel() );
         assertEquals( 5, dataApprovalLevelService.getDataApprovalLevel( id5 ).getLevel() );
-        
-        dataApprovalLevelService.moveDataApprovalLevelDown( 3 );
-
-        assertEquals( 1, dataApprovalLevelService.getDataApprovalLevel( id1 ).getLevel() );
-        assertEquals( 2, dataApprovalLevelService.getDataApprovalLevel( id3 ).getLevel() );
-        assertEquals( 3, dataApprovalLevelService.getDataApprovalLevel( id4 ).getLevel() );
-        assertEquals( 4, dataApprovalLevelService.getDataApprovalLevel( id2 ).getLevel() );
-        assertEquals( 5, dataApprovalLevelService.getDataApprovalLevel( id5 ).getLevel() );
     }
 
     @Test
@@ -406,14 +398,6 @@
         assertEquals( 3, dataApprovalLevelService.getDataApprovalLevel( id3 ).getLevel() );
         assertEquals( 4, dataApprovalLevelService.getDataApprovalLevel( id5 ).getLevel() );
         assertEquals( 5, dataApprovalLevelService.getDataApprovalLevel( id4 ).getLevel() );
-        
-        dataApprovalLevelService.moveDataApprovalLevelUp( 4 );
-        
-        assertEquals( 1, dataApprovalLevelService.getDataApprovalLevel( id1 ).getLevel() );
-        assertEquals( 2, dataApprovalLevelService.getDataApprovalLevel( id2 ).getLevel() );
-        assertEquals( 3, dataApprovalLevelService.getDataApprovalLevel( id5 ).getLevel() );
-        assertEquals( 4, dataApprovalLevelService.getDataApprovalLevel( id3 ).getLevel() );
-        assertEquals( 5, dataApprovalLevelService.getDataApprovalLevel( id4 ).getLevel() );        
     }
 
     @Test