svn commit: r1460451 - /commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java

[oh...@apache.org]

Author: oheger
Date: Sun Mar 24 20:21:44 2013
New Revision: 1460451

URL: http://svn.apache.org/r1460451
Log:
[CONFIGURATION-537] Removed reference to ConfigurationFactory from test class.

Modified:
    commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java

Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java?rev=1460451&r1=1460450&r2=1460451&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestSubsetConfiguration.java Sun Mar 24 20:21:44 2013
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertNul
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.io.File;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -31,6 +30,8 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
+import org.apache.commons.configuration.builder.FileBasedBuilderParametersImpl;
+import org.apache.commons.configuration.builder.combined.CombinedConfigurationBuilder;
 import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
 import org.apache.commons.configuration.interpol.Lookup;
 import org.junit.Test;
@@ -220,14 +221,14 @@ public class TestSubsetConfiguration
         }
     }
 
-    @SuppressWarnings("deprecation")
     @Test
     public void testNested() throws Exception
     {
-        ConfigurationFactory factory = new ConfigurationFactory();
-        File src = new File(new File(TEST_DIR), TEST_FILE);
-        factory.setConfigurationURL(src.toURL());
-        Configuration config = factory.getConfiguration();
+        CombinedConfigurationBuilder builder =
+                new CombinedConfigurationBuilder();
+        builder.configure(new FileBasedBuilderParametersImpl()
+                .setFile(ConfigurationAssert.getTestFile(TEST_FILE)));
+        Configuration config = builder.getConfiguration();
         Configuration subConf = config.subset("tables.table(0)");
         assertTrue(subConf.getKeys().hasNext());
         Configuration subSubConf = subConf.subset("fields.field(1)");