You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/09/27 22:24:26 UTC
svn commit: r1842194 [26/34] - in /commons/proper/configuration/trunk/src:
main/java/org/apache/commons/configuration2/
main/java/org/apache/commons/configuration2/beanutils/
main/java/org/apache/commons/configuration2/builder/
main/java/org/apache/com...
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedBuilderParametersImpl.java Thu Sep 27 22:24:23 2018
@@ -66,7 +66,7 @@ public class TestCombinedBuilderParamete
@Test
public void testFromParametersCreate()
{
- CombinedBuilderParametersImpl params =
+ final CombinedBuilderParametersImpl params =
CombinedBuilderParametersImpl.fromParameters(
new HashMap<String, Object>(), true);
assertNotNull("No instance", params);
@@ -79,8 +79,8 @@ public class TestCombinedBuilderParamete
@Test
public void testFromParametersExisting()
{
- CombinedBuilderParametersImpl params = new CombinedBuilderParametersImpl();
- Map<String, Object> map = params.getParameters();
+ final CombinedBuilderParametersImpl params = new CombinedBuilderParametersImpl();
+ final Map<String, Object> map = params.getParameters();
assertSame("Wrong result", params,
CombinedBuilderParametersImpl.fromParameters(map));
}
@@ -91,10 +91,10 @@ public class TestCombinedBuilderParamete
@Test
public void testGetParametersInherited()
{
- CombinedBuilderParametersImpl params =
+ final CombinedBuilderParametersImpl params =
new CombinedBuilderParametersImpl();
params.setThrowExceptionOnMissing(true);
- Map<String, Object> map = params.getParameters();
+ final Map<String, Object> map = params.getParameters();
assertEquals("Exception flag not found", Boolean.TRUE,
map.get("throwExceptionOnMissing"));
}
@@ -105,7 +105,7 @@ public class TestCombinedBuilderParamete
@Test
public void testSetInheritSettings()
{
- CombinedBuilderParametersImpl params =
+ final CombinedBuilderParametersImpl params =
new CombinedBuilderParametersImpl();
assertTrue("Wrong initial value", params.isInheritSettings());
assertSame("Wrong result", params, params.setInheritSettings(false));
@@ -118,9 +118,9 @@ public class TestCombinedBuilderParamete
@Test
public void testSetDefinitionBuilder()
{
- CombinedBuilderParametersImpl params = new CombinedBuilderParametersImpl();
+ final CombinedBuilderParametersImpl params = new CombinedBuilderParametersImpl();
assertNull("Got a definition builder", params.getDefinitionBuilder());
- ConfigurationBuilder<XMLConfiguration> builder =
+ final ConfigurationBuilder<XMLConfiguration> builder =
new BasicConfigurationBuilder<>(
XMLConfiguration.class);
assertSame("Wrong result", params, params.setDefinitionBuilder(builder));
@@ -134,7 +134,7 @@ public class TestCombinedBuilderParamete
@Test
public void testGetProvidersInitial()
{
- CombinedBuilderParametersImpl params = new CombinedBuilderParametersImpl();
+ final CombinedBuilderParametersImpl params = new CombinedBuilderParametersImpl();
assertTrue("Got providers", params.getProviders().isEmpty());
}
@@ -144,14 +144,14 @@ public class TestCombinedBuilderParamete
@Test
public void testRegisterProvider()
{
- ConfigurationBuilderProvider provider =
+ final ConfigurationBuilderProvider provider =
EasyMock.createMock(ConfigurationBuilderProvider.class);
EasyMock.replay(provider);
- String tagName = "testTag";
- CombinedBuilderParametersImpl params = new CombinedBuilderParametersImpl();
+ final String tagName = "testTag";
+ final CombinedBuilderParametersImpl params = new CombinedBuilderParametersImpl();
assertSame("Wrong result", params,
params.registerProvider(tagName, provider));
- Map<String, ConfigurationBuilderProvider> providers =
+ final Map<String, ConfigurationBuilderProvider> providers =
params.getProviders();
assertEquals("Wrong number of providers", 1, providers.size());
assertSame("Wrong provider (1)", provider, providers.get(tagName));
@@ -184,7 +184,7 @@ public class TestCombinedBuilderParamete
@Test(expected = UnsupportedOperationException.class)
public void testGetProvidersModify()
{
- CombinedBuilderParametersImpl params = new CombinedBuilderParametersImpl();
+ final CombinedBuilderParametersImpl params = new CombinedBuilderParametersImpl();
params.getProviders().put("tag",
EasyMock.createMock(ConfigurationBuilderProvider.class));
}
@@ -195,16 +195,16 @@ public class TestCombinedBuilderParamete
@Test
public void testRegisterMissingProviders()
{
- ConfigurationBuilderProvider provider1 =
+ final ConfigurationBuilderProvider provider1 =
EasyMock.createMock(ConfigurationBuilderProvider.class);
- ConfigurationBuilderProvider provider2 =
+ final ConfigurationBuilderProvider provider2 =
EasyMock.createMock(ConfigurationBuilderProvider.class);
- ConfigurationBuilderProvider provider3 =
+ final ConfigurationBuilderProvider provider3 =
EasyMock.createMock(ConfigurationBuilderProvider.class);
- String tagPrefix = "testTag";
- CombinedBuilderParametersImpl params = new CombinedBuilderParametersImpl();
+ final String tagPrefix = "testTag";
+ final CombinedBuilderParametersImpl params = new CombinedBuilderParametersImpl();
params.registerProvider(tagPrefix, provider1);
- Map<String, ConfigurationBuilderProvider> map =
+ final Map<String, ConfigurationBuilderProvider> map =
new HashMap<>();
map.put(tagPrefix, provider2);
map.put(tagPrefix + 1, provider3);
@@ -223,7 +223,7 @@ public class TestCombinedBuilderParamete
@Test(expected = IllegalArgumentException.class)
public void testRegisterMissingProvidersNullMap()
{
- Map<String, ConfigurationBuilderProvider> map = null;
+ final Map<String, ConfigurationBuilderProvider> map = null;
new CombinedBuilderParametersImpl().registerMissingProviders(map);
}
@@ -233,7 +233,7 @@ public class TestCombinedBuilderParamete
@Test(expected = IllegalArgumentException.class)
public void testRegisterMissingProvidersNullEntry()
{
- Map<String, ConfigurationBuilderProvider> map =
+ final Map<String, ConfigurationBuilderProvider> map =
new HashMap<>();
map.put("tag", null);
new CombinedBuilderParametersImpl().registerMissingProviders(map);
@@ -245,16 +245,16 @@ public class TestCombinedBuilderParamete
@Test
public void testRegisterMissingProvidersParams()
{
- ConfigurationBuilderProvider provider1 =
+ final ConfigurationBuilderProvider provider1 =
EasyMock.createMock(ConfigurationBuilderProvider.class);
- ConfigurationBuilderProvider provider2 =
+ final ConfigurationBuilderProvider provider2 =
EasyMock.createMock(ConfigurationBuilderProvider.class);
- ConfigurationBuilderProvider provider3 =
+ final ConfigurationBuilderProvider provider3 =
EasyMock.createMock(ConfigurationBuilderProvider.class);
- String tagPrefix = "testTag";
- CombinedBuilderParametersImpl params =
+ final String tagPrefix = "testTag";
+ final CombinedBuilderParametersImpl params =
new CombinedBuilderParametersImpl();
- CombinedBuilderParametersImpl params2 =
+ final CombinedBuilderParametersImpl params2 =
new CombinedBuilderParametersImpl();
params.registerProvider(tagPrefix, provider1);
params2.registerProvider(tagPrefix, provider2);
@@ -285,7 +285,7 @@ public class TestCombinedBuilderParamete
@Test
public void testProviderForUnknown()
{
- CombinedBuilderParametersImpl params = new CombinedBuilderParametersImpl();
+ final CombinedBuilderParametersImpl params = new CombinedBuilderParametersImpl();
assertNull("Got a provider", params.providerForTag("someTag"));
}
@@ -295,9 +295,9 @@ public class TestCombinedBuilderParamete
@Test
public void testSetBasePath()
{
- CombinedBuilderParametersImpl params =
+ final CombinedBuilderParametersImpl params =
new CombinedBuilderParametersImpl();
- String basePath = ConfigurationAssert.OUT_DIR.getAbsolutePath();
+ final String basePath = ConfigurationAssert.OUT_DIR.getAbsolutePath();
assertSame("Wrong result", params, params.setBasePath(basePath));
assertEquals("Wrong base path", basePath, params.getBasePath());
}
@@ -308,10 +308,10 @@ public class TestCombinedBuilderParamete
@Test
public void testSetDefinitionBuilderParameters()
{
- BuilderParameters defparams =
+ final BuilderParameters defparams =
EasyMock.createMock(BuilderParameters.class);
EasyMock.replay(defparams);
- CombinedBuilderParametersImpl params =
+ final CombinedBuilderParametersImpl params =
new CombinedBuilderParametersImpl();
assertSame("Wrong result", params,
params.setDefinitionBuilderParameters(defparams));
@@ -325,10 +325,10 @@ public class TestCombinedBuilderParamete
@Test
public void testSetBeanProperties() throws Exception
{
- BuilderParameters defparams =
+ final BuilderParameters defparams =
EasyMock.createMock(BuilderParameters.class);
EasyMock.replay(defparams);
- CombinedBuilderParametersImpl params =
+ final CombinedBuilderParametersImpl params =
new CombinedBuilderParametersImpl();
BeanHelper.setProperty(params, "basePath", "testPath");
BeanHelper.setProperty(params, "definitionBuilderParameters",
@@ -346,13 +346,13 @@ public class TestCombinedBuilderParamete
@Test
public void testClone()
{
- CombinedBuilderParametersImpl params =
+ final CombinedBuilderParametersImpl params =
new CombinedBuilderParametersImpl();
params.setBasePath("some base path");
- XMLBuilderParametersImpl defParams = new XMLBuilderParametersImpl();
+ final XMLBuilderParametersImpl defParams = new XMLBuilderParametersImpl();
defParams.setSystemID("someSysID");
params.setDefinitionBuilderParameters(defParams);
- CombinedBuilderParametersImpl clone = params.clone();
+ final CombinedBuilderParametersImpl clone = params.clone();
assertEquals("Wrong field value", params.getBasePath(),
clone.getBasePath());
assertNotSame("Parameters object not cloned",
@@ -373,7 +373,7 @@ public class TestCombinedBuilderParamete
@Test
public void testGetChildDefaultParametersManagerUndefined()
{
- CombinedBuilderParametersImpl params =
+ final CombinedBuilderParametersImpl params =
new CombinedBuilderParametersImpl();
assertNotNull("No default manager",
params.getChildDefaultParametersManager());
@@ -385,10 +385,10 @@ public class TestCombinedBuilderParamete
@Test
public void testGetChildDefaultParametersManagerSpecific()
{
- DefaultParametersManager manager =
+ final DefaultParametersManager manager =
EasyMock.createMock(DefaultParametersManager.class);
EasyMock.replay(manager);
- CombinedBuilderParametersImpl params =
+ final CombinedBuilderParametersImpl params =
new CombinedBuilderParametersImpl();
assertSame("Wrong result", params,
params.setChildDefaultParametersManager(manager));
@@ -404,6 +404,7 @@ public class TestCombinedBuilderParamete
private static DefaultParametersHandler<BuilderParameters> createDefaultsHandlerMock()
{
@SuppressWarnings("unchecked")
+ final
DefaultParametersHandler<BuilderParameters> mock =
EasyMock.createMock(DefaultParametersHandler.class);
return mock;
@@ -415,13 +416,13 @@ public class TestCombinedBuilderParamete
@Test
public void testRegisterChildDefaultsHandler()
{
- DefaultParametersManager manager =
+ final DefaultParametersManager manager =
EasyMock.createMock(DefaultParametersManager.class);
- DefaultParametersHandler<BuilderParameters> handler =
+ final DefaultParametersHandler<BuilderParameters> handler =
createDefaultsHandlerMock();
manager.registerDefaultsHandler(BuilderParameters.class, handler);
EasyMock.replay(manager, handler);
- CombinedBuilderParametersImpl params =
+ final CombinedBuilderParametersImpl params =
new CombinedBuilderParametersImpl();
params.setChildDefaultParametersManager(manager);
assertSame("Wrong result", params, params.registerChildDefaultsHandler(
@@ -436,14 +437,14 @@ public class TestCombinedBuilderParamete
@Test
public void testRegisterChildDefaultsHandlerWithStartClass()
{
- DefaultParametersManager manager =
+ final DefaultParametersManager manager =
EasyMock.createMock(DefaultParametersManager.class);
- DefaultParametersHandler<BuilderParameters> handler =
+ final DefaultParametersHandler<BuilderParameters> handler =
createDefaultsHandlerMock();
manager.registerDefaultsHandler(BuilderParameters.class, handler,
FileBasedBuilderParameters.class);
EasyMock.replay(manager, handler);
- CombinedBuilderParametersImpl params =
+ final CombinedBuilderParametersImpl params =
new CombinedBuilderParametersImpl();
params.setChildDefaultParametersManager(manager);
assertSame("Wrong result", params,
@@ -458,17 +459,17 @@ public class TestCombinedBuilderParamete
@Test
public void testInheritFrom()
{
- DefaultParametersManager manager =
+ final DefaultParametersManager manager =
EasyMock.createMock(DefaultParametersManager.class);
- CombinedBuilderParametersImpl params =
+ final CombinedBuilderParametersImpl params =
new CombinedBuilderParametersImpl().setInheritSettings(false)
.setChildDefaultParametersManager(manager);
params.setThrowExceptionOnMissing(true);
- CombinedBuilderParametersImpl params2 =
+ final CombinedBuilderParametersImpl params2 =
new CombinedBuilderParametersImpl();
params2.inheritFrom(params.getParameters());
- Map<String, Object> parameters = params2.getParameters();
+ final Map<String, Object> parameters = params2.getParameters();
assertEquals("Exception flag not set", Boolean.TRUE,
parameters.get("throwExceptionOnMissing"));
assertEquals("Default manager not set", manager,
@@ -483,13 +484,13 @@ public class TestCombinedBuilderParamete
@Test
public void testInheritFromNoParametersInMap()
{
- BasicBuilderParameters params =
+ final BasicBuilderParameters params =
new BasicBuilderParameters().setThrowExceptionOnMissing(true);
- CombinedBuilderParametersImpl params2 =
+ final CombinedBuilderParametersImpl params2 =
new CombinedBuilderParametersImpl();
params2.inheritFrom(params.getParameters());
- Map<String, Object> parameters = params2.getParameters();
+ final Map<String, Object> parameters = params2.getParameters();
assertEquals("Exception flag not set", Boolean.TRUE,
parameters.get("throwExceptionOnMissing"));
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilder.java Thu Sep 27 22:24:23 2018
@@ -140,7 +140,7 @@ public class TestCombinedConfigurationBu
* @return the definition builder
*/
protected static BasicConfigurationBuilder<? extends BaseHierarchicalConfiguration> createDefinitionBuilder(
- BaseHierarchicalConfiguration defConfig)
+ final BaseHierarchicalConfiguration defConfig)
{
return new ConstantConfigurationBuilder(defConfig);
}
@@ -154,13 +154,13 @@ public class TestCombinedConfigurationBu
* @param attrs the attributes of this tag
* @return the definition configuration
*/
- protected static BaseHierarchicalConfiguration createDefinitionConfig(String tag,
- Map<String, Object> attrs)
+ protected static BaseHierarchicalConfiguration createDefinitionConfig(final String tag,
+ final Map<String, Object> attrs)
{
- BaseHierarchicalConfiguration defConfig =
+ final BaseHierarchicalConfiguration defConfig =
new BaseHierarchicalConfiguration();
- String prefix = "override." + tag;
- for (Map.Entry<String, Object> e : attrs.entrySet())
+ final String prefix = "override." + tag;
+ for (final Map.Entry<String, Object> e : attrs.entrySet())
{
defConfig.addProperty(prefix + "[@" + e.getKey() + "]",
e.getValue());
@@ -195,7 +195,7 @@ public class TestCombinedConfigurationBu
private CombinedConfiguration checkConfiguration()
throws ConfigurationException
{
- CombinedConfiguration compositeConfiguration =
+ final CombinedConfiguration compositeConfiguration =
builder.getConfiguration();
assertEquals("Number of configurations", 3,
@@ -208,7 +208,7 @@ public class TestCombinedConfigurationBu
.getConfiguration(2).getClass());
// check the first configuration
- PropertiesConfiguration pc =
+ final PropertiesConfiguration pc =
(PropertiesConfiguration) compositeConfiguration
.getConfiguration(0);
assertNotNull("No properties configuration", pc);
@@ -223,7 +223,7 @@ public class TestCombinedConfigurationBu
*
* @param compositeConfiguration the configuration to check
*/
- private void checkProperties(Configuration compositeConfiguration)
+ private void checkProperties(final Configuration compositeConfiguration)
{
assertTrue("Make sure we have loaded our key",
compositeConfiguration.getBoolean("test.boolean"));
@@ -240,7 +240,7 @@ public class TestCombinedConfigurationBu
@Test
public void testConfigureResult()
{
- CombinedConfigurationBuilder configuredBuilder =
+ final CombinedConfigurationBuilder configuredBuilder =
builder.configure(createParameters().setFile(TEST_FILE));
assertSame("Wrong instance returned", builder, configuredBuilder);
}
@@ -262,12 +262,12 @@ public class TestCombinedConfigurationBu
@Test
public void testLoadAdditional() throws ConfigurationException
{
- File additonalFile =
+ final File additonalFile =
ConfigurationAssert
.getTestFile("testDigesterConfiguration2.xml");
builder.configure(createParameters()
.setFile(additonalFile));
- CombinedConfiguration compositeConfiguration =
+ final CombinedConfiguration compositeConfiguration =
builder.getConfiguration();
assertEquals("Verify how many configs", 2,
compositeConfiguration.getNumberOfConfigurations());
@@ -311,12 +311,12 @@ public class TestCombinedConfigurationBu
@Test
public void testLoadOptional() throws Exception
{
- File optionalFile =
+ final File optionalFile =
ConfigurationAssert
.getTestFile("testDigesterOptionalConfiguration.xml");
builder.configure(createParameters()
.setFile(optionalFile));
- Configuration config = builder.getConfiguration();
+ final Configuration config = builder.getConfiguration();
assertTrue(config.getBoolean("test.boolean"));
assertEquals("value", config.getProperty("element"));
}
@@ -329,7 +329,7 @@ public class TestCombinedConfigurationBu
@Test(expected = ConfigurationException.class)
public void testLoadOptionalWithException() throws ConfigurationException
{
- File optionalExFile =
+ final File optionalExFile =
ConfigurationAssert
.getTestFile("testDigesterOptionalConfigurationEx.xml");
builder.configure(createParameters()
@@ -343,19 +343,19 @@ public class TestCombinedConfigurationBu
@Test
public void testLoadOptionalForceCreate() throws ConfigurationException
{
- String name = "optionalConfig";
- Map<String, Object> attrs = new HashMap<>();
+ final String name = "optionalConfig";
+ final Map<String, Object> attrs = new HashMap<>();
attrs.put("fileName", "nonExisting.xml");
attrs.put("config-name", name);
attrs.put("config-optional", Boolean.TRUE);
attrs.put("config-forceCreate", Boolean.TRUE);
- BaseHierarchicalConfiguration defConfig =
+ final BaseHierarchicalConfiguration defConfig =
createDefinitionConfig("xml", attrs);
- BasicConfigurationBuilder<? extends BaseHierarchicalConfiguration> defBuilder =
+ final BasicConfigurationBuilder<? extends BaseHierarchicalConfiguration> defBuilder =
createDefinitionBuilder(defConfig);
builder.configure(new CombinedBuilderParametersImpl()
.setDefinitionBuilder(defBuilder));
- CombinedConfiguration cc = builder.getConfiguration();
+ final CombinedConfiguration cc = builder.getConfiguration();
assertEquals("Wrong number of configurations", 1,
cc.getNumberOfConfigurations());
assertTrue("Wrong configuration type",
@@ -384,8 +384,8 @@ public class TestCombinedConfigurationBu
builder.configure(createParameters()
.setFile(TEST_FILE));
builder.getConfiguration();
- Set<String> names = builder.builderNames();
- List<String> expected = Arrays.asList("props", "xml");
+ final Set<String> names = builder.builderNames();
+ final List<String> expected = Arrays.asList("props", "xml");
assertEquals("Wrong number of named builders", expected.size(),
names.size());
assertTrue("Wrong builder names: " + names, names.containsAll(expected));
@@ -400,7 +400,7 @@ public class TestCombinedConfigurationBu
builder.configure(createParameters()
.setFile(TEST_FILE));
builder.getConfiguration();
- Set<String> names = builder.builderNames();
+ final Set<String> names = builder.builderNames();
names.add(BUILDER_NAME);
}
@@ -413,7 +413,7 @@ public class TestCombinedConfigurationBu
builder.configure(createParameters()
.setFile(TEST_FILE));
builder.getConfiguration();
- ConfigurationBuilder<? extends Configuration> propBuilder =
+ final ConfigurationBuilder<? extends Configuration> propBuilder =
builder.getNamedBuilder("props");
assertTrue("Wrong builder class",
propBuilder instanceof FileBasedConfigurationBuilder);
@@ -457,13 +457,13 @@ public class TestCombinedConfigurationBu
* @return the definition builder
*/
private BasicConfigurationBuilder<? extends HierarchicalConfiguration<ImmutableNode>> prepareSubBuilderTest(
- Map<String, Object> attrs)
+ final Map<String, Object> attrs)
{
attrs.put("fileName", TEST_SUB_XML);
attrs.put("config-name", BUILDER_NAME);
- BaseHierarchicalConfiguration defConfig =
+ final BaseHierarchicalConfiguration defConfig =
createDefinitionConfig("xml", attrs);
- BasicConfigurationBuilder<? extends HierarchicalConfiguration<ImmutableNode>> defBuilder =
+ final BasicConfigurationBuilder<? extends HierarchicalConfiguration<ImmutableNode>> defBuilder =
createDefinitionBuilder(defConfig);
builder.configure(new CombinedBuilderParametersImpl()
.setDefinitionBuilder(defBuilder));
@@ -477,16 +477,16 @@ public class TestCombinedConfigurationBu
@Test
public void testResetBuilder() throws ConfigurationException
{
- Map<String, Object> attrs = new HashMap<>();
- BasicConfigurationBuilder<? extends HierarchicalConfiguration<ImmutableNode>> defBuilder =
+ final Map<String, Object> attrs = new HashMap<>();
+ final BasicConfigurationBuilder<? extends HierarchicalConfiguration<ImmutableNode>> defBuilder =
prepareSubBuilderTest(attrs);
- CombinedConfiguration cc = builder.getConfiguration();
- ConfigurationBuilder<? extends Configuration> subBuilder =
+ final CombinedConfiguration cc = builder.getConfiguration();
+ final ConfigurationBuilder<? extends Configuration> subBuilder =
builder.getNamedBuilder(BUILDER_NAME);
defBuilder.reset();
- CombinedConfiguration cc2 = builder.getConfiguration();
+ final CombinedConfiguration cc2 = builder.getConfiguration();
assertNotSame("No new configuration instance", cc, cc2);
- ConfigurationBuilder<? extends Configuration> subBuilder2 =
+ final ConfigurationBuilder<? extends Configuration> subBuilder2 =
builder.getNamedBuilder(BUILDER_NAME);
assertNotSame("No new sub builder instance", subBuilder, subBuilder2);
}
@@ -497,7 +497,7 @@ public class TestCombinedConfigurationBu
@Test
public void testReloadingBuilder() throws ConfigurationException
{
- Map<String, Object> attrs = new HashMap<>();
+ final Map<String, Object> attrs = new HashMap<>();
attrs.put("config-reload", Boolean.TRUE);
prepareSubBuilderTest(attrs);
builder.getConfiguration();
@@ -513,10 +513,10 @@ public class TestCombinedConfigurationBu
@Test
public void testReactOnSubBuilderChange() throws ConfigurationException
{
- Map<String, Object> attrs = new HashMap<>();
+ final Map<String, Object> attrs = new HashMap<>();
prepareSubBuilderTest(attrs);
- CombinedConfiguration cc = builder.getConfiguration();
- BasicConfigurationBuilder<?> subBuilder =
+ final CombinedConfiguration cc = builder.getConfiguration();
+ final BasicConfigurationBuilder<?> subBuilder =
(BasicConfigurationBuilder<?>) builder
.getNamedBuilder(BUILDER_NAME);
subBuilder.reset();
@@ -531,16 +531,16 @@ public class TestCombinedConfigurationBu
@Test
public void testRemoveSubBuilderListener() throws ConfigurationException
{
- Map<String, Object> attrs = new HashMap<>();
+ final Map<String, Object> attrs = new HashMap<>();
prepareSubBuilderTest(attrs);
builder.getConfiguration();
- BasicConfigurationBuilder<?> subBuilder =
+ final BasicConfigurationBuilder<?> subBuilder =
(BasicConfigurationBuilder<?>) builder
.getNamedBuilder(BUILDER_NAME);
builder.reset();
prepareSubBuilderTest(attrs);
- CombinedConfiguration cc = builder.getConfiguration();
- BasicConfigurationBuilder<?> subBuilder2 =
+ final CombinedConfiguration cc = builder.getConfiguration();
+ final BasicConfigurationBuilder<?> subBuilder2 =
(BasicConfigurationBuilder<?>) builder
.getNamedBuilder(BUILDER_NAME);
assertNotSame("Got the same sub builder", subBuilder, subBuilder2);
@@ -554,9 +554,9 @@ public class TestCombinedConfigurationBu
*
* @param cc the configuration to be checked
*/
- private static void checkCombinedConfigAttrs(CombinedConfiguration cc)
+ private static void checkCombinedConfigAttrs(final CombinedConfiguration cc)
{
- ListDelimiterHandler handler = cc.getListDelimiterHandler();
+ final ListDelimiterHandler handler = cc.getListDelimiterHandler();
assertTrue("Wrong delimiter handler: " + handler,
handler instanceof DefaultListDelimiterHandler);
assertEquals("Wrong list delimiter character", ',',
@@ -571,14 +571,14 @@ public class TestCombinedConfigurationBu
public void testCombinedConfigurationAttributes()
throws ConfigurationException
{
- File initFile =
+ final File initFile =
ConfigurationAssert
.getTestFile("testCCResultInitialization.xml");
builder.configure(createParameters()
.setFile(initFile));
- CombinedConfiguration cc = builder.getConfiguration();
+ final CombinedConfiguration cc = builder.getConfiguration();
checkCombinedConfigAttrs(cc);
- CombinedConfiguration cc2 =
+ final CombinedConfiguration cc2 =
(CombinedConfiguration) cc
.getConfiguration(CombinedConfigurationBuilder.ADDITIONAL_NAME);
checkCombinedConfigAttrs(cc2);
@@ -594,7 +594,7 @@ public class TestCombinedConfigurationBu
{
builder.configure(createParameters()
.setFile(TEST_FILE));
- CombinedConfiguration cc = builder.getConfiguration();
+ final CombinedConfiguration cc = builder.getConfiguration();
assertNull(
"Additional configuration was found",
cc.getConfiguration(CombinedConfigurationBuilder.ADDITIONAL_NAME));
@@ -607,18 +607,18 @@ public class TestCombinedConfigurationBu
public void testCombinedConfigurationListNodes()
throws ConfigurationException
{
- File initFile =
+ final File initFile =
ConfigurationAssert
.getTestFile("testCCResultInitialization.xml");
builder.configure(createParameters()
.setFile(initFile));
- CombinedConfiguration cc = builder.getConfiguration();
+ final CombinedConfiguration cc = builder.getConfiguration();
Set<String> listNodes = cc.getNodeCombiner().getListNodes();
assertEquals("Wrong number of list nodes", 2, listNodes.size());
assertTrue("table node not a list node", listNodes.contains("table"));
assertTrue("list node not a list node", listNodes.contains("list"));
- CombinedConfiguration cca =
+ final CombinedConfiguration cca =
(CombinedConfiguration) cc
.getConfiguration(CombinedConfigurationBuilder.ADDITIONAL_NAME);
listNodes = cca.getNodeCombiner().getListNodes();
@@ -632,11 +632,11 @@ public class TestCombinedConfigurationBu
@Test
public void testCustomBuilderProvider() throws ConfigurationException
{
- String tagName = "myTestTag";
+ final String tagName = "myTestTag";
final BaseHierarchicalConfiguration dataConf =
new BaseHierarchicalConfiguration();
dataConf.addProperty(tagName, Boolean.TRUE);
- Map<String, Object> attrs = new HashMap<>();
+ final Map<String, Object> attrs = new HashMap<>();
attrs.put("config-name", BUILDER_NAME);
attrs.put("config-at", "tests");
builder.configure(new CombinedBuilderParametersImpl()
@@ -647,14 +647,14 @@ public class TestCombinedConfigurationBu
{
@Override
public ConfigurationBuilder<? extends Configuration> getConfigurationBuilder(
- ConfigurationDeclaration decl)
+ final ConfigurationDeclaration decl)
throws ConfigurationException
{
return new ConstantConfigurationBuilder(
dataConf);
}
}));
- CombinedConfiguration cc = builder.getConfiguration();
+ final CombinedConfiguration cc = builder.getConfiguration();
assertEquals("Configuration not added", dataConf,
cc.getConfiguration(BUILDER_NAME));
assertEquals("Property not set", Boolean.TRUE,
@@ -670,7 +670,7 @@ public class TestCombinedConfigurationBu
builder.configure(createParameters()
.setFile(ConfigurationAssert
.getTestFile("testCCCustomProvider.xml")));
- CombinedConfiguration cc = builder.getConfiguration();
+ final CombinedConfiguration cc = builder.getConfiguration();
assertTrue("Property not found", cc.getBoolean("testKey"));
}
@@ -682,11 +682,11 @@ public class TestCombinedConfigurationBu
@Test
public void testSystemProperties() throws ConfigurationException
{
- File systemFile =
+ final File systemFile =
ConfigurationAssert.getTestFile("testCCSystemProperties.xml");
builder.configure(createParameters()
.setFile(systemFile));
- CombinedConfiguration cc = builder.getConfiguration();
+ final CombinedConfiguration cc = builder.getConfiguration();
assertTrue("System property not found", cc.containsKey("user.name"));
assertEquals("Properties not added", "value1",
System.getProperty("key1"));
@@ -699,12 +699,12 @@ public class TestCombinedConfigurationBu
@Test
public void testEnvironmentProperties() throws ConfigurationException
{
- File envFile =
+ final File envFile =
ConfigurationAssert.getTestFile("testCCEnvProperties.xml");
builder.configure(createParameters().setFile(envFile));
- CombinedConfiguration cc = builder.getConfiguration();
+ final CombinedConfiguration cc = builder.getConfiguration();
assertFalse("Configuration is empty", cc.isEmpty());
- for (Map.Entry<String, String> e : System.getenv().entrySet())
+ for (final Map.Entry<String, String> e : System.getenv().entrySet())
{
assertEquals("Wrong value for property: " + e.getKey(),
e.getValue(), cc.getString(e.getKey()));
@@ -718,13 +718,13 @@ public class TestCombinedConfigurationBu
@Test
public void testJndiConfiguration() throws ConfigurationException
{
- File multiFile =
+ final File multiFile =
ConfigurationAssert
.getTestFile("testDigesterConfiguration3.xml");
builder.configure(new CombinedBuilderParametersImpl()
.setDefinitionBuilderParameters(createParameters()
.setFile(multiFile)));
- CombinedConfiguration cc = builder.getConfiguration();
+ final CombinedConfiguration cc = builder.getConfiguration();
assertTrue("JNDI property not found", cc.getBoolean("test.onlyinjndi"));
}
@@ -735,13 +735,13 @@ public class TestCombinedConfigurationBu
@Test
public void testINIConfiguration() throws ConfigurationException
{
- File multiFile =
+ final File multiFile =
ConfigurationAssert
.getTestFile("testDigesterConfiguration3.xml");
builder.configure(new CombinedBuilderParametersImpl()
.setDefinitionBuilderParameters(createParameters()
.setFile(multiFile)));
- CombinedConfiguration cc = builder.getConfiguration();
+ final CombinedConfiguration cc = builder.getConfiguration();
assertEquals("Property from ini file not found", "yes",
cc.getString("testini.loaded"));
}
@@ -752,14 +752,14 @@ public class TestCombinedConfigurationBu
@Test
public void testCustomEntityResolver() throws ConfigurationException
{
- File resolverFile =
+ final File resolverFile =
ConfigurationAssert.getTestFile("testCCEntityResolver.xml");
builder.configure(createParameters()
.setFile(resolverFile));
- CombinedConfiguration cc = builder.getConfiguration();
- XMLConfiguration xmlConf =
+ final CombinedConfiguration cc = builder.getConfiguration();
+ final XMLConfiguration xmlConf =
(XMLConfiguration) cc.getConfiguration("xml");
- EntityResolverWithPropertiesTestImpl resolver =
+ final EntityResolverWithPropertiesTestImpl resolver =
(EntityResolverWithPropertiesTestImpl) xmlConf
.getEntityResolver();
assertFalse("No lookups", resolver.getInterpolator().getLookups()
@@ -774,16 +774,16 @@ public class TestCombinedConfigurationBu
public void testConfigureEntityResolverWithProperties()
throws ConfigurationException
{
- HierarchicalConfiguration<ImmutableNode> config = new BaseHierarchicalConfiguration();
+ final HierarchicalConfiguration<ImmutableNode> config = new BaseHierarchicalConfiguration();
config.addProperty("header.entity-resolver[@config-class]",
EntityResolverWithPropertiesTestImpl.class.getName());
- XMLBuilderParametersImpl xmlParams = new XMLBuilderParametersImpl();
- FileSystem fs = EasyMock.createMock(FileSystem.class);
- String baseDir = ConfigurationAssert.OUT_DIR_NAME;
+ final XMLBuilderParametersImpl xmlParams = new XMLBuilderParametersImpl();
+ final FileSystem fs = EasyMock.createMock(FileSystem.class);
+ final String baseDir = ConfigurationAssert.OUT_DIR_NAME;
xmlParams.setBasePath(baseDir);
xmlParams.setFileSystem(fs);
builder.configureEntityResolver(config, xmlParams);
- EntityResolverWithPropertiesTestImpl resolver =
+ final EntityResolverWithPropertiesTestImpl resolver =
(EntityResolverWithPropertiesTestImpl) xmlParams
.getEntityResolver();
assertSame("File system not set", fs, resolver.getFileSystem());
@@ -797,11 +797,12 @@ public class TestCombinedConfigurationBu
* @param fsFile the file to be processed
* @throws ConfigurationException if an error occurs
*/
- private void checkFileSystem(File fsFile) throws ConfigurationException
+ private void checkFileSystem(final File fsFile) throws ConfigurationException
{
builder.configure(createParameters().setFile(fsFile));
builder.getConfiguration();
@SuppressWarnings("unchecked") // this is the minimum bound for type arguments
+ final
FileBasedConfigurationBuilder<? extends Configuration> xmlBuilder =
(FileBasedConfigurationBuilder<? extends Configuration>) builder
.getNamedBuilder("xml");
@@ -839,14 +840,14 @@ public class TestCombinedConfigurationBu
@Test
public void testDefaultBasePathInParameters() throws ConfigurationException
{
- File testFile =
+ final File testFile =
ConfigurationAssert.getTestFile("testCCSystemProperties.xml");
- String basePath = ConfigurationAssert.OUT_DIR.getAbsolutePath();
+ final String basePath = ConfigurationAssert.OUT_DIR.getAbsolutePath();
builder.configure(new CombinedBuilderParametersImpl().setBasePath(
basePath).setDefinitionBuilderParameters(
createParameters().setFile(testFile)));
builder.getConfiguration();
- XMLBuilderParametersImpl xmlParams = new XMLBuilderParametersImpl();
+ final XMLBuilderParametersImpl xmlParams = new XMLBuilderParametersImpl();
builder.initChildBuilderParameters(xmlParams);
assertEquals("Base path not set", basePath, xmlParams.getFileHandler()
.getBasePath());
@@ -860,16 +861,16 @@ public class TestCombinedConfigurationBu
public void testDefaultBasePathFromDefinitionBuilder()
throws ConfigurationException, IOException
{
- String testFile = "testCCSystemProperties.xml";
+ final String testFile = "testCCSystemProperties.xml";
builder.configure(new CombinedBuilderParametersImpl()
.setDefinitionBuilderParameters(createParameters()
.setBasePath(
ConfigurationAssert.TEST_DIR.getAbsolutePath())
.setFileName(testFile)));
builder.getConfiguration();
- XMLBuilderParametersImpl xmlParams = new XMLBuilderParametersImpl();
+ final XMLBuilderParametersImpl xmlParams = new XMLBuilderParametersImpl();
builder.initChildBuilderParameters(xmlParams);
- File basePathFile =
+ final File basePathFile =
FileLocatorUtils.fileFromURL(new URL(xmlParams
.getFileHandler().getBasePath()));
assertEquals("Wrong base path",
@@ -884,14 +885,14 @@ public class TestCombinedConfigurationBu
public void testBasePathForChildConfigurations()
throws ConfigurationException
{
- BaseHierarchicalConfiguration defConfig =
+ final BaseHierarchicalConfiguration defConfig =
new BaseHierarchicalConfiguration();
defConfig.addProperty("properties[@fileName]", "test.properties");
- File deepDir = new File(ConfigurationAssert.TEST_DIR, "config/deep");
+ final File deepDir = new File(ConfigurationAssert.TEST_DIR, "config/deep");
builder.configure(new CombinedBuilderParametersImpl().setBasePath(
deepDir.getAbsolutePath()).setDefinitionBuilder(
new ConstantConfigurationBuilder(defConfig)));
- CombinedConfiguration config = builder.getConfiguration();
+ final CombinedConfiguration config = builder.getConfiguration();
assertEquals("Wrong property value", "somevalue",
config.getString("somekey"));
}
@@ -902,15 +903,15 @@ public class TestCombinedConfigurationBu
@Test
public void testCustomResultConfiguration() throws ConfigurationException
{
- File testFile =
+ final File testFile =
ConfigurationAssert.getTestFile("testCCResultClass.xml");
- ListDelimiterHandler listHandler = new DefaultListDelimiterHandler('.');
+ final ListDelimiterHandler listHandler = new DefaultListDelimiterHandler('.');
builder.configure(new CombinedBuilderParametersImpl()
.setDefinitionBuilderParameters(
new XMLBuilderParametersImpl().setFile(testFile))
.setListDelimiterHandler(listHandler)
.setThrowExceptionOnMissing(false));
- CombinedConfiguration cc = builder.getConfiguration();
+ final CombinedConfiguration cc = builder.getConfiguration();
assertTrue("Wrong configuration class: " + cc.getClass(),
cc instanceof CombinedConfigurationTestImpl);
assertTrue("Wrong exception flag", cc.isThrowExceptionOnMissing());
@@ -926,14 +927,14 @@ public class TestCombinedConfigurationBu
public void testConfigurationBuilderProvider()
throws ConfigurationException
{
- BaseHierarchicalConfiguration defConfig =
+ final BaseHierarchicalConfiguration defConfig =
new BaseHierarchicalConfiguration();
defConfig.addProperty("override.configuration[@fileName]",
TEST_FILE.getAbsolutePath());
builder.configure(new CombinedBuilderParametersImpl()
.setDefinitionBuilder(new ConstantConfigurationBuilder(
defConfig)));
- CombinedConfiguration cc = builder.getConfiguration();
+ final CombinedConfiguration cc = builder.getConfiguration();
assertEquals("Wrong number of configurations", 1,
cc.getNumberOfConfigurations());
checkProperties(cc);
@@ -947,18 +948,18 @@ public class TestCombinedConfigurationBu
public void testConfigurationBuilderProviderInheritBasicProperties()
throws ConfigurationException
{
- File testFile =
+ final File testFile =
ConfigurationAssert
.getTestFile("testCCCombinedChildBuilder.xml");
- ListDelimiterHandler listHandler = new DefaultListDelimiterHandler('*');
- ConfigurationDecoder decoder = EasyMock.createMock(ConfigurationDecoder.class);
+ final ListDelimiterHandler listHandler = new DefaultListDelimiterHandler('*');
+ final ConfigurationDecoder decoder = EasyMock.createMock(ConfigurationDecoder.class);
builder.configure(new CombinedBuilderParametersImpl()
.setDefinitionBuilderParameters(
new XMLBuilderParametersImpl().setFile(testFile))
.setListDelimiterHandler(listHandler)
.setConfigurationDecoder(decoder));
- CombinedConfiguration cc = builder.getConfiguration();
- CombinedConfiguration cc2 =
+ final CombinedConfiguration cc = builder.getConfiguration();
+ final CombinedConfiguration cc2 =
(CombinedConfiguration) cc.getConfiguration("subcc");
assertFalse("Wrong exception flag", cc2.isThrowExceptionOnMissing());
assertEquals("Wrong list delimiter handler", listHandler,
@@ -975,25 +976,27 @@ public class TestCombinedConfigurationBu
throws ConfigurationException
{
@SuppressWarnings("unchecked")
+ final
EventListener<Event> l1 = EasyMock.createNiceMock(EventListener.class);
@SuppressWarnings("unchecked")
+ final
EventListener<ConfigurationEvent> l2 =
EasyMock.createNiceMock(EventListener.class);
EasyMock.replay(l1, l2);
- File testFile =
+ final File testFile =
ConfigurationAssert
.getTestFile("testCCCombinedChildBuilder.xml");
builder.configure(new XMLBuilderParametersImpl().setFile(testFile));
builder.addEventListener(Event.ANY, l1);
builder.addEventListener(ConfigurationEvent.ANY, l2);
- CombinedConfiguration cc = builder.getConfiguration();
- CombinedConfiguration cc2 =
+ final CombinedConfiguration cc = builder.getConfiguration();
+ final CombinedConfiguration cc2 =
(CombinedConfiguration) cc.getConfiguration("subcc");
- Collection<EventListener<? super ConfigurationEvent>> listeners =
+ final Collection<EventListener<? super ConfigurationEvent>> listeners =
cc2.getEventListeners(ConfigurationEvent.ANY);
assertTrue("Listener 1 not found", listeners.contains(l1));
assertTrue("Listener 2 not found", listeners.contains(l2));
- Collection<EventListener<? super Event>> eventListeners =
+ final Collection<EventListener<? super Event>> eventListeners =
cc2.getEventListeners(Event.ANY);
assertEquals("Wrong number of event listeners", 1,
eventListeners.size());
@@ -1012,7 +1015,7 @@ public class TestCombinedConfigurationBu
.setFile(ConfigurationAssert
.getTestFile("testCCCustomProvider.xml")));
builder.getConfiguration();
- CombinedBuilderParametersImpl ccparams =
+ final CombinedBuilderParametersImpl ccparams =
new CombinedBuilderParametersImpl();
builder.initChildBuilderParameters(ccparams);
assertNotNull("Custom provider not found",
@@ -1027,14 +1030,14 @@ public class TestCombinedConfigurationBu
public void testConfigurationBuilderProviderInheritBasePath()
throws ConfigurationException
{
- File envFile =
+ final File envFile =
ConfigurationAssert.getTestFile("testCCEnvProperties.xml");
- String basePath = ConfigurationAssert.OUT_DIR.getAbsolutePath();
+ final String basePath = ConfigurationAssert.OUT_DIR.getAbsolutePath();
builder.configure(new CombinedBuilderParametersImpl().setBasePath(
basePath).setDefinitionBuilderParameters(
createParameters().setFile(envFile)));
builder.getConfiguration();
- CombinedBuilderParametersImpl params =
+ final CombinedBuilderParametersImpl params =
new CombinedBuilderParametersImpl();
builder.initChildBuilderParameters(params);
assertEquals("Base path not set", basePath, params.getBasePath());
@@ -1069,7 +1072,7 @@ public class TestCombinedConfigurationBu
new XPathExpressionEngine())
.setReloadingRefreshDelay(xmlRefresh))));
builder.getConfiguration();
- XMLBuilderParametersImpl params = new XMLBuilderParametersImpl();
+ final XMLBuilderParametersImpl params = new XMLBuilderParametersImpl();
builder.initChildBuilderParameters(params);
assertTrue(
"Wrong expression engine",
@@ -1081,7 +1084,7 @@ public class TestCombinedConfigurationBu
assertEquals("Basic flag not set", Boolean.TRUE, params.getParameters()
.get("throwExceptionOnMissing"));
- PropertiesBuilderParametersImpl params2 =
+ final PropertiesBuilderParametersImpl params2 =
new PropertiesBuilderParametersImpl();
builder.initChildBuilderParameters(params2);
assertEquals("Wrong default refresh", defRefresh,
@@ -1095,13 +1098,13 @@ public class TestCombinedConfigurationBu
@Test
public void testCustomLookup() throws ConfigurationException
{
- File testFile = ConfigurationAssert.getTestFile("testCCLookup.xml");
+ final File testFile = ConfigurationAssert.getTestFile("testCCLookup.xml");
builder.configure(createParameters()
.setFile(testFile));
- CombinedConfiguration cc = builder.getConfiguration();
+ final CombinedConfiguration cc = builder.getConfiguration();
assertTrue("Lookup not registered in CC", cc.getInterpolator()
.getLookups().containsKey("test"));
- Configuration xmlConf = cc.getConfiguration("xml");
+ final Configuration xmlConf = cc.getConfiguration("xml");
assertTrue("Lookup not registered in sub config", xmlConf
.getInterpolator().getLookups().containsKey("test"));
}
@@ -1114,17 +1117,17 @@ public class TestCombinedConfigurationBu
public void testInterpolationOverMultipleSources()
throws ConfigurationException
{
- File testFile =
+ final File testFile =
ConfigurationAssert.getTestFile("testInterpolationBuilder.xml");
builder.configure(createParameters().setFile(testFile));
- CombinedConfiguration combConfig = builder.getConfiguration();
+ final CombinedConfiguration combConfig = builder.getConfiguration();
assertEquals("Wrong value", "abc-product",
combConfig.getString("products.product.desc"));
- XMLConfiguration xmlConfig =
+ final XMLConfiguration xmlConfig =
(XMLConfiguration) combConfig.getConfiguration("test");
assertEquals("Wrong value from XML config", "abc-product",
xmlConfig.getString("products/product/desc"));
- HierarchicalConfiguration<ImmutableNode> subConfig =
+ final HierarchicalConfiguration<ImmutableNode> subConfig =
xmlConfig
.configurationAt("products/product[@name='abc']", true);
assertEquals("Wrong value from sub config", "abc-product",
@@ -1140,7 +1143,7 @@ public class TestCombinedConfigurationBu
builder.configure(createParameters()
.setFile(TEST_FILE));
builder.getConfiguration();
- Collection<ConfigurationBuilder<? extends Configuration>> childBuilders =
+ final Collection<ConfigurationBuilder<? extends Configuration>> childBuilders =
builder.getChildBuilders();
assertEquals("Wrong number of child builders", 3, childBuilders.size());
}
@@ -1157,7 +1160,7 @@ public class TestCombinedConfigurationBu
builder.getConfiguration();
builder.resetResult();
builder.getConfiguration();
- Collection<ConfigurationBuilder<? extends Configuration>> childBuilders =
+ final Collection<ConfigurationBuilder<? extends Configuration>> childBuilders =
builder.getChildBuilders();
assertEquals("Wrong number of child builders", 3, childBuilders.size());
}
@@ -1170,13 +1173,13 @@ public class TestCombinedConfigurationBu
* @return the resulting combined configuration
* @throws ConfigurationException if an error occurs
*/
- private CombinedConfiguration createMultiFileConfig(String fileName)
+ private CombinedConfiguration createMultiFileConfig(final String fileName)
throws ConfigurationException
{
- File testFile = ConfigurationAssert.getTestFile(fileName);
+ final File testFile = ConfigurationAssert.getTestFile(fileName);
builder.configure(createParameters()
.setFile(testFile));
- CombinedConfiguration config = builder.getConfiguration();
+ final CombinedConfiguration config = builder.getConfiguration();
assertTrue("Incorrect result configuration",
config instanceof DynamicCombinedConfiguration);
return config;
@@ -1189,7 +1192,7 @@ public class TestCombinedConfigurationBu
@Test
public void testMultiTenentConfiguration() throws ConfigurationException
{
- CombinedConfiguration config = createMultiFileConfig("testCCMultiTenent.xml");
+ final CombinedConfiguration config = createMultiFileConfig("testCCMultiTenent.xml");
checkMultiFile("1001", config, 15);
checkMultiFile("1002", config, 25);
checkMultiFile("1003", config, 35);
@@ -1204,9 +1207,9 @@ public class TestCombinedConfigurationBu
public void testMultiTenentConfigurationProperties()
throws ConfigurationException
{
- CombinedConfiguration config = createMultiFileConfig("testCCMultiTenent.xml");
+ final CombinedConfiguration config = createMultiFileConfig("testCCMultiTenent.xml");
switchToMultiFile("1001");
- HierarchicalConfiguration<?> multiConf =
+ final HierarchicalConfiguration<?> multiConf =
(HierarchicalConfiguration<?>) config
.getConfiguration("clientConfig");
assertTrue(
@@ -1226,8 +1229,8 @@ public class TestCombinedConfigurationBu
* @param config the configuration to check
* @param rows the expected value of the test property
*/
- private void checkMultiFile(String key, CombinedConfiguration config,
- int rows)
+ private void checkMultiFile(final String key, final CombinedConfiguration config,
+ final int rows)
{
switchToMultiFile(key);
assertEquals("Wrong property value", rows, config.getInt("rowsPerPage"));
@@ -1239,7 +1242,7 @@ public class TestCombinedConfigurationBu
*
* @param key the key to select the desired file
*/
- private static void switchToMultiFile(String key)
+ private static void switchToMultiFile(final String key)
{
System.setProperty(MULTI_FILE_PROPERTY, key);
}
@@ -1251,13 +1254,13 @@ public class TestCombinedConfigurationBu
public void testMultiTenentConfigurationReloading()
throws ConfigurationException, InterruptedException
{
- CombinedConfiguration config =
+ final CombinedConfiguration config =
createMultiFileConfig("testCCMultiTenentReloading.xml");
- File outFile =
+ final File outFile =
ConfigurationAssert.getOutFile("MultiFileReloadingTest.xml");
switchToMultiFile(outFile.getAbsolutePath());
- XMLConfiguration reloadConfig = new XMLConfiguration();
- FileHandler handler = new FileHandler(reloadConfig);
+ final XMLConfiguration reloadConfig = new XMLConfiguration();
+ final FileHandler handler = new FileHandler(reloadConfig);
handler.setFile(outFile);
final String key = "test.reload";
reloadConfig.setProperty(key, "no");
@@ -1265,15 +1268,15 @@ public class TestCombinedConfigurationBu
try
{
assertEquals("Wrong property", "no", config.getString(key));
- ConfigurationBuilder<? extends Configuration> childBuilder =
+ final ConfigurationBuilder<? extends Configuration> childBuilder =
builder.getNamedBuilder("clientConfig");
assertTrue("Not a reloading builder",
childBuilder instanceof ReloadingControllerSupport);
- ReloadingController ctrl =
+ final ReloadingController ctrl =
((ReloadingControllerSupport) childBuilder)
.getReloadingController();
ctrl.checkForReloading(null); // initialize reloading
- BuilderEventListenerImpl l = new BuilderEventListenerImpl();
+ final BuilderEventListenerImpl l = new BuilderEventListenerImpl();
childBuilder.addEventListener(ConfigurationBuilderEvent.RESET, l);
reloadConfig.setProperty(key, "yes");
handler.save();
@@ -1292,9 +1295,9 @@ public class TestCombinedConfigurationBu
assertTrue("No change detected", changeDetected);
assertEquals("Wrong updated property", "yes", builder
.getConfiguration().getString(key));
- ConfigurationBuilderEvent event = l.nextEvent(ConfigurationBuilderEvent.RESET);
+ final ConfigurationBuilderEvent event = l.nextEvent(ConfigurationBuilderEvent.RESET);
l.assertNoMoreEvents();
- BasicConfigurationBuilder<? extends Configuration> multiBuilder =
+ final BasicConfigurationBuilder<? extends Configuration> multiBuilder =
(BasicConfigurationBuilder<? extends Configuration>) event.getSource();
childBuilder.removeEventListener(ConfigurationBuilderEvent.RESET, l);
multiBuilder.resetResult();
@@ -1316,7 +1319,7 @@ public class TestCombinedConfigurationBu
{
builder.configure(createParameters()
.setFile(TEST_FILE));
- CombinedConfiguration cc = builder.getConfiguration();
+ final CombinedConfiguration cc = builder.getConfiguration();
assertNotNull("Root node not initialized", cc.getNodeModel()
.getNodeHandler().getRootNode());
}
@@ -1331,10 +1334,10 @@ public class TestCombinedConfigurationBu
{
builder.configure(createParameters()
.setFile(TEST_FILE));
- CombinedConfiguration config = builder.getConfiguration();
+ final CombinedConfiguration config = builder.getConfiguration();
final int threadCount = 32;
- CountDownLatch startLatch = new CountDownLatch(1);
- ReadThread[] threads = new ReadThread[threadCount];
+ final CountDownLatch startLatch = new CountDownLatch(1);
+ final ReadThread[] threads = new ReadThread[threadCount];
for (int i = 0; i < threadCount; i++)
{
threads[i] = new ReadThread(config, startLatch);
@@ -1342,7 +1345,7 @@ public class TestCombinedConfigurationBu
}
startLatch.countDown();
- for (ReadThread t : threads)
+ for (final ReadThread t : threads)
{
t.verify();
}
@@ -1353,12 +1356,12 @@ public class TestCombinedConfigurationBu
* @param params the {@code Parameters} object
* @return the builder parameters
*/
- private static XMLBuilderParameters prepareParamsForInheritanceTest(Parameters params) {
- DefaultExpressionEngineSymbols symbols = new DefaultExpressionEngineSymbols.Builder(
+ private static XMLBuilderParameters prepareParamsForInheritanceTest(final Parameters params) {
+ final DefaultExpressionEngineSymbols symbols = new DefaultExpressionEngineSymbols.Builder(
DefaultExpressionEngineSymbols.DEFAULT_SYMBOLS)
.setPropertyDelimiter("/").create();
- DefaultExpressionEngine engine = new DefaultExpressionEngine(symbols);
- DefaultListDelimiterHandler listDelimiterHandler = new DefaultListDelimiterHandler(',');
+ final DefaultExpressionEngine engine = new DefaultExpressionEngine(symbols);
+ final DefaultListDelimiterHandler listDelimiterHandler = new DefaultListDelimiterHandler(',');
return params.xml()
.setExpressionEngine(engine)
.setListDelimiterHandler(listDelimiterHandler).setFile(TEST_FILE);
@@ -1370,17 +1373,17 @@ public class TestCombinedConfigurationBu
@Test
public void testInheritProperties() throws ConfigurationException
{
- Parameters params = new Parameters();
- XMLBuilderParameters xmlParams =
+ final Parameters params = new Parameters();
+ final XMLBuilderParameters xmlParams =
prepareParamsForInheritanceTest(params);
builder.configure(xmlParams);
- CombinedConfiguration config = builder.getConfiguration();
+ final CombinedConfiguration config = builder.getConfiguration();
List<String> list = config.getList(String.class, "test/mixed/array");
assertTrue("Wrong number of elements in list", list.size() > 2);
- String[] stringArray = config.getStringArray("test/mixed/array");
+ final String[] stringArray = config.getStringArray("test/mixed/array");
assertTrue("Wrong number of elements in array", stringArray.length > 2);
- XMLConfiguration xmlConfig =
+ final XMLConfiguration xmlConfig =
(XMLConfiguration) config.getConfiguration("xml");
list = xmlConfig.getList(String.class, "split/list1");
assertEquals("Wrong number of elements in XML list", 3, list.size());
@@ -1393,16 +1396,16 @@ public class TestCombinedConfigurationBu
public void testSuppressChildBuilderPropertyInheritance()
throws ConfigurationException
{
- Parameters params = new Parameters();
- CombinedBuilderParameters combinedParams =
+ final Parameters params = new Parameters();
+ final CombinedBuilderParameters combinedParams =
params.combined().setInheritSettings(false);
builder.configure(combinedParams,
prepareParamsForInheritanceTest(params));
- CombinedConfiguration config = builder.getConfiguration();
+ final CombinedConfiguration config = builder.getConfiguration();
- XMLConfiguration xmlConfig =
+ final XMLConfiguration xmlConfig =
(XMLConfiguration) config.getConfiguration("xml");
- List<String> list = xmlConfig.getList(String.class, "split.list1");
+ final List<String> list = xmlConfig.getList(String.class, "split.list1");
assertEquals("Wrong number of elements in XML list", 1, list.size());
}
@@ -1421,16 +1424,16 @@ public class TestCombinedConfigurationBu
return propertyKey;
}
- public void setPropertyKey(String propertyKey)
+ public void setPropertyKey(final String propertyKey)
{
this.propertyKey = propertyKey;
}
@Override
public ConfigurationBuilder<? extends Configuration> getConfigurationBuilder(
- ConfigurationDeclaration decl) throws ConfigurationException
+ final ConfigurationDeclaration decl) throws ConfigurationException
{
- BaseHierarchicalConfiguration config =
+ final BaseHierarchicalConfiguration config =
new BaseHierarchicalConfiguration();
config.addProperty(getPropertyKey(), Boolean.TRUE);
return new ConstantConfigurationBuilder(config);
@@ -1445,7 +1448,7 @@ public class TestCombinedConfigurationBu
{
private final BaseHierarchicalConfiguration configuration;
- public ConstantConfigurationBuilder(BaseHierarchicalConfiguration conf)
+ public ConstantConfigurationBuilder(final BaseHierarchicalConfiguration conf)
{
super(BaseHierarchicalConfiguration.class);
configuration = conf;
@@ -1481,7 +1484,7 @@ public class TestCombinedConfigurationBu
}
@Override
- public void setFileSystem(FileSystem fileSystem)
+ public void setFileSystem(final FileSystem fileSystem)
{
super.setFileSystem(fileSystem);
this.fileSystem = fileSystem;
@@ -1493,7 +1496,7 @@ public class TestCombinedConfigurationBu
}
@Override
- public void setBaseDir(String baseDir)
+ public void setBaseDir(final String baseDir)
{
super.setBaseDir(baseDir);
baseDirectory = baseDir;
@@ -1505,7 +1508,7 @@ public class TestCombinedConfigurationBu
}
@Override
- public void setInterpolator(ConfigurationInterpolator interpolator)
+ public void setInterpolator(final ConfigurationInterpolator interpolator)
{
super.setInterpolator(interpolator);
this.interpolator = interpolator;
@@ -1546,7 +1549,7 @@ public class TestCombinedConfigurationBu
}
@Override
- public String lookup(String key)
+ public String lookup(final String key)
{
return map.get(key);
}
@@ -1567,7 +1570,7 @@ public class TestCombinedConfigurationBu
/** The value read from the configuration. */
private Boolean value;
- public ReadThread(CombinedConfiguration cc, CountDownLatch latch)
+ public ReadThread(final CombinedConfiguration cc, final CountDownLatch latch)
{
config = cc;
startLatch = latch;
@@ -1581,7 +1584,7 @@ public class TestCombinedConfigurationBu
startLatch.await();
value = config.getBoolean("configuration.loaded");
}
- catch (InterruptedException iex)
+ catch (final InterruptedException iex)
{
// ignore
}
@@ -1596,7 +1599,7 @@ public class TestCombinedConfigurationBu
{
join();
}
- catch (InterruptedException iex)
+ catch (final InterruptedException iex)
{
fail("Waiting was interrupted: " + iex);
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilderVFS.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilderVFS.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilderVFS.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestCombinedConfigurationBuilderVFS.java Thu Sep 27 22:24:23 2018
@@ -49,7 +49,7 @@ public class TestCombinedConfigurationBu
@Override
protected FileBasedBuilderParameters createParameters()
{
- FileBasedBuilderParameters params = super.createParameters();
+ final FileBasedBuilderParameters params = super.createParameters();
return params.setFileSystem(new VFSFileSystem());
}
@@ -59,19 +59,19 @@ public class TestCombinedConfigurationBu
@Test
public void testSetConfigurationBasePath() throws ConfigurationException
{
- File deepDir = new File(ConfigurationAssert.TEST_DIR, "config/deep");
- Map<String, Object> params = new HashMap<>();
+ final File deepDir = new File(ConfigurationAssert.TEST_DIR, "config/deep");
+ final Map<String, Object> params = new HashMap<>();
params.put("fileName", "test.properties");
- BaseHierarchicalConfiguration defConfig =
+ final BaseHierarchicalConfiguration defConfig =
createDefinitionConfig("properties", params);
defConfig.addProperty("override.properties.fileSystem[@config-class]",
VFSFileSystem.class.getName());
- BasicConfigurationBuilder<? extends HierarchicalConfiguration<ImmutableNode>> defBuilder =
+ final BasicConfigurationBuilder<? extends HierarchicalConfiguration<ImmutableNode>> defBuilder =
createDefinitionBuilder(defConfig);
builder.configure(new CombinedBuilderParametersImpl()
.setDefinitionBuilder(defBuilder).setBasePath(
deepDir.getAbsolutePath()));
- Configuration config = builder.getConfiguration();
+ final Configuration config = builder.getConfiguration();
assertEquals("Wrong property value", "somevalue",
config.getString("somekey"));
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestConfigurationDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestConfigurationDeclaration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestConfigurationDeclaration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestConfigurationDeclaration.java Thu Sep 27 22:24:23 2018
@@ -41,9 +41,9 @@ public class TestConfigurationDeclaratio
* @return the test object
*/
private static ConfigurationDeclaration createDeclaration(
- HierarchicalConfiguration<?> conf)
+ final HierarchicalConfiguration<?> conf)
{
- HierarchicalConfiguration<?> config =
+ final HierarchicalConfiguration<?> config =
(conf != null) ? conf : new BaseHierarchicalConfiguration();
return new ConfigurationDeclaration(null, config);
}
@@ -54,7 +54,7 @@ public class TestConfigurationDeclaratio
@Test
public void testConfigurationDeclarationIsReserved()
{
- ConfigurationDeclaration decl = createDeclaration(null);
+ final ConfigurationDeclaration decl = createDeclaration(null);
assertTrue("Attribute at not recognized", decl.isReservedAttributeName("at"));
assertTrue("Attribute optional not recognized", decl.isReservedAttributeName("optional"));
assertTrue("Inherited attribute not recognized",
@@ -89,12 +89,12 @@ public class TestConfigurationDeclaratio
*
* @param name the attribute name
*/
- private void checkOldReservedAttribute(String name)
+ private void checkOldReservedAttribute(final String name)
{
- String prefixName = "config-" + name;
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final String prefixName = "config-" + name;
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
config.addProperty(String.format("[@%s]", prefixName), Boolean.TRUE);
- ConfigurationDeclaration decl = createDeclaration(config);
+ final ConfigurationDeclaration decl = createDeclaration(config);
assertTrue(prefixName + " attribute not recognized",
decl.isReservedAttributeName(prefixName));
config.addProperty(String.format("[@%s]", name), Boolean.TRUE);
@@ -111,7 +111,7 @@ public class TestConfigurationDeclaratio
@Test
public void testConfigurationDeclarationGetAttributes()
{
- HierarchicalConfiguration<?> config = new BaseHierarchicalConfiguration();
+ final HierarchicalConfiguration<?> config = new BaseHierarchicalConfiguration();
config.addProperty("xml.fileName", "test.xml");
ConfigurationDeclaration decl =
createDeclaration(config.configurationAt("xml"));
@@ -146,10 +146,10 @@ public class TestConfigurationDeclaratio
@Test(expected = ConfigurationRuntimeException.class)
public void testConfigurationDeclarationOptionalAttributeInvalid()
{
- HierarchicalConfiguration<?> factory = new BaseHierarchicalConfiguration();
+ final HierarchicalConfiguration<?> factory = new BaseHierarchicalConfiguration();
factory.addProperty("xml.fileName", "test.xml");
factory.setProperty("xml[@optional]", "invalid value");
- ConfigurationDeclaration decl =
+ final ConfigurationDeclaration decl =
createDeclaration(factory.configurationAt("xml"));
decl.isOptional();
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestFileExtensionConfigurationBuilderProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestFileExtensionConfigurationBuilderProvider.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestFileExtensionConfigurationBuilderProvider.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestFileExtensionConfigurationBuilderProvider.java Thu Sep 27 22:24:23 2018
@@ -57,7 +57,7 @@ public class TestFileExtensionConfigurat
*/
private static FileExtensionConfigurationBuilderProvider setUpProvider()
{
- FileExtensionConfigurationBuilderProvider provider =
+ final FileExtensionConfigurationBuilderProvider provider =
new FileExtensionConfigurationBuilderProvider(
BasicConfigurationBuilder.class.getName(), null,
MATCH_CLASS, DEF_CLASS, EXT, null);
@@ -71,7 +71,7 @@ public class TestFileExtensionConfigurat
*/
private ConfigurationDeclaration setUpDecl()
{
- ConfigurationDeclaration decl =
+ final ConfigurationDeclaration decl =
EasyMock.createMock(ConfigurationDeclaration.class);
EasyMock.replay(decl);
return decl;
@@ -116,7 +116,7 @@ public class TestFileExtensionConfigurat
@Test
public void testInitSuper()
{
- FileExtensionConfigurationBuilderProvider provider =
+ final FileExtensionConfigurationBuilderProvider provider =
new FileExtensionConfigurationBuilderProvider(
BasicConfigurationBuilder.class.getName(),
ReloadingFileBasedConfigurationBuilder.class.getName(),
@@ -139,8 +139,8 @@ public class TestFileExtensionConfigurat
public void testDetermineConfigurationClassNoParams()
throws ConfigurationException
{
- ConfigurationDeclaration decl = setUpDecl();
- FileExtensionConfigurationBuilderProvider provider = setUpProvider();
+ final ConfigurationDeclaration decl = setUpDecl();
+ final FileExtensionConfigurationBuilderProvider provider = setUpProvider();
assertEquals("Wrong class", DEF_CLASS,
provider.determineConfigurationClass(decl,
new ArrayList<BuilderParameters>()));
@@ -154,11 +154,11 @@ public class TestFileExtensionConfigurat
public void testDetermineConfigurationClassNoExtension()
throws ConfigurationException
{
- ConfigurationDeclaration decl = setUpDecl();
- BuilderParameters params =
+ final ConfigurationDeclaration decl = setUpDecl();
+ final BuilderParameters params =
new FileBasedBuilderParametersImpl()
.setPath("C:\\Test\\someTestConfiguration");
- FileExtensionConfigurationBuilderProvider provider = setUpProvider();
+ final FileExtensionConfigurationBuilderProvider provider = setUpProvider();
assertEquals(
"Wrong class",
DEF_CLASS,
@@ -174,11 +174,11 @@ public class TestFileExtensionConfigurat
public void testDetermineConfigurationClassExtensionNoMatch()
throws ConfigurationException
{
- ConfigurationDeclaration decl = setUpDecl();
- BuilderParameters params =
+ final ConfigurationDeclaration decl = setUpDecl();
+ final BuilderParameters params =
new FileBasedBuilderParametersImpl()
.setPath("C:\\Test\\someTestConfiguration.properties");
- FileExtensionConfigurationBuilderProvider provider = setUpProvider();
+ final FileExtensionConfigurationBuilderProvider provider = setUpProvider();
assertEquals(
"Wrong class",
DEF_CLASS,
@@ -194,9 +194,9 @@ public class TestFileExtensionConfigurat
public void testDeterminieConfigurationClassNoFileName()
throws ConfigurationException
{
- ConfigurationDeclaration decl = setUpDecl();
- BuilderParameters params = new FileBasedBuilderParametersImpl();
- FileExtensionConfigurationBuilderProvider provider = setUpProvider();
+ final ConfigurationDeclaration decl = setUpDecl();
+ final BuilderParameters params = new FileBasedBuilderParametersImpl();
+ final FileExtensionConfigurationBuilderProvider provider = setUpProvider();
assertEquals(
"Wrong class",
DEF_CLASS,
@@ -212,11 +212,11 @@ public class TestFileExtensionConfigurat
public void testDetermineConfigurationClassExtensionMatch()
throws ConfigurationException
{
- ConfigurationDeclaration decl = setUpDecl();
- BuilderParameters params =
+ final ConfigurationDeclaration decl = setUpDecl();
+ final BuilderParameters params =
new FileBasedBuilderParametersImpl()
.setPath("C:\\Test\\someTestConfiguration." + EXT);
- FileExtensionConfigurationBuilderProvider provider = setUpProvider();
+ final FileExtensionConfigurationBuilderProvider provider = setUpProvider();
assertEquals(
"Wrong class",
MATCH_CLASS,
@@ -231,12 +231,12 @@ public class TestFileExtensionConfigurat
public void testDetermineConfigurationClassMatchCase()
throws ConfigurationException
{
- ConfigurationDeclaration decl = setUpDecl();
- BuilderParameters params =
+ final ConfigurationDeclaration decl = setUpDecl();
+ final BuilderParameters params =
new FileBasedBuilderParametersImpl()
.setPath("C:\\Test\\someTestConfiguration."
+ EXT.toUpperCase(Locale.ENGLISH));
- FileExtensionConfigurationBuilderProvider provider = setUpProvider();
+ final FileExtensionConfigurationBuilderProvider provider = setUpProvider();
assertEquals(
"Wrong class",
MATCH_CLASS,
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileBuilderParametersImpl.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileBuilderParametersImpl.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileBuilderParametersImpl.java Thu Sep 27 22:24:23 2018
@@ -66,7 +66,7 @@ public class TestMultiFileBuilderParamet
@Test
public void testFromParametersFound()
{
- Map<String, Object> map = params.getParameters();
+ final Map<String, Object> map = params.getParameters();
assertSame("Instance not found", params,
MultiFileBuilderParametersImpl.fromParameters(map, true));
}
@@ -90,7 +90,7 @@ public class TestMultiFileBuilderParamet
@Test
public void testSetFilePattern()
{
- String pattern = "somePattern";
+ final String pattern = "somePattern";
assertSame("Wrong result", params, params.setFilePattern(pattern));
assertEquals("Pattern not set", pattern, params.getFilePattern());
}
@@ -101,7 +101,7 @@ public class TestMultiFileBuilderParamet
@Test
public void testSetManagedBuilderParameters()
{
- BuilderParameters bp = EasyMock.createMock(BuilderParameters.class);
+ final BuilderParameters bp = EasyMock.createMock(BuilderParameters.class);
EasyMock.replay(bp);
assertSame("Wrong result", params, params.setManagedBuilderParameters(bp));
assertSame("Parameters not set", bp,
@@ -114,14 +114,14 @@ public class TestMultiFileBuilderParamet
@Test
public void testBeanProperties() throws Exception
{
- BuilderParameters bp = EasyMock.createMock(BuilderParameters.class);
+ final BuilderParameters bp = EasyMock.createMock(BuilderParameters.class);
EasyMock.replay(bp);
- String pattern = "testPattern";
+ final String pattern = "testPattern";
BeanHelper.setProperty(params, "filePattern", pattern);
BeanHelper.setProperty(params, "managedBuilderParameters", bp);
BeanHelper.setProperty(params, "throwExceptionOnMissing",
Boolean.TRUE);
- Map<String, Object> map = params.getParameters();
+ final Map<String, Object> map = params.getParameters();
assertEquals("Exception flag not set", Boolean.TRUE,
map.get("throwExceptionOnMissing"));
assertSame("Wrong parameters instance", params,
@@ -137,12 +137,12 @@ public class TestMultiFileBuilderParamet
@Test
public void testClone()
{
- FileBasedBuilderParametersImpl managedParams =
+ final FileBasedBuilderParametersImpl managedParams =
new FileBasedBuilderParametersImpl();
managedParams.setFileName("test.xml");
params.setManagedBuilderParameters(managedParams);
params.setFilePattern("somePattern");
- MultiFileBuilderParametersImpl clone = params.clone();
+ final MultiFileBuilderParametersImpl clone = params.clone();
assertEquals("Wrong pattern", params.getFilePattern(),
clone.getFilePattern());
assertNotSame("Managed parameters not cloned",