You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2014/08/06 01:53:48 UTC
svn commit: r1616053 - in
/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration:
./ builder/combined/
Author: sebb
Date: Tue Aug 5 23:53:48 2014
New Revision: 1616053
URL: http://svn.apache.org/r1616053
Log:
Raw types
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestINIConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestImmutableConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPatternSubtreeConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestBaseConfigurationBuilderProvider.java
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java?rev=1616053&r1=1616052&r2=1616053&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestHierarchicalConfiguration.java Tue Aug 5 23:53:48 2014
@@ -554,7 +554,7 @@ public class TestHierarchicalConfigurati
{
BaseHierarchicalConfiguration copy =
new BaseHierarchicalConfiguration(
- (HierarchicalConfiguration) null);
+ (HierarchicalConfiguration<ImmutableNode>) null);
assertTrue("Configuration not empty", copy.isEmpty());
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestINIConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestINIConfiguration.java?rev=1616053&r1=1616052&r2=1616053&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestINIConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestINIConfiguration.java Tue Aug 5 23:53:48 2014
@@ -898,7 +898,7 @@ public class TestINIConfiguration
sub.setProperty("test", "success");
StringWriter writer = new StringWriter();
config.write(writer);
- HierarchicalConfiguration config2 = setUpConfig(writer.toString());
+ HierarchicalConfiguration<?> config2 = setUpConfig(writer.toString());
assertEquals("Wrong value", "success",
config2.getString("section.test"));
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestImmutableConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestImmutableConfiguration.java?rev=1616053&r1=1616052&r2=1616053&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestImmutableConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestImmutableConfiguration.java Tue Aug 5 23:53:48 2014
@@ -198,7 +198,7 @@ public class TestImmutableConfiguration
@Test
public void testUnmodifiableHierarchicalConfiguration()
{
- HierarchicalConfiguration conf = new BaseHierarchicalConfiguration();
+ HierarchicalConfiguration<?> conf = new BaseHierarchicalConfiguration();
String key = "test";
conf.addProperty(key, Boolean.TRUE);
ImmutableHierarchicalConfiguration ihc =
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPatternSubtreeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPatternSubtreeConfiguration.java?rev=1616053&r1=1616052&r2=1616053&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPatternSubtreeConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/TestPatternSubtreeConfiguration.java Tue Aug 5 23:53:48 2014
@@ -24,6 +24,7 @@ import java.io.StringWriter;
import org.apache.commons.configuration.ex.ConfigurationException;
import org.apache.commons.configuration.io.FileHandler;
+import org.apache.commons.configuration.tree.ImmutableNode;
import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine;
import org.junit.Before;
import org.junit.Test;
@@ -31,7 +32,7 @@ import org.junit.Test;
/**
* Unit test for simple MultiConfigurationTest.
*
- * @version $Id:$
+ * @version $Id$
*/
public class TestPatternSubtreeConfiguration
{
@@ -72,7 +73,7 @@ public class TestPatternSubtreeConfigura
@Test(expected = ConfigurationException.class)
public void testReadNotFileBased() throws ConfigurationException
{
- HierarchicalConfiguration hc = new BaseHierarchicalConfiguration();
+ HierarchicalConfiguration<ImmutableNode> hc = new BaseHierarchicalConfiguration();
PatternSubtreeConfigurationWrapper config =
new PatternSubtreeConfigurationWrapper(hc, PATTERN);
new FileHandler(config).load(CONFIG_FILE);
@@ -85,7 +86,7 @@ public class TestPatternSubtreeConfigura
@Test(expected = ConfigurationException.class)
public void testSaveNotFileBased() throws ConfigurationException
{
- HierarchicalConfiguration hc = new BaseHierarchicalConfiguration();
+ HierarchicalConfiguration<ImmutableNode> hc = new BaseHierarchicalConfiguration();
PatternSubtreeConfigurationWrapper config =
new PatternSubtreeConfigurationWrapper(hc, PATTERN);
new FileHandler(config).save(new StringWriter());
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestBaseConfigurationBuilderProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestBaseConfigurationBuilderProvider.java?rev=1616053&r1=1616052&r2=1616053&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestBaseConfigurationBuilderProvider.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/builder/combined/TestBaseConfigurationBuilderProvider.java Tue Aug 5 23:53:48 2014
@@ -51,9 +51,9 @@ public class TestBaseConfigurationBuilde
* @param reload a flag whether reload operations are supported
* @return the configuration object
*/
- private HierarchicalConfiguration setUpConfig(boolean reload)
+ private HierarchicalConfiguration<?> setUpConfig(boolean reload)
{
- HierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ HierarchicalConfiguration<?> config = new BaseHierarchicalConfiguration();
config.addProperty(CombinedConfigurationBuilder.ATTR_RELOAD,
Boolean.valueOf(reload));
config.addProperty("[@throwExceptionOnMissing]", Boolean.TRUE);
@@ -74,7 +74,7 @@ public class TestBaseConfigurationBuilde
* @return the declaration
*/
private ConfigurationDeclaration createDeclaration(
- HierarchicalConfiguration declConfig)
+ HierarchicalConfiguration<?> declConfig)
{
CombinedConfigurationBuilder parentBuilder =
new CombinedConfigurationBuilder()
@@ -129,7 +129,7 @@ public class TestBaseConfigurationBuilde
private ConfigurationBuilder<? extends Configuration> checkBuilder(
boolean reload) throws ConfigurationException
{
- HierarchicalConfiguration declConfig = setUpConfig(reload);
+ HierarchicalConfiguration<?> declConfig = setUpConfig(reload);
ConfigurationDeclaration decl = createDeclaration(declConfig);
ConfigurationBuilder<? extends Configuration> builder =
createProvider().getConfigurationBuilder(decl);
@@ -206,7 +206,7 @@ public class TestBaseConfigurationBuilde
PropertiesConfiguration.class.getName(),
Arrays.asList(FileBasedBuilderParametersImpl.class
.getName()));
- HierarchicalConfiguration declConfig = setUpConfig(true);
+ HierarchicalConfiguration<?> declConfig = setUpConfig(true);
ConfigurationDeclaration decl = createDeclaration(declConfig);
provider.getConfigurationBuilder(decl);
}
@@ -223,7 +223,7 @@ public class TestBaseConfigurationBuilde
private void checkAllowFailOnInit(boolean expFlag, String... props)
throws ConfigurationException
{
- HierarchicalConfiguration declConfig = setUpConfig(false);
+ HierarchicalConfiguration<?> declConfig = setUpConfig(false);
for (String key : props)
{
declConfig.addProperty(key, Boolean.TRUE);