dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 12212
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-09-23 14:38:38 +0200
message:
  started testing of multi stage programs
added:
  dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java
modified:
  dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.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-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java	2013-09-23 12:07:14 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java	2013-09-23 12:38:38 +0000
@@ -164,7 +164,7 @@
 
         if ( programStage == null && !program.isSingleEvent() )
         {
-            return new ImportSummary( ImportStatus.ERROR, "Event.programStage does not point to a valid programStage, and program is multi-event" );
+            return new ImportSummary( ImportStatus.ERROR, "Event.programStage does not point to a valid programStage, and program is multi stage" );
         }
         else
         {

=== added file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/events/RegistrationMultiEventsServiceTest.java	2013-09-23 12:38:38 +0000
@@ -0,0 +1,233 @@
+package org.hisp.dhis.dxf2.events;
+
+/*
+ * Copyright (c) 2004-2013, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import org.hamcrest.CoreMatchers;
+import org.hisp.dhis.DhisTest;
+import org.hisp.dhis.common.IdentifiableObjectManager;
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dxf2.events.enrollment.Enrollment;
+import org.hisp.dhis.dxf2.events.enrollment.EnrollmentService;
+import org.hisp.dhis.dxf2.events.event.DataValue;
+import org.hisp.dhis.dxf2.events.event.Event;
+import org.hisp.dhis.dxf2.events.event.EventService;
+import org.hisp.dhis.dxf2.events.person.Person;
+import org.hisp.dhis.dxf2.events.person.PersonService;
+import org.hisp.dhis.dxf2.importsummary.ImportStatus;
+import org.hisp.dhis.dxf2.importsummary.ImportSummary;
+import org.hisp.dhis.i18n.I18nFormat;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.patient.Patient;
+import org.hisp.dhis.program.Program;
+import org.hisp.dhis.program.ProgramInstanceService;
+import org.hisp.dhis.program.ProgramStage;
+import org.hisp.dhis.program.ProgramStageDataElement;
+import org.hisp.dhis.program.ProgramStageDataElementService;
+import org.hisp.dhis.program.ProgramStageInstanceService;
+import org.hisp.dhis.user.UserService;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Date;
+import java.util.HashSet;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+/**
+ * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
+ */
+public class RegistrationMultiEventsServiceTest
+    extends DhisTest
+{
+    @Autowired
+    private EventService eventService;
+
+    @Autowired
+    private PersonService personService;
+
+    @Autowired
+    private ProgramStageDataElementService programStageDataElementService;
+
+    @Autowired
+    private EnrollmentService enrollmentService;
+
+    @Autowired
+    private ProgramInstanceService programInstanceService;
+
+    @Autowired
+    private ProgramStageInstanceService programStageInstanceService;
+
+    @Autowired
+    private IdentifiableObjectManager manager;
+
+    @Autowired
+    private UserService userService;
+
+    private Patient maleA;
+    private Patient maleB;
+    private Patient femaleA;
+    private Patient femaleB;
+
+    private Person personMaleA;
+    private Person personMaleB;
+    private Person personFemaleA;
+    private Person personFemaleB;
+
+    private OrganisationUnit organisationUnitA;
+    private OrganisationUnit organisationUnitB;
+    private Program programA;
+    private DataElement dataElementA;
+    private DataElement dataElementB;
+    private ProgramStage programStageA;
+    private ProgramStage programStageB;
+
+    @Override
+    protected void setUpTest() throws Exception
+    {
+        organisationUnitA = createOrganisationUnit( 'A' );
+        organisationUnitB = createOrganisationUnit( 'B' );
+        manager.save( organisationUnitA );
+        manager.save( organisationUnitB );
+
+        maleA = createPatient( 'A', Patient.MALE, organisationUnitA );
+        maleB = createPatient( 'B', Patient.MALE, organisationUnitB );
+        femaleA = createPatient( 'C', Patient.FEMALE, organisationUnitA );
+        femaleB = createPatient( 'D', Patient.FEMALE, organisationUnitB );
+
+        manager.save( maleA );
+        manager.save( maleB );
+        manager.save( femaleA );
+        manager.save( femaleB );
+
+        personMaleA = personService.getPerson( maleA );
+        personMaleB = personService.getPerson( maleB );
+        personFemaleA = personService.getPerson( femaleA );
+        personFemaleB = personService.getPerson( femaleB );
+
+        dataElementA = createDataElement( 'A' );
+        dataElementB = createDataElement( 'B' );
+        dataElementA.setType( DataElement.VALUE_TYPE_INT );
+        dataElementB.setType( DataElement.VALUE_TYPE_INT );
+
+        manager.save( dataElementA );
+        manager.save( dataElementB );
+
+        programStageA = createProgramStage( 'A', 0 );
+        programStageB = createProgramStage( 'B', 0 );
+        programStageB.setIrregular( true );
+        programStageB.setAutoGenerateEvent( true );
+
+        manager.save( programStageA );
+        manager.save( programStageB );
+
+        programA = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnitA );
+        programA.setType( Program.MULTIPLE_EVENTS_WITH_REGISTRATION );
+        manager.save( programA );
+
+        ProgramStageDataElement programStageDataElement = new ProgramStageDataElement();
+        programStageDataElement.setDataElement( dataElementA );
+        programStageDataElement.setProgramStage( programStageA );
+        programStageDataElementService.addProgramStageDataElement( programStageDataElement );
+
+        programStageA.getProgramStageDataElements().add( programStageDataElement );
+        programStageA.setProgram( programA );
+
+        programStageDataElement = new ProgramStageDataElement();
+        programStageDataElement.setDataElement( dataElementB );
+        programStageDataElement.setProgramStage( programStageB );
+        programStageDataElementService.addProgramStageDataElement( programStageDataElement );
+
+        programStageB.getProgramStageDataElements().add( programStageDataElement );
+        programStageB.setProgram( programA );
+
+        programA.getProgramStages().add( programStageA );
+        programA.getProgramStages().add( programStageB );
+
+        manager.update( programStageA );
+        manager.update( programStageB );
+        manager.update( programA );
+
+        createSuperuserAndInjectSecurityContext( 'A' );
+
+        // mocked format
+        I18nFormat mockFormat = mock( I18nFormat.class );
+        when( mockFormat.parseDate( anyString() ) ).thenReturn( new Date() );
+        eventService.setFormat( mockFormat );
+    }
+
+    @Override
+    public boolean emptyDatabaseAfterTest()
+    {
+        return true;
+    }
+
+    @Test
+    public void testSaveWithoutProgramStageShouldFail()
+    {
+        Event event = createEvent( programA.getUid(), null, organisationUnitA.getUid(), personMaleA.getPerson() );
+        ImportSummary importSummary = eventService.saveEvent( event );
+        assertEquals( ImportStatus.ERROR, importSummary.getStatus() );
+        assertThat( importSummary.getDescription(), CoreMatchers.containsString( "Event.programStage does not point to a valid programStage" ) );
+    }
+
+    @Test
+    public void testSaveWithoutEnrollmentShouldFail()
+    {
+        Event event = createEvent( programA.getUid(), programStageA.getUid(), organisationUnitA.getUid(), personMaleA.getPerson() );
+        ImportSummary importSummary = eventService.saveEvent( event );
+        assertEquals( ImportStatus.ERROR, importSummary.getStatus() );
+        assertThat( importSummary.getDescription(), CoreMatchers.containsString( "is not enrolled in program" ) );
+    }
+
+    private Enrollment createEnrollment( String program, String person )
+    {
+        Enrollment enrollment = new Enrollment();
+        enrollment.setProgram( program );
+        enrollment.setPerson( person );
+
+        return enrollment;
+    }
+
+    private Event createEvent( String program, String programStage, String orgUnit, String person )
+    {
+        Event event = new Event();
+        event.setProgram( program );
+        event.setProgramStage( programStage );
+        event.setOrgUnit( orgUnit );
+        event.setPerson( person );
+
+        event.getDataValues().add( new DataValue( dataElementA.getUid(), "10" ) );
+
+        return event;
+    }
+}