dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #25023
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12332: Removed outdated tests
------------------------------------------------------------
revno: 12332
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-09-30 14:59:36 +0200
message:
Removed outdated tests
removed:
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/Dhis14ImportServiceTest.java
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/IbatisConfigurationManagerTest.java
modified:
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/importer/DefaultDhis14XMLImportService.java
dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/Dhis14XmlImportServiceTest.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-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/importer/DefaultDhis14XMLImportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/importer/DefaultDhis14XMLImportService.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/importer/DefaultDhis14XMLImportService.java 2013-09-30 12:59:36 +0000
@@ -82,7 +82,7 @@
* @version $Id$
*/
public class DefaultDhis14XMLImportService
-implements ImportService
+ implements ImportService
{
private static final Log log = LogFactory.getLog( DefaultDhis14XMLImportService.class );
=== removed file 'dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/Dhis14ImportServiceTest.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/Dhis14ImportServiceTest.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/Dhis14ImportServiceTest.java 1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-package org.hisp.dhis.importexport.dhis14;
-
-/*
- * 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.hisp.dhis.DhisSpringTest;
-import org.hisp.dhis.importexport.ImportParams;
-import org.hisp.dhis.importexport.ImportService;
-import org.hisp.dhis.importexport.ImportType;
-import org.junit.Test;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class Dhis14ImportServiceTest
- extends DhisSpringTest
-{
- @SuppressWarnings( "unused" )
- private ImportService importService;
-
- // -------------------------------------------------------------------------
- // Fixture
- // -------------------------------------------------------------------------
-
- public void setUpTest()
- {
- importService = (ImportService) getBean( "org.hisp.dhis.importexport.Dhis14FILEImportService" );
- }
-
- // -------------------------------------------------------------------------
- // Tests
- // -------------------------------------------------------------------------
-
- @Test
- public void testImport()
- throws Exception
- {
- ImportParams params = new ImportParams();
-
- params.setType( ImportType.IMPORT );
- params.setDataValues( true );
- params.setExtendedMode( false );
- params.setSkipCheckMatching( false );
-
- //importService.importData( params, null );
- }
-}
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/Dhis14XmlImportServiceTest.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/Dhis14XmlImportServiceTest.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/Dhis14XmlImportServiceTest.java 2013-09-30 12:59:36 +0000
@@ -34,8 +34,10 @@
import org.hisp.dhis.importexport.ImportParams;
import org.hisp.dhis.importexport.ImportService;
import org.hisp.dhis.importexport.ImportType;
+import org.junit.Ignore;
import org.junit.Test;
+@Ignore //TODO reimplement, takes too long
public class Dhis14XmlImportServiceTest
extends DhisSpringTest
{
=== removed file 'dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/IbatisConfigurationManagerTest.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/IbatisConfigurationManagerTest.java 2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dhis14/IbatisConfigurationManagerTest.java 1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-package org.hisp.dhis.importexport.dhis14;
-
-/*
- * 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 static org.junit.Assert.assertEquals;
-
-import java.util.Properties;
-
-import org.hisp.dhis.DhisSpringTest;
-import org.hisp.dhis.external.location.LocationManager;
-import org.hisp.dhis.importexport.IbatisConfiguration;
-import org.hisp.dhis.importexport.IbatisConfigurationManager;
-import org.junit.Test;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class IbatisConfigurationManagerTest
- extends DhisSpringTest
-{
- private static final String KEY_CONNECTION_URL_DATABASE = "ibatis.connection.url.database";
- private static final String KEY_PASSWORD = "ibatis.connection.password";
- private static final String KEY_USERNAME = "ibatis.connection.username";
- private static final String KEY_LEVELS = "ibatis.levels";
-
- private IbatisConfigurationManager configurationManager;
-
- private LocationManager locationManager;
-
- // -------------------------------------------------------------------------
- // Fixture
- // -------------------------------------------------------------------------
-
- @Override
- public void setUpTest()
- {
- locationManager = (LocationManager) getBean( "locationManager" );
-
- setExternalTestDir( locationManager );
-
- configurationManager = (IbatisConfigurationManager) getBean( IbatisConfigurationManager.ID );
-
- setDependency( configurationManager, "configDir", "test", String.class );
- setDependency( configurationManager, "configFile", "testIbatisConfiguration.xml", String.class );
- }
-
- // -------------------------------------------------------------------------
- // Tests
- // -------------------------------------------------------------------------
-
- @Test
- public void testSetGetIbatisConfiguration()
- throws Exception
- {
- IbatisConfiguration config = new IbatisConfiguration();
-
- config.setDataFile( "dataFile" );
- config.setUserName( "userName" );
- config.setPassword( "password" );
- config.setLevels( "8" );
-
- configurationManager.setIbatisConfiguration( config );
-
- IbatisConfiguration receivedConfig = configurationManager.getIbatisConfiguration();
-
- assertEquals( config, receivedConfig );
- }
-
- @Test
- public void testGetPropertiesConfiguration()
- throws Exception
- {
- IbatisConfiguration config = new IbatisConfiguration();
-
- config.setDataFile( "dataFile" );
- config.setUserName( "userName" );
- config.setPassword( "password" );
- config.setLevels( "8" );
-
- configurationManager.setIbatisConfiguration( config );
-
- Properties properties = configurationManager.getPropertiesConfiguration();
-
- assertEquals( properties.getProperty( KEY_CONNECTION_URL_DATABASE ), "dataFile" );
- assertEquals( properties.getProperty( KEY_USERNAME ), "userName" );
- assertEquals( properties.getProperty( KEY_PASSWORD ), "password" );
- assertEquals( properties.getProperty( KEY_LEVELS ), "8" );
- }
-}
