You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by oh...@apache.org on 2014/09/15 21:58:48 UTC
svn commit: r1625140 - in
/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2:
TestAbstractConfigurationBasicFeatures.java
TestAbstractHierarchicalConfiguration.java TestPropertiesSequence.java
TestSubnodeConfiguration.java
Author: oheger
Date: Mon Sep 15 19:58:47 2014
New Revision: 1625140
URL: http://svn.apache.org/r1625140
Log:
Removed references to [collections] from test classes.
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java?rev=1625140&r1=1625139&r2=1625140&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java Mon Sep 15 19:58:47 2014
@@ -32,7 +32,6 @@ import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
-import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.configuration2.convert.ConversionHandler;
import org.apache.commons.configuration2.convert.DefaultConversionHandler;
import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
@@ -77,8 +76,7 @@ public class TestAbstractConfigurationBa
protected Iterator<String> getKeysInternal()
{
Collection<String> keyCol = new ArrayList<String>();
- CollectionUtils.addAll(keyCol, getUnderlyingConfiguration()
- .getKeys());
+ ConfigurationAssert.appendKeys(getUnderlyingConfiguration(), keyCol);
String[] keys = keyCol.toArray(new String[keyCol.size()]);
return Arrays.asList(keys).iterator();
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java?rev=1625140&r1=1625139&r2=1625140&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java Mon Sep 15 19:58:47 2014
@@ -34,7 +34,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
import org.apache.commons.configuration2.event.ConfigurationEvent;
import org.apache.commons.configuration2.event.EventListener;
@@ -1003,8 +1002,7 @@ public class TestAbstractHierarchicalCon
assertNotNull(prop);
assertEquals("creationDate", prop.toString());
- Set<String> keys = new HashSet<String>();
- CollectionUtils.addAll(keys, config.getKeys());
+ Set<String> keys = ConfigurationAssert.keysToSet(config);
assertEquals("Wrong number of defined keys", 2, keys.size());
assertTrue("Key not found", keys.contains("tables/table/name"));
assertTrue("Key not found", keys
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java?rev=1625140&r1=1625139&r2=1625140&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestPropertiesSequence.java Mon Sep 15 19:58:47 2014
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertTru
import java.util.Iterator;
import java.util.List;
-import org.apache.commons.collections.IteratorUtils;
import org.apache.commons.configuration2.builder.FileBasedBuilderParametersImpl;
import org.apache.commons.configuration2.builder.combined.CombinedConfigurationBuilder;
import org.apache.commons.configuration2.io.FileHandler;
@@ -56,8 +55,8 @@ public class TestPropertiesSequence
Configuration a = simpleConfiguration.subset("prefix");
Configuration b = compositeConfiguration.subset("prefix");
- List<?> keysSimpleConfiguration = IteratorUtils.toList(a.getKeys());
- List<?> keysCompositeConfiguration = IteratorUtils.toList(b.getKeys());
+ List<String> keysSimpleConfiguration = ConfigurationAssert.keysToList(a);
+ List<String> keysCompositeConfiguration = ConfigurationAssert.keysToList(b);
assertTrue("Size:" + keysSimpleConfiguration.size(), keysSimpleConfiguration.size() > 0);
assertEquals(keysSimpleConfiguration.size(), keysCompositeConfiguration.size());
@@ -92,8 +91,8 @@ public class TestPropertiesSequence
Configuration a = simpleConfiguration.subset("prefix");
Configuration b = compositeConfiguration.subset("prefix");
- List<?> keysSimpleConfiguration = IteratorUtils.toList(a.getKeys());
- List<?> keysCompositeConfiguration = IteratorUtils.toList(b.getKeys());
+ List<String> keysSimpleConfiguration = ConfigurationAssert.keysToList(a);
+ List<String> keysCompositeConfiguration = ConfigurationAssert.keysToList(b);
assertTrue("Size:" + keysSimpleConfiguration.size(), keysSimpleConfiguration.size() > 0);
assertEquals(keysSimpleConfiguration.size(), keysCompositeConfiguration.size());
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java?rev=1625140&r1=1625139&r2=1625140&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestSubnodeConfiguration.java Mon Sep 15 19:58:47 2014
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.NoSuchElementException;
import java.util.Set;
-import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler;
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
@@ -236,7 +235,7 @@ public class TestSubnodeConfiguration
{
setUpSubnodeConfig();
Set<String> keys = new HashSet<String>();
- CollectionUtils.addAll(keys, config.getKeys());
+ keys.addAll(ConfigurationAssert.keysToList(config));
assertEquals("Incorrect number of keys", 2, keys.size());
assertTrue("Key 1 not contained", keys.contains("name"));
assertTrue("Key 2 not contained", keys.contains("fields.field.name"));
@@ -302,8 +301,7 @@ public class TestSubnodeConfiguration
setUpSubnodeConfig("tables/table[1]");
assertEquals("Wrong field name", NodeStructureHelper.field(0, 1),
config.getString("fields/field[2]/name"));
- Set<String> keys = new HashSet<String>();
- CollectionUtils.addAll(keys, config.getKeys());
+ Set<String> keys = ConfigurationAssert.keysToSet(config);
assertEquals("Wrong number of keys", 2, keys.size());
assertTrue("Key 1 not contained", keys.contains("name"));
assertTrue("Key 2 not contained", keys.contains("fields/field/name"));