Author: oheger Date: Tue Apr 2 19:03:08 2013 New Revision: 1463681 URL: http://svn.apache.org/r1463681 Log: Changed test class: Only use methods from FileBased interface to load and save XMLConfiguration objects.
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/AbstractCombinerTest.java Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/AbstractCombinerTest.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/AbstractCombinerTest.java?rev=1463681&r1=1463680&r2=1463681&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/AbstractCombinerTest.java (original) +++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/tree/AbstractCombinerTest.java Tue Apr 2 19:03:08 2013 @@ -21,10 +21,11 @@ import static org.junit.Assert.assertTru import java.io.File; +import org.apache.commons.configuration.BaseHierarchicalConfiguration; import org.apache.commons.configuration.ConfigurationAssert; import org.apache.commons.configuration.ConfigurationException; -import org.apache.commons.configuration.BaseHierarchicalConfiguration; import org.apache.commons.configuration.XMLConfiguration; +import org.apache.commons.configuration.io.FileHandler; import org.junit.Before; import org.junit.Test; @@ -70,8 +71,10 @@ public abstract class AbstractCombinerTe protected BaseHierarchicalConfiguration createCombinedConfiguration() throws ConfigurationException { - XMLConfiguration conf1 = new XMLConfiguration(CONF1); - XMLConfiguration conf2 = new XMLConfiguration(CONF2); + XMLConfiguration conf1 = new XMLConfiguration(); + new FileHandler(conf1).load(CONF1); + XMLConfiguration conf2 = new XMLConfiguration(); + new FileHandler(conf2).load(CONF2); ConfigurationNode cn = combiner.combine(conf1.getRootNode(), conf2 .getRootNode());