=== modified file 'dhis-2/dhis-support/dhis-support-external/pom.xml' --- dhis-2/dhis-support/dhis-support-external/pom.xml 2015-10-20 22:50:17 +0000 +++ dhis-2/dhis-support/dhis-support-external/pom.xml 2015-11-02 17:28:47 +0000 @@ -102,6 +102,19 @@ org.openid4java openid4java + + + + + org.springframework + spring-test + + + junit + junit + test + + ../../ === added directory 'dhis-2/dhis-support/dhis-support-external/src/test' === added directory 'dhis-2/dhis-support/dhis-support-external/src/test/java' === added directory 'dhis-2/dhis-support/dhis-support-external/src/test/java/org' === added directory 'dhis-2/dhis-support/dhis-support-external/src/test/java/org/hisp' === added directory 'dhis-2/dhis-support/dhis-support-external/src/test/java/org/hisp/dhis' === added directory 'dhis-2/dhis-support/dhis-support-external/src/test/java/org/hisp/dhis/external' === added directory 'dhis-2/dhis-support/dhis-support-external/src/test/java/org/hisp/dhis/external/conf' === added file 'dhis-2/dhis-support/dhis-support-external/src/test/java/org/hisp/dhis/external/conf/DhisConfigurationProviderTest.java' --- dhis-2/dhis-support/dhis-support-external/src/test/java/org/hisp/dhis/external/conf/DhisConfigurationProviderTest.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-support/dhis-support-external/src/test/java/org/hisp/dhis/external/conf/DhisConfigurationProviderTest.java 2015-11-02 17:28:47 +0000 @@ -0,0 +1,57 @@ +package org.hisp.dhis.external.conf; + +/* + * Copyright (c) 2004-2015, 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.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.transaction.annotation.Transactional; + +import static org.junit.Assert.*; + +import org.junit.Test; +import org.junit.runner.RunWith; + +/** + * @author Lars Helge Overland + */ +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration( locations = { "classpath*:/META-INF/dhis/beans.xml" } ) +@Transactional +public class DhisConfigurationProviderTest +{ + @Autowired + private DhisConfigurationProvider provider; + + @Test + public void testGetProperty() + { + assertEquals( ConfigurationKey.KEY_FILESTORE_PROVIDER.getDefaultValue(), provider.getProperty( ConfigurationKey.KEY_FILESTORE_PROVIDER ) ); + } +} === added directory 'dhis-2/dhis-support/dhis-support-external/src/test/resources'