=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.java' --- dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.java 2015-09-18 11:52:25 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.java 2015-09-21 07:38:54 +0000 @@ -36,6 +36,7 @@ import java.util.Set; import com.google.common.collect.Lists; + import org.hisp.dhis.DhisSpringTest; import org.hisp.dhis.analytics.AnalyticsService; import org.hisp.dhis.analytics.DataQueryParams; @@ -58,6 +59,7 @@ import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.period.MonthlyPeriodType; import org.hisp.dhis.period.PeriodType; +import org.hisp.dhis.period.RelativePeriodEnum; import org.hisp.dhis.trackedentity.TrackedEntityAttribute; import org.hisp.dhis.trackedentity.TrackedEntityAttributeService; import org.hisp.dhis.user.CurrentUserService; @@ -234,6 +236,20 @@ } @Test + public void testGetDimensionPeriod() + { + List itemUids = Lists.newArrayList( "199501", "1999", + RelativePeriodEnum.LAST_4_QUARTERS.toString(), RelativePeriodEnum.THIS_YEAR.toString() ); + + DimensionalObject actual = analyticsService.getDimension( DimensionalObject.PERIOD_DIM_ID, itemUids, null, null, null, false ); + + assertEquals( DimensionalObject.PERIOD_DIM_ID, actual.getDimension() ); + assertEquals( DimensionType.PERIOD, actual.getDimensionType() ); + assertEquals( DataQueryParams.DISPLAY_NAME_PERIOD, actual.getDisplayName() ); + assertEquals( 7, actual.getItems().size() ); + } + + @Test public void testGetDimensionOrgUnitGroupSet() { List items = Lists.newArrayList( ouGroupA, ouGroupB );