dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #33493
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 17100: Removed DataDictionary tests
------------------------------------------------------------
revno: 17100
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-10-14 09:16:29 +0200
message:
Removed DataDictionary tests
removed:
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datadictionary/DataDictionaryServiceTest.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datadictionary/DataDictionaryStoreTest.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
=== removed file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datadictionary/DataDictionaryServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datadictionary/DataDictionaryServiceTest.java 2014-10-07 13:46:29 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datadictionary/DataDictionaryServiceTest.java 1970-01-01 00:00:00 +0000
@@ -1,187 +0,0 @@
-package org.hisp.dhis.datadictionary;
-
-/*
- * Copyright (c) 2004-2014, 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.hisp.dhis.DhisSpringTest;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.indicator.Indicator;
-import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.indicator.IndicatorType;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.Collection;
-import java.util.List;
-
-import static org.junit.Assert.*;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DataDictionaryServiceTest
- extends DhisSpringTest
-{
- @Autowired
- private DataDictionaryService dataDictionaryService;
-
- @Autowired
- private DataElementService dataElementService;
-
- @Autowired
- private IndicatorService indicatorService;
-
- private DataDictionary dataDictionaryA;
- private DataDictionary dataDictionaryB;
-
- private DataElement dataElementA;
- private DataElement dataElementB;
-
- private IndicatorType indicatorType;
-
- private Indicator indicatorA;
- private Indicator indicatorB;
-
- // -------------------------------------------------------------------------
- // Fixture
- // -------------------------------------------------------------------------
-
- @Override
- public void setUpTest()
- throws Exception
- {
- dataDictionaryA = createDataDictionary( 'A' );
- dataDictionaryB = createDataDictionary( 'B' );
-
- dataElementA = createDataElement( 'A' );
- dataElementB = createDataElement( 'B' );
-
- indicatorType = createIndicatorType( 'A' );
-
- indicatorService.addIndicatorType( indicatorType );
-
- indicatorA = createIndicator( 'A', indicatorType );
- indicatorB = createIndicator( 'B', indicatorType );
- }
-
- // -------------------------------------------------------------------------
- // DataDictionary tests
- // -------------------------------------------------------------------------
-
- @Test
- public void testSaveGetDataDictionary()
- {
- dataElementService.addDataElement( dataElementA );
- dataElementService.addDataElement( dataElementB );
-
- indicatorService.addIndicator( indicatorA );
- indicatorService.addIndicator( indicatorB );
-
- dataDictionaryA.getDataElements().add( dataElementA );
- dataDictionaryA.getDataElements().add( dataElementB );
-
- dataDictionaryA.getIndicators().add( indicatorA );
- dataDictionaryA.getIndicators().add( indicatorB );
-
- int id = dataDictionaryService.saveDataDictionary( dataDictionaryA );
-
- dataDictionaryA = dataDictionaryService.getDataDictionary( id );
-
- assertEquals( dataDictionaryA.getName(), "DataDictionaryA" );
- assertEquals( dataDictionaryA.getDescription(), "DescriptionA" );
- assertEquals( dataDictionaryA.getRegion(), "RegionA" );
- assertEquals( dataDictionaryA.getDataElements().size(), 2 );
-
- assertTrue( dataDictionaryA.getDataElements().contains( dataElementA ) );
- assertTrue( dataDictionaryA.getDataElements().contains( dataElementB ) );
-
- assertTrue( dataDictionaryA.getIndicators().contains( indicatorA ) );
- assertTrue( dataDictionaryA.getIndicators().contains( indicatorB ) );
-
- dataDictionaryA.setName( "DataDictionaryB" );
- dataDictionaryA.setDescription( "DescriptionB" );
- dataDictionaryA.setRegion( "RegionB" );
-
- dataDictionaryService.saveDataDictionary( dataDictionaryA );
-
- dataDictionaryA = dataDictionaryService.getDataDictionary( id );
-
- assertEquals( dataDictionaryA.getName(), "DataDictionaryB" );
- assertEquals( dataDictionaryA.getDescription(), "DescriptionB" );
- assertEquals( dataDictionaryA.getRegion(), "RegionB" );
- }
-
- @Test
- public void testGetDataDictionaryByName()
- {
- dataDictionaryService.saveDataDictionary( dataDictionaryA );
- dataDictionaryService.saveDataDictionary( dataDictionaryB );
-
- List<DataDictionary> dictionaryByName = dataDictionaryService.getDataDictionaryByName( "DataDictionaryA" );
-
- assertFalse( dictionaryByName.isEmpty() );
-
- assertEquals( dictionaryByName.get( 0 ).getName(), "DataDictionaryA" );
- assertEquals( dictionaryByName.get( 0 ).getDescription(), "DescriptionA" );
- }
-
- @Test
- public void testDeleteDataDictionary()
- {
- int idA = dataDictionaryService.saveDataDictionary( dataDictionaryA );
- int idB = dataDictionaryService.saveDataDictionary( dataDictionaryB );
-
- assertNotNull( dataDictionaryService.getDataDictionary( idA ) );
- assertNotNull( dataDictionaryService.getDataDictionary( idB ) );
-
- dataDictionaryService.deleteDataDictionary( dataDictionaryA );
-
- assertNull( dataDictionaryService.getDataDictionary( idA ) );
- assertNotNull( dataDictionaryService.getDataDictionary( idB ) );
-
- dataDictionaryService.deleteDataDictionary( dataDictionaryB );
-
- assertNull( dataDictionaryService.getDataDictionary( idA ) );
- assertNull( dataDictionaryService.getDataDictionary( idB ) );
- }
-
- @Test
- public void testGetAllDataDictionaries()
- {
- dataDictionaryService.saveDataDictionary( dataDictionaryA );
- dataDictionaryService.saveDataDictionary( dataDictionaryB );
-
- Collection<DataDictionary> dictionaries = dataDictionaryService.getAllDataDictionaries();
-
- assertTrue( dictionaries.size() == 2 );
- assertTrue( dictionaries.contains( dataDictionaryA ) );
- assertTrue( dictionaries.contains( dataDictionaryB ) );
- }
-}
=== removed file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datadictionary/DataDictionaryStoreTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datadictionary/DataDictionaryStoreTest.java 2014-10-07 13:46:29 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datadictionary/DataDictionaryStoreTest.java 1970-01-01 00:00:00 +0000
@@ -1,191 +0,0 @@
-package org.hisp.dhis.datadictionary;
-
-/*
- * Copyright (c) 2004-2014, 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 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.Collection;
-
-import javax.annotation.Resource;
-
-import org.hisp.dhis.DhisSpringTest;
-import org.hisp.dhis.common.GenericIdentifiableObjectStore;
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementService;
-import org.hisp.dhis.indicator.Indicator;
-import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.indicator.IndicatorType;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DataDictionaryStoreTest
- extends DhisSpringTest
-{
- @Resource( name = "org.hisp.dhis.datadictionary.DataDictionaryStore" )
- private GenericIdentifiableObjectStore<DataDictionary> dataDictionaryStore;
-
- @Autowired
- private DataElementService dataElementService;
-
- @Autowired
- private IndicatorService indicatorService;
-
- private DataElement dataElementA;
- private DataElement dataElementB;
-
- private IndicatorType indicatorType;
-
- private Indicator indicatorA;
- private Indicator indicatorB;
-
- private DataDictionary dataDictionaryA;
- private DataDictionary dataDictionaryB;
-
- // -------------------------------------------------------------------------
- // Fixture
- // -------------------------------------------------------------------------
-
- @Override
- public void setUpTest()
- throws Exception
- {
- dataDictionaryA = createDataDictionary( 'A' );
- dataDictionaryB = createDataDictionary( 'B' );
-
- dataElementA = createDataElement( 'A' );
- dataElementB = createDataElement( 'B' );
-
- indicatorType = createIndicatorType( 'A' );
-
- indicatorService.addIndicatorType( indicatorType );
-
- indicatorA = createIndicator( 'A', indicatorType );
- indicatorB = createIndicator( 'B', indicatorType );
- }
-
- // -------------------------------------------------------------------------
- // DataDictionary tests
- // -------------------------------------------------------------------------
-
- @Test
- public void testSaveGetDataDictionary()
- {
- dataElementService.addDataElement( dataElementA );
- dataElementService.addDataElement( dataElementB );
-
- indicatorService.addIndicator( indicatorA );
- indicatorService.addIndicator( indicatorB );
-
- dataDictionaryA.getDataElements().add( dataElementA );
- dataDictionaryA.getDataElements().add( dataElementB );
-
- dataDictionaryA.getIndicators().add( indicatorA );
- dataDictionaryA.getIndicators().add( indicatorB );
-
- int id = dataDictionaryStore.save( dataDictionaryA );
-
- dataDictionaryA = dataDictionaryStore.get( id );
-
- assertEquals( dataDictionaryA.getName(), "DataDictionaryA" );
- assertEquals( dataDictionaryA.getDescription(), "DescriptionA" );
- assertEquals( dataDictionaryA.getRegion(), "RegionA" );
- assertEquals( dataDictionaryA.getDataElements().size(), 2 );
-
- assertTrue( dataDictionaryA.getDataElements().contains( dataElementA ) );
- assertTrue( dataDictionaryA.getDataElements().contains( dataElementB ) );
-
- assertTrue( dataDictionaryA.getIndicators().contains( indicatorA ) );
- assertTrue( dataDictionaryA.getIndicators().contains( indicatorB ) );
-
- dataDictionaryA.setName( "DataDictionaryB" );
- dataDictionaryA.setDescription( "DescriptionB" );
- dataDictionaryA.setRegion( "RegionB" );
-
- dataDictionaryStore.save( dataDictionaryA );
-
- dataDictionaryA = dataDictionaryStore.get( id );
-
- assertEquals( dataDictionaryA.getName(), "DataDictionaryB" );
- assertEquals( dataDictionaryA.getDescription(), "DescriptionB" );
- assertEquals( dataDictionaryA.getRegion(), "RegionB" );
- }
-
- @Test
- public void testGetDataDictionaryByName()
- {
- dataDictionaryStore.save( dataDictionaryA );
- dataDictionaryStore.save( dataDictionaryB );
-
- dataDictionaryA = dataDictionaryStore.getByName( "DataDictionaryA" );
-
- assertNotNull( dataDictionaryA );
- assertEquals( dataDictionaryA.getName(), "DataDictionaryA" );
- assertEquals( dataDictionaryA.getDescription(), "DescriptionA" );
- }
-
- @Test
- public void testDeleteDataDictionary()
- {
- int idA = dataDictionaryStore.save( dataDictionaryA );
- int idB = dataDictionaryStore.save( dataDictionaryB );
-
- assertNotNull( dataDictionaryStore.get( idA ) );
- assertNotNull( dataDictionaryStore.get( idB ) );
-
- dataDictionaryStore.delete( dataDictionaryA );
-
- assertNull( dataDictionaryStore.get( idA ) );
- assertNotNull( dataDictionaryStore.get( idB ) );
-
- dataDictionaryStore.delete( dataDictionaryB );
-
- assertNull( dataDictionaryStore.get( idA ) );
- assertNull( dataDictionaryStore.get( idB ) );
- }
-
- @Test
- public void testGetAllDataDictionaries()
- {
- dataDictionaryStore.save( dataDictionaryA );
- dataDictionaryStore.save( dataDictionaryB );
-
- Collection<DataDictionary> dictionaries = dataDictionaryStore.getAll();
-
- assertTrue( dictionaries.size() == 2 );
- assertTrue( dictionaries.contains( dataDictionaryA ) );
- assertTrue( dictionaries.contains( dataDictionaryB ) );
- }
-}
