dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #26354
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 13062: Implement unit tests on CaseAggregationCondition service methods
------------------------------------------------------------
revno: 13062
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-11-29 16:24:58 +0700
message:
Implement unit tests on CaseAggregationCondition service methods
added:
dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/
dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionServiceTest.java
dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStoreTest.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationCondition.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValue.java
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java
dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java
dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/patientreport/PatientTabularReportStoreTest.java
dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patientdatavalue/PatientDataValueServiceTest.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-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationCondition.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationCondition.java 2013-09-16 17:07:25 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/caseaggregation/CaseAggregationCondition.java 2013-11-29 09:24:58 +0000
@@ -43,34 +43,55 @@
private static final long serialVersionUID = -5746649805915250424L;
public static final String SEPARATOR_ID = "\\.";
+
public static final String SEPARATOR_OBJECT = ":";
public static final String AGGRERATION_COUNT = "COUNT";
+
public static final String AGGRERATION_SUM = "times";
+
public static final String AGGRERATION_SUM_VALUE = "sum";
+
public static final String AGGRERATION_AVG_VALUE = "avg";
+
public static final String AGGRERATION_AVG_MIN = "min";
+
public static final String AGGRERATION_AVG_MAX = "max";
public static final String OPERATOR_AND = "AND";
+
public static final String OPERATOR_OR = "OR";
public static String OBJECT_PROGRAM_STAGE_DATAELEMENT = "DE";
+
public static String OBJECT_PATIENT_ATTRIBUTE = "CA";
+
public static String OBJECT_PATIENT_PROPERTY = "CP";
+
public static String OBJECT_PROGRAM_PROPERTY = "PP";
+
public static String OBJECT_PROGRAM = "PG";
+
public static String OBJECT_PATIENT = "PT";
+
public static String OBJECT_PROGRAM_STAGE = "PS";
+
public static String OBJECT_PROGRAM_STAGE_PROPERTY = "PSP";
+
public static String OBJECT_PATIENT_PROGRAM_STAGE_PROPERTY = "PC";
+
public static String OBJECT_ORGUNIT_COMPLETE_PROGRAM_STAGE = "PSIC";
+
public static String OBJECT_PROGRAM_PROPERTY_INCIDENT_DATE = "dateOfIncident";
+
public static String OBJECT_PROGRAM_PROPERTY_ENROLLEMENT_DATE = "enrollmentDate";
+
public static String OBJECT_PROGRAM_PROPERTY_REPORT_DATE_DATE = "executionDate";
public static String MINUS_OPERATOR = "DATEDIFF";
+
public static String MINUS_DATAELEMENT_OPERATOR = "DEDATEDIFF";
+
public static String AUTO_STORED_BY = "DHIS-SYSTEM";
public static final String regExp = "\\[(" + OBJECT_ORGUNIT_COMPLETE_PROGRAM_STAGE + "|" + OBJECT_PATIENT + "|"
@@ -154,19 +175,19 @@
{
return true;
}
-
+
if ( object == null )
{
return false;
}
-
+
if ( !getClass().isAssignableFrom( object.getClass() ) )
{
return false;
}
-
+
final CaseAggregationCondition other = (CaseAggregationCondition) object;
-
+
if ( aggregationExpression == null )
{
if ( other.aggregationExpression != null )
@@ -178,7 +199,7 @@
{
return false;
}
-
+
if ( operator == null )
{
if ( other.operator != null )
@@ -190,7 +211,7 @@
{
return false;
}
-
+
return true;
}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValue.java 2013-11-12 04:21:08 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/patientdatavalue/PatientDataValue.java 2013-11-29 09:24:58 +0000
@@ -80,7 +80,6 @@
public PatientDataValue( ProgramStageInstance programStageInstance, DataElement dataElement, String value )
{
- super();
this.dataElement = dataElement;
this.programStageInstance = programStageInstance;
this.value = value;
=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java 2013-11-28 07:29:37 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationConditionService.java 2013-11-29 09:24:58 +0000
@@ -400,28 +400,6 @@
ConcurrentUtils.waitForCompletion( futures );
}
- @Async
- private Future<?> aggregateValueManager( ConcurrentLinkedQueue<CaseAggregateSchedule> caseAggregateSchedule,
- String taskStrategy )
- {
- taskLoop: while ( true )
- {
- CaseAggregateSchedule dataSet = caseAggregateSchedule.poll();
-
- if ( dataSet == null )
- {
- break taskLoop;
- }
-
- Collection<Period> periods = aggregationConditionStore.getPeriods( dataSet.getPeriodTypeName(),
- taskStrategy );
-
- aggregationConditionStore.runAggregate( null, dataSet, periods );
- }
-
- return null;
- }
-
public Grid getAggregateValue( CaseAggregationCondition caseAggregationCondition, Collection<Integer> orgunitIds,
Period period, I18nFormat format, I18n i18n )
{
@@ -435,10 +413,6 @@
return aggregationConditionStore.getAggregateValueDetails( aggregationCondition, orgunit, period, format, i18n );
}
- /**
- * Insert data elements into database directly
- *
- */
public void insertAggregateValue( CaseAggregationCondition caseAggregationCondition,
Collection<Integer> orgunitIds, Period period )
{
@@ -461,8 +435,8 @@
Integer aggregateDeId, String aggregateDeName, Integer optionComboId, String optionComboName, Integer deSumId,
Collection<Integer> orgunitIds, Period period )
{
- return aggregationConditionStore.parseExpressionToSql( isInsert, caseExpression, operator, aggregateDeId, aggregateDeName, optionComboId,
- optionComboName, deSumId, orgunitIds, period );
+ return aggregationConditionStore.parseExpressionToSql( isInsert, caseExpression, operator, aggregateDeId,
+ aggregateDeName, optionComboId, optionComboName, deSumId, orgunitIds, period );
}
@Override
@@ -475,6 +449,28 @@
// Support Methods
// -------------------------------------------------------------------------
+ @Async
+ private Future<?> aggregateValueManager( ConcurrentLinkedQueue<CaseAggregateSchedule> caseAggregateSchedule,
+ String taskStrategy )
+ {
+ taskLoop: while ( true )
+ {
+ CaseAggregateSchedule dataSet = caseAggregateSchedule.poll();
+
+ if ( dataSet == null )
+ {
+ break taskLoop;
+ }
+
+ Collection<Period> periods = aggregationConditionStore.getPeriods( dataSet.getPeriodTypeName(),
+ taskStrategy );
+
+ aggregationConditionStore.runAggregate( null, dataSet, periods );
+ }
+
+ return null;
+ }
+
private int getProcessNo()
{
return Math.max( (SystemUtils.getCpuCores() - 1), 1 );
=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java 2013-11-28 06:19:32 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java 2013-11-29 09:24:58 +0000
@@ -222,18 +222,15 @@
{
// Delete all data value from this period which created from DHIS-system
// after to run Aggregate Query Builder
-
String periodtypeSql = "select periodtypeid from periodtype where name='" + period.getPeriodType().getName()
+ "'";
int periodTypeId = jdbcTemplate.queryForObject( periodtypeSql, Integer.class );
-
String periodSql = "select periodid from period where periodtypeid=" + periodTypeId + " and startdate='"
+ DateUtils.getMediumDateString( period.getStartDate() ) + "' and enddate='"
+ DateUtils.getMediumDateString( period.getEndDate() ) + "'";
-
SqlRowSet rs = jdbcTemplate.queryForRowSet( periodSql );
-
int periodid = 0;
+
if ( rs.next() )
{
periodid = rs.getInt( "periodid" );
@@ -263,7 +260,6 @@
String sql = parseExpressionToSql( true, expression, operator, dataElementId, "dataelementname", optionComboId,
"optionComboname", deSumId, orgunitIds, period );
-
jdbcTemplate.execute( sql );
}
@@ -278,7 +274,7 @@
if ( isInsert )
{
- sql = "INSERT INTO datavalue (dataelementid, categoryoptioncomboid, sourceid, periodid, comment, value)"
+ sql = "INSERT INTO datavalue (dataelementid, categoryoptioncomboid, sourceid, periodid, comment, value) "
+ sql;
}
else
=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/META-INF/dhis/beans.xml 2013-11-28 06:19:32 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/main/resources/META-INF/dhis/beans.xml 2013-11-29 09:24:58 +0000
@@ -11,6 +11,9 @@
<property name="clazz"
value="org.hisp.dhis.caseaggregation.CaseAggregationCondition" />
<property name="sessionFactory" ref="sessionFactory" />
+ <property name="jdbcTemplate" ref="jdbcTemplate" />
+ <property name="statementBuilder" ref="statementBuilder" />
+ <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
</bean>
<bean id="org.hisp.dhis.patientreport.PatientAggregateReportStore"
=== added directory 'dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation'
=== added file 'dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionServiceTest.java'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionServiceTest.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionServiceTest.java 2013-11-29 09:24:58 +0000
@@ -0,0 +1,448 @@
+/*
+ * 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.
+ */
+
+package org.hisp.dhis.caseaggregation;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.hisp.dhis.DhisSpringTest;
+import org.hisp.dhis.concept.ConceptService;
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementCategory;
+import org.hisp.dhis.dataelement.DataElementCategoryCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryOption;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryService;
+import org.hisp.dhis.dataelement.DataElementService;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
+import org.hisp.dhis.patient.Patient;
+import org.hisp.dhis.patient.PatientAttribute;
+import org.hisp.dhis.patient.PatientAttributeService;
+import org.hisp.dhis.patient.PatientService;
+import org.hisp.dhis.patientattributevalue.PatientAttributeValue;
+import org.hisp.dhis.patientdatavalue.PatientDataValue;
+import org.hisp.dhis.patientdatavalue.PatientDataValueService;
+import org.hisp.dhis.period.DailyPeriodType;
+import org.hisp.dhis.period.Period;
+import org.hisp.dhis.period.PeriodService;
+import org.hisp.dhis.period.PeriodType;
+import org.hisp.dhis.program.Program;
+import org.hisp.dhis.program.ProgramInstance;
+import org.hisp.dhis.program.ProgramInstanceService;
+import org.hisp.dhis.program.ProgramService;
+import org.hisp.dhis.program.ProgramStage;
+import org.hisp.dhis.program.ProgramStageInstance;
+import org.hisp.dhis.program.ProgramStageInstanceService;
+import org.hisp.dhis.program.ProgramStageService;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @author Chau Thu Tran
+ *
+ * @version $ CaseAggregationConditionServiceTest.java Nov 29, 2013 10:01:48 AM
+ * $
+ */
+public class CaseAggregationConditionServiceTest
+ extends DhisSpringTest
+{
+ @Autowired
+ private CaseAggregationConditionService aggConditionServiceService;
+
+ @Autowired
+ private OrganisationUnitService organisationUnitService;
+
+ @Autowired
+ private ProgramService programService;
+
+ @Autowired
+ private ProgramStageService programStageService;
+
+ @Autowired
+ private PatientService patientService;
+
+ @Autowired
+ private DataElementService dataElementService;
+
+ @Autowired
+ private DataElementCategoryService categoryService;
+
+ @Autowired
+ private ConceptService conceptService;
+
+ @Autowired
+ private DataElementCategoryService dataElementCategoryService;
+
+ @Autowired
+ private ProgramInstanceService programInstanceService;
+
+ @Autowired
+ private ProgramStageInstanceService programStageInstanceService;
+
+ @Autowired
+ private PatientDataValueService patientDataValueService;
+
+ @Autowired
+ private PatientAttributeService patientAttributeService;
+
+ @Autowired
+ private PeriodService periodService;
+
+ private PatientAttribute patientAttribute;
+
+ private DataElement dataElementA;
+
+ private DataElement dataElementB;
+
+ private DataElement dataElementC;
+
+ private DataElement dataElementD;
+
+ private DataElementCategoryOptionCombo categoryOptionCombo;
+
+ private Program program;
+
+ private CaseAggregationCondition conditionA;
+
+ private CaseAggregationCondition conditionB;
+
+ private OrganisationUnit organisationUnit;
+
+ private Period period;
+
+ private int stageBId;
+
+ @Override
+ public void setUpTest()
+ {
+ organisationUnit = createOrganisationUnit( 'A' );
+ organisationUnitService.addOrganisationUnit( organisationUnit );
+
+ // ---------------------------------------------------------------------
+ // Data elements && Category
+ // ---------------------------------------------------------------------
+
+ DataElementCategoryOption categoryOptionA = new DataElementCategoryOption( "Male" );
+ DataElementCategoryOption categoryOptionB = new DataElementCategoryOption( "Female" );
+ DataElementCategoryOption categoryOptionC = new DataElementCategoryOption( "0-20" );
+ DataElementCategoryOption categoryOptionD = new DataElementCategoryOption( "20-100" );
+
+ categoryService.addDataElementCategoryOption( categoryOptionA );
+ categoryService.addDataElementCategoryOption( categoryOptionB );
+ categoryService.addDataElementCategoryOption( categoryOptionC );
+ categoryService.addDataElementCategoryOption( categoryOptionD );
+
+ DataElementCategory categoryA = new DataElementCategory( "Gender" );
+ DataElementCategory categoryB = new DataElementCategory( "Agegroup" );
+
+ categoryA.getCategoryOptions().add( categoryOptionA );
+ categoryA.getCategoryOptions().add( categoryOptionB );
+ categoryB.getCategoryOptions().add( categoryOptionC );
+ categoryB.getCategoryOptions().add( categoryOptionD );
+
+ categoryService.addDataElementCategory( categoryA );
+ categoryService.addDataElementCategory( categoryB );
+
+ DataElementCategoryCombo categoryComboA = new DataElementCategoryCombo( "GenderAgegroup" );
+
+ categoryComboA.getCategories().add( categoryA );
+ categoryComboA.getCategories().add( categoryB );
+
+ categoryService.addDataElementCategoryCombo( categoryComboA );
+
+ categoryOptionCombo = new DataElementCategoryOptionCombo();
+ Set<DataElementCategoryOption> categoryOptions = new HashSet<DataElementCategoryOption>();
+ categoryOptions.add( categoryOptionA );
+ categoryOptions.add( categoryOptionB );
+ categoryOptionCombo.setCategoryCombo( categoryComboA );
+ categoryOptionCombo.setCategoryOptions( categoryOptions );
+ categoryService.addDataElementCategoryOptionCombo( categoryOptionCombo );
+
+ dataElementA = createDataElement( 'A' );
+ dataElementA.setType( DataElement.VALUE_TYPE_STRING );
+ dataElementA.setDomainType( DataElement.DOMAIN_TYPE_PATIENT );
+
+ dataElementB = createDataElement( 'B' );
+ dataElementB.setType( DataElement.VALUE_TYPE_STRING );
+ dataElementB.setDomainType( DataElement.DOMAIN_TYPE_PATIENT );
+
+ dataElementC = createDataElement( 'C' );
+ dataElementC.setDomainType( DataElement.DOMAIN_TYPE_AGGREGATE );
+
+ dataElementD = createDataElement( 'D' );
+ dataElementD.setDomainType( DataElement.DOMAIN_TYPE_AGGREGATE );
+
+ int deAId = dataElementService.addDataElement( dataElementA );
+ int deBId = dataElementService.addDataElement( dataElementB );
+ dataElementService.addDataElement( dataElementC );
+ dataElementService.addDataElement( dataElementD );
+
+ // ---------------------------------------------------------------------
+ // Patient
+ // ---------------------------------------------------------------------
+
+ Patient patient = createPatient( 'A', organisationUnit );
+ patientService.savePatient( patient );
+
+ // ---------------------------------------------------------------------
+ // Attribue value
+ // ---------------------------------------------------------------------
+
+ patientAttribute = createPatientAttribute( 'A' );
+ int attributeId = patientAttributeService.savePatientAttribute( patientAttribute );
+
+ PatientAttributeValue attributeValue = createPatientAttributeValue( 'A', patient, patientAttribute );
+ Set<PatientAttributeValue> patientAttributeValues = new HashSet<PatientAttributeValue>();
+ patientAttributeValues.add( attributeValue );
+
+ // ---------------------------------------------------------------------
+ // Program && Program stages
+ // ---------------------------------------------------------------------
+
+ program = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ int programId = programService.addProgram( program );
+
+ ProgramStage stageA = new ProgramStage( "Stage-A", program );
+ int stageAId = programStageService.saveProgramStage( stageA );
+
+ ProgramStage stageB = new ProgramStage( "Stage-B", program );
+ stageBId = programStageService.saveProgramStage( stageB );
+
+ Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ programStages.add( stageA );
+ programStages.add( stageB );
+ program.setProgramStages( programStages );
+ programService.updateProgram( program );
+
+ // ---------------------------------------------------------------------
+ // Program Instance && Patient data values
+ // ---------------------------------------------------------------------
+
+ Calendar today = Calendar.getInstance();
+ PeriodType.clearTimeOfDay( today );
+ ProgramInstance programInstance = programInstanceService.enrollPatient( patient, program, today.getTime(),
+ today.getTime(), organisationUnit, null );
+
+ ProgramStageInstance stageInstanceA = programStageInstanceService.getProgramStageInstance( programInstance,
+ stageA );
+ ProgramStageInstance stageInstanceB = programStageInstanceService.getProgramStageInstance( programInstance,
+ stageB );
+
+ PatientDataValue dataValueA = new PatientDataValue( stageInstanceA, dataElementA, "A" );
+ PatientDataValue dataValueB = new PatientDataValue( stageInstanceA, dataElementB, "B" );
+ PatientDataValue dataValueC = new PatientDataValue( stageInstanceB, dataElementA, "C" );
+ PatientDataValue dataValueD = new PatientDataValue( stageInstanceB, dataElementB, "D" );
+
+ patientDataValueService.savePatientDataValue( dataValueA );
+ patientDataValueService.savePatientDataValue( dataValueB );
+ patientDataValueService.savePatientDataValue( dataValueC );
+ patientDataValueService.savePatientDataValue( dataValueD );
+
+ // ---------------------------------------------------------------------
+ // Period
+ // ---------------------------------------------------------------------
+
+ PeriodType periodType = periodService.getPeriodTypeByName( DailyPeriodType.NAME );
+ period = new Period();
+ period.setPeriodType( periodType );
+ period.setStartDate( today.getTime() );
+ period.setEndDate( today.getTime() );
+ periodService.addPeriod( period );
+
+ // ---------------------------------------------------------------------
+ // CaseAggregationCondition
+ // ---------------------------------------------------------------------
+
+ String expression = "[" + CaseAggregationCondition.OBJECT_PROGRAM_STAGE_DATAELEMENT
+ + CaseAggregationCondition.SEPARATOR_OBJECT + programId + "." + stageAId + "." + deAId + "] is not null";
+ expression += " AND [" + CaseAggregationCondition.OBJECT_PROGRAM_STAGE_DATAELEMENT
+ + CaseAggregationCondition.SEPARATOR_OBJECT + programId + "." + stageAId + "." + deBId + "] is not null";
+ expression += " AND [" + CaseAggregationCondition.OBJECT_PATIENT_ATTRIBUTE
+ + CaseAggregationCondition.SEPARATOR_OBJECT + attributeId + "] is not null";
+ conditionA = new CaseAggregationCondition( "A", CaseAggregationCondition.AGGRERATION_COUNT, expression,
+ dataElementC, categoryOptionCombo );
+
+ expression = "[" + CaseAggregationCondition.OBJECT_PROGRAM_STAGE_DATAELEMENT
+ + CaseAggregationCondition.SEPARATOR_OBJECT + programId + "." + stageBId + "." + deAId + "] is not null";
+ conditionB = new CaseAggregationCondition( "B", CaseAggregationCondition.AGGRERATION_COUNT, expression,
+ dataElementD, categoryOptionCombo );
+ }
+
+ @Test
+ public void testAddCaseAggregationCondition()
+ {
+ int idA = aggConditionServiceService.addCaseAggregationCondition( conditionA );
+ int idB = aggConditionServiceService.addCaseAggregationCondition( conditionB );
+
+ assertNotNull( aggConditionServiceService.getCaseAggregationCondition( idA ) );
+ assertNotNull( aggConditionServiceService.getCaseAggregationCondition( idB ) );
+ }
+
+ @Test
+ public void testUpdateCaseAggregationCondition()
+ {
+ int idA = aggConditionServiceService.addCaseAggregationCondition( conditionA );
+
+ assertNotNull( aggConditionServiceService.getCaseAggregationCondition( idA ) );
+
+ conditionA.setName( "B" );
+ aggConditionServiceService.updateCaseAggregationCondition( conditionA );
+
+ assertEquals( "B", aggConditionServiceService.getCaseAggregationCondition( idA ).getName() );
+ }
+
+ @Test
+ public void testDeleteCaseAggregationCondition()
+ {
+ int idA = aggConditionServiceService.addCaseAggregationCondition( conditionA );
+ int idB = aggConditionServiceService.addCaseAggregationCondition( conditionB );
+
+ assertNotNull( aggConditionServiceService.getCaseAggregationCondition( idA ) );
+ assertNotNull( aggConditionServiceService.getCaseAggregationCondition( idB ) );
+
+ aggConditionServiceService.deleteCaseAggregationCondition( conditionA );
+
+ assertNull( aggConditionServiceService.getCaseAggregationCondition( idA ) );
+ assertNotNull( aggConditionServiceService.getCaseAggregationCondition( idB ) );
+
+ aggConditionServiceService.deleteCaseAggregationCondition( conditionB );
+
+ assertNull( aggConditionServiceService.getCaseAggregationCondition( idA ) );
+ assertNull( aggConditionServiceService.getCaseAggregationCondition( idB ) );
+ }
+
+ @Test
+ public void testGetCaseAggregationConditionById()
+ {
+ int idA = aggConditionServiceService.addCaseAggregationCondition( conditionA );
+ int idB = aggConditionServiceService.addCaseAggregationCondition( conditionB );
+
+ assertEquals( conditionA, aggConditionServiceService.getCaseAggregationCondition( idA ) );
+ assertEquals( conditionB, aggConditionServiceService.getCaseAggregationCondition( idB ) );
+ }
+
+ @Test
+ public void testGetCaseAggregationConditionByName()
+ {
+ int idA = aggConditionServiceService.addCaseAggregationCondition( conditionA );
+
+ assertNotNull( aggConditionServiceService.getCaseAggregationCondition( idA ) );
+ assertEquals( conditionA, aggConditionServiceService.getCaseAggregationCondition( "A" ) );
+ }
+
+ @Test
+ public void testGetAllCaseAggregationCondition()
+ {
+ aggConditionServiceService.addCaseAggregationCondition( conditionA );
+ aggConditionServiceService.addCaseAggregationCondition( conditionB );
+
+ assertTrue( equals( aggConditionServiceService.getAllCaseAggregationCondition(), conditionA, conditionB ) );
+ }
+
+ @Test
+ public void testGetCaseAggregationConditionByDe()
+ {
+ aggConditionServiceService.addCaseAggregationCondition( conditionA );
+ aggConditionServiceService.addCaseAggregationCondition( conditionB );
+
+ assertTrue( equals( aggConditionServiceService.getCaseAggregationCondition( dataElementC ), conditionA ) );
+ assertTrue( equals( aggConditionServiceService.getCaseAggregationCondition( dataElementD ), conditionB ) );
+ }
+
+ @Test
+ public void testGetCaseAggregationConditionByDeOptionCombo()
+ {
+ aggConditionServiceService.addCaseAggregationCondition( conditionA );
+ aggConditionServiceService.addCaseAggregationCondition( conditionB );
+
+ CaseAggregationCondition condition = aggConditionServiceService.getCaseAggregationCondition( dataElementC,
+ categoryOptionCombo );
+ assertEquals( conditionA, condition );
+
+ condition = aggConditionServiceService.getCaseAggregationCondition( dataElementD, categoryOptionCombo );
+ assertEquals( conditionB, condition );
+ }
+
+ @Test
+ public void testGetCaseAggregationCondition()
+ {
+ aggConditionServiceService.addCaseAggregationCondition( conditionA );
+ aggConditionServiceService.addCaseAggregationCondition( conditionB );
+
+ Collection<DataElement> dataElements = new HashSet<DataElement>();
+ dataElements.add( dataElementC );
+ dataElements.add( dataElementD );
+
+ assertTrue( equals( aggConditionServiceService.getCaseAggregationCondition( dataElements ), conditionA,
+ conditionB ) );
+ }
+
+ @Test
+ public void testGetDataElementsInCondition()
+ {
+ aggConditionServiceService.addCaseAggregationCondition( conditionA );
+ aggConditionServiceService.addCaseAggregationCondition( conditionB );
+
+ Collection<DataElement> dataElements = aggConditionServiceService.getDataElementsInCondition( conditionA
+ .getAggregationExpression() );
+ assertTrue( equals( dataElements, dataElementA, dataElementB ) );
+ }
+
+ @Test
+ public void testGetProgramsInCondition()
+ {
+ Collection<Program> programs = aggConditionServiceService.getProgramsInCondition( conditionA
+ .getAggregationExpression() );
+ assertTrue( equals( programs, program ) );
+ }
+
+ @Test
+ public void testGetPatientAttributesInCondition()
+ {
+ Collection<PatientAttribute> patientAttributes = aggConditionServiceService
+ .getPatientAttributesInCondition( conditionA.getAggregationExpression() );
+ assertTrue( equals( patientAttributes, patientAttribute ) );
+ }
+
+ @Test
+ public void testGetConditionDescription()
+ {
+ String actual = aggConditionServiceService.getConditionDescription( conditionB.getAggregationExpression() );
+ String expected = "[ProgramA.Stage-B.DataElementA] is not null";
+ assertEquals( expected, actual );
+ }
+
+}
=== added file 'dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStoreTest.java'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStoreTest.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/caseaggregation/CaseAggregationConditionStoreTest.java 2013-11-29 09:24:58 +0000
@@ -0,0 +1,337 @@
+/*
+ * 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.
+ */
+
+package org.hisp.dhis.caseaggregation;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.hisp.dhis.DhisSpringTest;
+import org.hisp.dhis.concept.ConceptService;
+import org.hisp.dhis.dataelement.DataElement;
+import org.hisp.dhis.dataelement.DataElementCategory;
+import org.hisp.dhis.dataelement.DataElementCategoryCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryOption;
+import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
+import org.hisp.dhis.dataelement.DataElementCategoryService;
+import org.hisp.dhis.dataelement.DataElementService;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
+import org.hisp.dhis.patient.Patient;
+import org.hisp.dhis.patient.PatientAttribute;
+import org.hisp.dhis.patient.PatientAttributeService;
+import org.hisp.dhis.patient.PatientService;
+import org.hisp.dhis.patientattributevalue.PatientAttributeValue;
+import org.hisp.dhis.patientdatavalue.PatientDataValue;
+import org.hisp.dhis.patientdatavalue.PatientDataValueService;
+import org.hisp.dhis.period.DailyPeriodType;
+import org.hisp.dhis.period.Period;
+import org.hisp.dhis.period.PeriodService;
+import org.hisp.dhis.period.PeriodType;
+import org.hisp.dhis.program.Program;
+import org.hisp.dhis.program.ProgramInstance;
+import org.hisp.dhis.program.ProgramInstanceService;
+import org.hisp.dhis.program.ProgramService;
+import org.hisp.dhis.program.ProgramStage;
+import org.hisp.dhis.program.ProgramStageInstance;
+import org.hisp.dhis.program.ProgramStageInstanceService;
+import org.hisp.dhis.program.ProgramStageService;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @author Chau Thu Tran
+ *
+ * @version $ CaseAggregationConditionStoreTest.java Nov 29, 2013 10:01:48 AM $
+ */
+public class CaseAggregationConditionStoreTest
+ extends DhisSpringTest
+{
+ @Autowired
+ private CaseAggregationConditionStore aggConditionServiceStore;
+
+ @Autowired
+ private OrganisationUnitService organisationUnitService;
+
+ @Autowired
+ private ProgramService programService;
+
+ @Autowired
+ private ProgramStageService programStageService;
+
+ @Autowired
+ private PatientService patientService;
+
+ @Autowired
+ private DataElementService dataElementService;
+
+ @Autowired
+ private DataElementCategoryService categoryService;
+
+ @Autowired
+ private ConceptService conceptService;
+
+ @Autowired
+ private DataElementCategoryService dataElementCategoryService;
+
+ @Autowired
+ private ProgramInstanceService programInstanceService;
+
+ @Autowired
+ private ProgramStageInstanceService programStageInstanceService;
+
+ @Autowired
+ private PatientDataValueService patientDataValueService;
+
+ @Autowired
+ private PatientAttributeService patientAttributeService;
+
+ @Autowired
+ private PeriodService periodService;
+
+ private PatientAttribute patientAttribute;
+
+ private DataElement dataElementA;
+
+ private DataElement dataElementB;
+
+ private DataElement dataElementC;
+
+ private DataElement dataElementD;
+
+ private DataElementCategoryOptionCombo categoryOptionCombo;
+
+ private Program program;
+
+ private CaseAggregationCondition conditionA;
+
+ private CaseAggregationCondition conditionB;
+
+ private OrganisationUnit organisationUnit;
+
+ private Period period;
+
+ private int stageBId;
+
+ @Override
+ public void setUpTest()
+ {
+ organisationUnit = createOrganisationUnit( 'A' );
+ organisationUnitService.addOrganisationUnit( organisationUnit );
+
+ // ---------------------------------------------------------------------
+ // Data elements && Category
+ // ---------------------------------------------------------------------
+
+ DataElementCategoryOption categoryOptionA = new DataElementCategoryOption( "Male" );
+ DataElementCategoryOption categoryOptionB = new DataElementCategoryOption( "Female" );
+ DataElementCategoryOption categoryOptionC = new DataElementCategoryOption( "0-20" );
+ DataElementCategoryOption categoryOptionD = new DataElementCategoryOption( "20-100" );
+
+ categoryService.addDataElementCategoryOption( categoryOptionA );
+ categoryService.addDataElementCategoryOption( categoryOptionB );
+ categoryService.addDataElementCategoryOption( categoryOptionC );
+ categoryService.addDataElementCategoryOption( categoryOptionD );
+
+ DataElementCategory categoryA = new DataElementCategory( "Gender" );
+ DataElementCategory categoryB = new DataElementCategory( "Agegroup" );
+
+ categoryA.getCategoryOptions().add( categoryOptionA );
+ categoryA.getCategoryOptions().add( categoryOptionB );
+ categoryB.getCategoryOptions().add( categoryOptionC );
+ categoryB.getCategoryOptions().add( categoryOptionD );
+
+ categoryService.addDataElementCategory( categoryA );
+ categoryService.addDataElementCategory( categoryB );
+
+ DataElementCategoryCombo categoryComboA = new DataElementCategoryCombo( "GenderAgegroup" );
+
+ categoryComboA.getCategories().add( categoryA );
+ categoryComboA.getCategories().add( categoryB );
+
+ categoryService.addDataElementCategoryCombo( categoryComboA );
+
+ categoryOptionCombo = new DataElementCategoryOptionCombo();
+ Set<DataElementCategoryOption> categoryOptions = new HashSet<DataElementCategoryOption>();
+ categoryOptions.add( categoryOptionA );
+ categoryOptions.add( categoryOptionB );
+ categoryOptionCombo.setCategoryCombo( categoryComboA );
+ categoryOptionCombo.setCategoryOptions( categoryOptions );
+ categoryService.addDataElementCategoryOptionCombo( categoryOptionCombo );
+
+ dataElementA = createDataElement( 'A' );
+ dataElementA.setType( DataElement.VALUE_TYPE_STRING );
+ dataElementA.setDomainType( DataElement.DOMAIN_TYPE_PATIENT );
+
+ dataElementB = createDataElement( 'B' );
+ dataElementB.setType( DataElement.VALUE_TYPE_STRING );
+ dataElementB.setDomainType( DataElement.DOMAIN_TYPE_PATIENT );
+
+ dataElementC = createDataElement( 'C' );
+ dataElementC.setDomainType( DataElement.DOMAIN_TYPE_AGGREGATE );
+
+ dataElementD = createDataElement( 'D' );
+ dataElementD.setDomainType( DataElement.DOMAIN_TYPE_AGGREGATE );
+
+ int deAId = dataElementService.addDataElement( dataElementA );
+ int deBId = dataElementService.addDataElement( dataElementB );
+ dataElementService.addDataElement( dataElementC );
+ dataElementService.addDataElement( dataElementD );
+
+ // ---------------------------------------------------------------------
+ // Patient
+ // ---------------------------------------------------------------------
+
+ Patient patient = createPatient( 'A', organisationUnit );
+ patientService.savePatient( patient );
+
+ // ---------------------------------------------------------------------
+ // Attribue value
+ // ---------------------------------------------------------------------
+
+ patientAttribute = createPatientAttribute( 'A' );
+ int attributeId = patientAttributeService.savePatientAttribute( patientAttribute );
+
+ PatientAttributeValue attributeValue = createPatientAttributeValue( 'A', patient, patientAttribute );
+ Set<PatientAttributeValue> patientAttributeValues = new HashSet<PatientAttributeValue>();
+ patientAttributeValues.add( attributeValue );
+
+ // ---------------------------------------------------------------------
+ // Program && Program stages
+ // ---------------------------------------------------------------------
+
+ program = createProgram( 'A', new HashSet<ProgramStage>(), organisationUnit );
+ int programId = programService.addProgram( program );
+
+ ProgramStage stageA = new ProgramStage( "Stage-A", program );
+ int stageAId = programStageService.saveProgramStage( stageA );
+
+ ProgramStage stageB = new ProgramStage( "Stage-B", program );
+ stageBId = programStageService.saveProgramStage( stageB );
+
+ Set<ProgramStage> programStages = new HashSet<ProgramStage>();
+ programStages.add( stageA );
+ programStages.add( stageB );
+ program.setProgramStages( programStages );
+ programService.updateProgram( program );
+
+ // ---------------------------------------------------------------------
+ // Program Instance && Patient data values
+ // ---------------------------------------------------------------------
+
+ Calendar today = Calendar.getInstance();
+ PeriodType.clearTimeOfDay( today );
+ ProgramInstance programInstance = programInstanceService.enrollPatient( patient, program, today.getTime(),
+ today.getTime(), organisationUnit, null );
+
+ ProgramStageInstance stageInstanceA = programStageInstanceService.getProgramStageInstance( programInstance,
+ stageA );
+ ProgramStageInstance stageInstanceB = programStageInstanceService.getProgramStageInstance( programInstance,
+ stageB );
+
+ PatientDataValue dataValueA = new PatientDataValue( stageInstanceA, dataElementA, "A" );
+ PatientDataValue dataValueB = new PatientDataValue( stageInstanceA, dataElementB, "B" );
+ PatientDataValue dataValueC = new PatientDataValue( stageInstanceB, dataElementA, "C" );
+ PatientDataValue dataValueD = new PatientDataValue( stageInstanceB, dataElementB, "D" );
+
+ patientDataValueService.savePatientDataValue( dataValueA );
+ patientDataValueService.savePatientDataValue( dataValueB );
+ patientDataValueService.savePatientDataValue( dataValueC );
+ patientDataValueService.savePatientDataValue( dataValueD );
+
+ // ---------------------------------------------------------------------
+ // Period
+ // ---------------------------------------------------------------------
+
+ PeriodType periodType = periodService.getPeriodTypeByName( DailyPeriodType.NAME );
+ period = new Period();
+ period.setPeriodType( periodType );
+ period.setStartDate( today.getTime() );
+ period.setEndDate( today.getTime() );
+ periodService.addPeriod( period );
+
+ // ---------------------------------------------------------------------
+ // CaseAggregationCondition
+ // ---------------------------------------------------------------------
+
+ String expression = "[" + CaseAggregationCondition.OBJECT_PROGRAM_STAGE_DATAELEMENT
+ + CaseAggregationCondition.SEPARATOR_OBJECT + programId + "." + stageAId + "." + deAId + "] is not null";
+ expression += " AND [" + CaseAggregationCondition.OBJECT_PROGRAM_STAGE_DATAELEMENT
+ + CaseAggregationCondition.SEPARATOR_OBJECT + programId + "." + stageAId + "." + deBId + "] is not null";
+ expression += " AND [" + CaseAggregationCondition.OBJECT_PATIENT_ATTRIBUTE
+ + CaseAggregationCondition.SEPARATOR_OBJECT + attributeId + "] is not null";
+ conditionA = new CaseAggregationCondition( "A", CaseAggregationCondition.AGGRERATION_COUNT, expression,
+ dataElementC, categoryOptionCombo );
+
+ expression = "[" + CaseAggregationCondition.OBJECT_PROGRAM_STAGE_DATAELEMENT
+ + CaseAggregationCondition.SEPARATOR_OBJECT + programId + "." + stageBId + "." + deAId + "] is not null";
+ conditionB = new CaseAggregationCondition( "B", CaseAggregationCondition.AGGRERATION_COUNT, expression,
+ dataElementD, categoryOptionCombo );
+ }
+
+ @Test
+ public void testGetCaseAggregationConditionByDe()
+ {
+ aggConditionServiceStore.save( conditionA );
+ aggConditionServiceStore.save( conditionB );
+
+ assertTrue( equals( aggConditionServiceStore.get( dataElementC ), conditionA ) );
+ assertTrue( equals( aggConditionServiceStore.get( dataElementD ), conditionB ) );
+ }
+
+ @Test
+ public void testGetCaseAggregationConditionByDeOptionCombo()
+ {
+ aggConditionServiceStore.save( conditionA );
+ aggConditionServiceStore.save( conditionB );
+
+ CaseAggregationCondition condition = aggConditionServiceStore.get( dataElementC, categoryOptionCombo );
+ assertEquals( conditionA, condition );
+
+ condition = aggConditionServiceStore.get( dataElementD, categoryOptionCombo );
+ assertEquals( conditionB, condition );
+ }
+
+ @Test
+ public void testGetCaseAggregationCondition()
+ {
+ aggConditionServiceStore.save( conditionA );
+ aggConditionServiceStore.save( conditionB );
+
+ Collection<DataElement> dataElements = new HashSet<DataElement>();
+ dataElements.add( dataElementC );
+ dataElements.add( dataElementD );
+
+ assertTrue( equals( aggConditionServiceStore.get( dataElements ), conditionA, conditionB ) );
+ }
+
+}
=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/patientreport/PatientTabularReportStoreTest.java'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/patientreport/PatientTabularReportStoreTest.java 2013-11-28 09:42:33 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/test/java/org/hisp/dhis/patientreport/PatientTabularReportStoreTest.java 2013-11-29 09:24:58 +0000
@@ -28,8 +28,6 @@
package org.hisp.dhis.patientreport;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patientdatavalue/PatientDataValueServiceTest.java'
--- dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patientdatavalue/PatientDataValueServiceTest.java 2013-11-13 04:19:10 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/test/java/org/hisp/dhis/patientdatavalue/PatientDataValueServiceTest.java 2013-11-29 09:24:58 +0000
@@ -157,6 +157,9 @@
stageInstanceA = programStageInstanceService.getProgramStageInstance( programInstance, stageA );
stageInstanceB = programStageInstanceService.getProgramStageInstance( programInstance, stageB );
+ System.out.println( "\n\n\n ===== \n 1 stageInstanceA : " + stageInstanceA );
+ System.out.println( "\n 2 stageInstanceB : " + stageInstanceB );
+
dataValueA = new PatientDataValue( stageInstanceA, dataElementA, "A" );
dataValueB = new PatientDataValue( stageInstanceA, dataElementB, "B" );
dataValueC = new PatientDataValue( stageInstanceB, dataElementA, "C" );
