/**
 * Revenue Settlement and Sharing System GE
 * Copyright (C) 2011-2014, Javier Lucio - lucio@tid.es
 * Telefonica Investigacion y Desarrollo, S.A.
 * 
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as
 * published by the Free Software Foundation, either version 3 of the
 * License, or (at your option) any later version.
 * 
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU Affero General Public License for more details.
 * 
 * You should have received a copy of the GNU Affero General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

package es.tid.fiware.rss.common.test.test;

import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;

import es.tid.fiware.rss.common.properties.AppProperties;

/**
 * 
 */
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration({"classpath:database.xml"})
public class AppPropertiesTest {

    /**
     * Properties for database connection.
     */
    @Autowired
    @Qualifier("databaseProperties")
    private AppProperties databaseProp;

    @Test
    public void getProperty() {
        String prop = AppProperties.getProperty("database.properties", "database.url");
        Assert.assertTrue(prop.startsWith("jdbc"));
    }

    @Test
    public void nullProperties() {
        AppProperties props = new AppProperties("database.properties");
        String prop = props.getProperty("database.url");
        Assert.assertTrue(prop.startsWith("jdbc"));
        props.setProps(null);
        prop = props.getProperty("database.url");
        Assert.assertTrue(prop.startsWith("jdbc"));
    }

    @Test
    public void getFilenaName() {
        AppProperties props = new AppProperties("database.properties");
        Assert.assertTrue(props.getFilename().equalsIgnoreCase("database.properties"));
        Assert.assertNotNull("Props can not be null", props.getProps());
    }

}

@@ -950,134 +950,8 @@
 th;%0A
-import org.springframework.beans.factory.annotation.Autowired;%0Aimport org.springframework.beans.factory.annotation.Qualifier;%0A
 impo
@@ -1280,160 +1280,8 @@
  %7B%0A%0A
-    /**%0A     * Properties for database connection.%0A     */%0A    @Autowired%0A    @Qualifier(%22databaseProperties%22)%0A    private AppProperties databaseProp;%0A%0A
     
@@ -1391,32 +1391,37 @@
 ies%22, %22database.
+test.
 url%22);%0A        A
@@ -1629,32 +1629,37 @@
 perty(%22database.
+test.
 url%22);%0A        A
@@ -1774,16 +1774,21 @@
 atabase.
+test.
 url%22);%0A 

Update AppPropertiesTests to new testing database properties