dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 21116
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2015-11-18 17:52:19 +0100
message:
  Program service, cleanup
modified:
  dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramServiceTest.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/program/ProgramServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramServiceTest.java	2015-09-03 03:11:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/program/ProgramServiceTest.java	2015-11-18 16:52:19 +0000
@@ -39,8 +39,6 @@
 import org.hisp.dhis.DhisSpringTest;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
-import org.hisp.dhis.validation.ValidationCriteria;
-import org.hisp.dhis.validation.ValidationCriteriaService;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -56,9 +54,6 @@
     @Autowired
     private OrganisationUnitService organisationUnitService;
 
-    @Autowired
-    private ValidationCriteriaService validationCriteriaService;
-
     private OrganisationUnit organisationUnitA;
 
     private OrganisationUnit organisationUnitB;
@@ -174,27 +169,6 @@
     }
 
     @Test
-    public void testGetProgramsByCriteria()
-    {
-        programService.addProgram( programA );
-        programService.addProgram( programB );
-
-        ValidationCriteria validationCriteria = createValidationCriteria( 'A', "gender", 0, "F" );
-        validationCriteriaService.saveValidationCriteria( validationCriteria );
-
-        programA.getValidationCriteria().add( validationCriteria );
-        programService.updateProgram( programA );
-
-        programB.getValidationCriteria().add( validationCriteria );
-        programService.updateProgram( programB );
-
-        List<Program> programs = programService.getPrograms( validationCriteria );
-        assertEquals( 2, programs.size() );
-        assertTrue( programs.contains( programA ) );
-        assertTrue( programs.contains( programB ) );
-    }
-
-    @Test
     public void testGetProgramsByType()
     {
         programService.addProgram( programA );