dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #01408
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 418: Added test for MappingService
------------------------------------------------------------
revno: 418
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Mon 2009-07-06 23:46:06 +0200
message:
Added test for MappingService
added:
dhis-2/dhis-services/dhis-service-mapping/src/test/java/org/hisp/dhis/mapping/MappingServiceTest.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java
dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java 2009-04-28 14:23:39 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/mapping/Map.java 2009-07-06 21:46:06 +0000
@@ -110,7 +110,7 @@
return false;
}
- Map other = (Map) object;
+ final Map other = (Map) object;
return mapLayerPath.equals( other.mapLayerPath );
}
=== modified file 'dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java'
--- dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java 2009-07-06 17:45:57 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/DefaultMappingService.java 2009-07-06 21:46:06 +0000
@@ -488,4 +488,4 @@
{
return mappingStore.getAllMapViews();
}
-}
\ No newline at end of file
+}
=== added file 'dhis-2/dhis-services/dhis-service-mapping/src/test/java/org/hisp/dhis/mapping/MappingServiceTest.java'
--- dhis-2/dhis-services/dhis-service-mapping/src/test/java/org/hisp/dhis/mapping/MappingServiceTest.java 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/test/java/org/hisp/dhis/mapping/MappingServiceTest.java 2009-07-06 21:46:06 +0000
@@ -0,0 +1,209 @@
+package org.hisp.dhis.mapping;
+
+/*
+ * Copyright (c) 2004-2007, 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 static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
+
+import org.hisp.dhis.DhisSpringTest;
+import org.hisp.dhis.indicator.Indicator;
+import org.hisp.dhis.indicator.IndicatorGroup;
+import org.hisp.dhis.indicator.IndicatorService;
+import org.hisp.dhis.indicator.IndicatorType;
+import org.hisp.dhis.organisationunit.OrganisationUnit;
+import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
+import org.hisp.dhis.organisationunit.OrganisationUnitService;
+import org.hisp.dhis.period.MonthlyPeriodType;
+import org.hisp.dhis.period.Period;
+import org.hisp.dhis.period.PeriodService;
+import org.hisp.dhis.period.PeriodType;
+import org.junit.Test;
+
+/**
+ * @author Lars Helge Overland
+ * @version $Id$
+ */
+public class MappingServiceTest
+ extends DhisSpringTest
+{
+ private MappingService mappingService;
+
+ private OrganisationUnit organisationUnit;
+
+ private OrganisationUnitLevel organisationUnitLevel;
+
+ private IndicatorGroup indicatorGroup;
+ private IndicatorType indicatorType;
+ private Indicator indicator;
+
+ private PeriodType periodType;
+ private Period period;
+
+ private Map mapA;
+ private Map mapB;
+
+ private MapOrganisationUnitRelation mapOrganisationUnitRelationA;
+ private MapOrganisationUnitRelation mapOrganisationUnitRelationB;
+
+ // -------------------------------------------------------------------------
+ // Fixture
+ // -------------------------------------------------------------------------
+
+ @Override
+ public void setUpTest()
+ {
+ mappingService = (MappingService) getBean( MappingService.ID );
+
+ organisationUnitService = (OrganisationUnitService) getBean( OrganisationUnitService.ID );
+
+ indicatorService = (IndicatorService) getBean( IndicatorService.ID );
+
+ periodService = (PeriodService) getBean( PeriodService.ID );
+
+ organisationUnit = createOrganisationUnit( 'A' );
+ organisationUnitLevel = new OrganisationUnitLevel( 1, "Level" );
+
+ organisationUnitService.addOrganisationUnit( organisationUnit );
+ organisationUnitService.addOrganisationUnitLevel( organisationUnitLevel );
+
+ mapA = createMap( 'A', organisationUnit, organisationUnitLevel );
+ mapB = createMap( 'B', organisationUnit, organisationUnitLevel );
+
+ mapOrganisationUnitRelationA = new MapOrganisationUnitRelation( mapA, organisationUnit, "Feature" );
+ mapOrganisationUnitRelationB = new MapOrganisationUnitRelation( mapB, organisationUnit, "Feature" );
+
+ indicatorGroup = createIndicatorGroup( 'A' );
+ indicatorService.addIndicatorGroup( indicatorGroup );
+
+ indicatorType = createIndicatorType( 'A' );
+ indicatorService.addIndicatorType( indicatorType );
+
+ indicator = createIndicator( 'A', indicatorType );
+ indicatorService.addIndicator( indicator );
+
+ periodType = periodService.getPeriodTypeByName( MonthlyPeriodType.NAME );
+ period = createPeriod( periodType, getDate( 2000, 1, 1 ), getDate( 2000, 2, 1 ) );
+ periodService.addPeriod( period );
+ }
+
+ // -------------------------------------------------------------------------
+ // Map tests
+ // -------------------------------------------------------------------------
+
+ @Test
+ public void testAddGetMap()
+ {
+ int idA = mappingService.addMap( mapA );
+ int idB = mappingService.addMap( mapB );
+
+ assertEquals( mapA, mappingService.getMap( idA ) );
+ assertEquals( mapB, mappingService.getMap( idB ) );
+ }
+
+ @Test
+ public void testDeleteMap()
+ {
+ int idA = mappingService.addMap( mapA );
+ int idB = mappingService.addMap( mapB );
+
+ assertNotNull( mappingService.getMap( idA ) );
+ assertNotNull( mappingService.getMap( idB ) );
+
+ mappingService.deleteMap( mapA );
+
+ assertNull( mappingService.getMap( idA ) );
+ assertNotNull( mappingService.getMap( idB ) );
+
+ mappingService.deleteMap( mapB );
+
+ assertNull( mappingService.getMap( idA ) );
+ assertNull( mappingService.getMap( idB ) );
+ }
+
+ // -------------------------------------------------------------------------
+ // MapOrganisationUnitRelation tests
+ // -------------------------------------------------------------------------
+
+ @Test
+ public void addGetMapOrganisationUnitRelation()
+ {
+ mappingService.addMap( mapA );
+ mappingService.addMap( mapB );
+
+ int idA = mappingService.addMapOrganisationUnitRelation( mapOrganisationUnitRelationA );
+ int idB = mappingService.addMapOrganisationUnitRelation( mapOrganisationUnitRelationB );
+
+ assertEquals( mappingService.getMapOrganisationUnitRelation( idA ), mapOrganisationUnitRelationA );
+ assertEquals( mappingService.getMapOrganisationUnitRelation( idB ), mapOrganisationUnitRelationB );
+ }
+
+ @Test
+ public void deleteMapOrganisationUnitRelation()
+ {
+ mappingService.addMap( mapA );
+ mappingService.addMap( mapB );
+
+ int idA = mappingService.addMapOrganisationUnitRelation( mapOrganisationUnitRelationA );
+ int idB = mappingService.addMapOrganisationUnitRelation( mapOrganisationUnitRelationB );
+
+ assertNotNull( mappingService.getMapOrganisationUnitRelation( idA ) );
+ assertNotNull( mappingService.getMapOrganisationUnitRelation( idB ) );
+
+ mappingService.deleteMapOrganisationUnitRelation( mapOrganisationUnitRelationA );
+
+ assertNull( mappingService.getMapOrganisationUnitRelation( idA ) );
+ assertNotNull( mappingService.getMapOrganisationUnitRelation( idB ) );
+
+ mappingService.deleteMapOrganisationUnitRelation( mapOrganisationUnitRelationB );
+
+ assertNull( mappingService.getMapOrganisationUnitRelation( idA ) );
+ assertNull( mappingService.getMapOrganisationUnitRelation( idB ) );
+ }
+
+ // -------------------------------------------------------------------------
+ // MapView tests
+ // -------------------------------------------------------------------------
+
+ @Test
+ public void testAddGetMapView()
+ {
+ mappingService.addMap( mapA );
+
+ MapView mapView = new MapView( "MapViewA", indicatorGroup, indicator, periodType, period, mapA, 1, 1, "A", "B" );
+
+ int idA = mappingService.addMapView( mapView );
+
+ assertEquals( mapView, mappingService.getMapView( idA ) );
+ assertEquals( indicatorGroup, mappingService.getMapView( idA ).getIndicatorGroup() );
+ assertEquals( indicator, mappingService.getMapView( idA ).getIndicator() );
+ assertEquals( periodType, mappingService.getMapView( idA ).getPeriodType() );
+ assertEquals( period, mappingService.getMapView( idA ).getPeriod() );
+ assertEquals( mapA, mappingService.getMapView( idA ).getMap() );
+ }
+}
--
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.
