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 [27/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/TestMultiFileConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiFileConfigurationBuilder.java Thu Sep 27 22:24:23 2018
@@ -68,7 +68,7 @@ public class TestMultiFileConfigurationB
* @return the test instance
*/
private static MultiFileConfigurationBuilder<XMLConfiguration> createTestBuilder(
- BuilderParameters managedParams)
+ final BuilderParameters managedParams)
{
return new MultiFileConfigurationBuilder<>(
XMLConfiguration.class)
@@ -87,17 +87,17 @@ public class TestMultiFileConfigurationB
private static MultiFileConfigurationBuilder<XMLConfiguration> createBuilderWithAccessToManagedBuilders(
final Collection<FileBasedConfigurationBuilder<XMLConfiguration>> managedBuilders)
{
- MultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final MultiFileConfigurationBuilder<XMLConfiguration> builder =
new MultiFileConfigurationBuilder<XMLConfiguration>(
XMLConfiguration.class)
{
@Override
protected FileBasedConfigurationBuilder<XMLConfiguration> createInitializedManagedBuilder(
- String fileName,
- java.util.Map<String, Object> params)
+ final String fileName,
+ final java.util.Map<String, Object> params)
throws ConfigurationException
{
- FileBasedConfigurationBuilder<XMLConfiguration> result =
+ final FileBasedConfigurationBuilder<XMLConfiguration> result =
super.createInitializedManagedBuilder(fileName,
params);
managedBuilders.add(result);
@@ -114,9 +114,9 @@ public class TestMultiFileConfigurationB
@Test
public void testGetConfiguration() throws ConfigurationException
{
- MultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final MultiFileConfigurationBuilder<XMLConfiguration> builder =
createTestBuilder(null);
- String key = "rowsPerPage";
+ final String key = "rowsPerPage";
switchToConfig(1);
assertEquals("Wrong property (1)", 15, builder.getConfiguration()
.getInt(key));
@@ -135,7 +135,7 @@ public class TestMultiFileConfigurationB
@Test
public void testInterpolatorFromParameters() throws ConfigurationException
{
- BasicBuilderParameters params =
+ final BasicBuilderParameters params =
new MultiFileBuilderParametersImpl().setFilePattern(PATTERN)
.setPrefixLookups(
Collections.singletonMap(
@@ -143,7 +143,7 @@ public class TestMultiFileConfigurationB
.getPrefix(),
DefaultLookups.SYSTEM_PROPERTIES
.getLookup()));
- MultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final MultiFileConfigurationBuilder<XMLConfiguration> builder =
new MultiFileConfigurationBuilder<>(
XMLConfiguration.class);
builder.configure(params);
@@ -159,26 +159,26 @@ public class TestMultiFileConfigurationB
public void testManagedConfigurationSettings()
throws ConfigurationException
{
- MultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final MultiFileConfigurationBuilder<XMLConfiguration> builder =
new MultiFileConfigurationBuilder<>(
XMLConfiguration.class);
- ExpressionEngine engine = new XPathExpressionEngine();
- BuilderParameters xmlParams =
+ final ExpressionEngine engine = new XPathExpressionEngine();
+ final BuilderParameters xmlParams =
new XMLBuilderParametersImpl().setExpressionEngine(engine)
.setListDelimiterHandler(
new DefaultListDelimiterHandler(';'));
- MultiFileBuilderParametersImpl params =
+ final MultiFileBuilderParametersImpl params =
new MultiFileBuilderParametersImpl().setFilePattern(PATTERN)
.setManagedBuilderParameters(xmlParams);
- ConfigurationInterpolator ci = createInterpolator();
+ final ConfigurationInterpolator ci = createInterpolator();
params.setInterpolator(ci).setListDelimiterHandler(
new DefaultListDelimiterHandler('#'));
builder.configure(params);
switchToConfig(1);
- XMLConfiguration config = builder.getConfiguration();
+ final XMLConfiguration config = builder.getConfiguration();
assertSame("Wrong expression engine", engine,
config.getExpressionEngine());
- DefaultListDelimiterHandler listHandler =
+ final DefaultListDelimiterHandler listHandler =
(DefaultListDelimiterHandler) config.getListDelimiterHandler();
assertEquals("Wrong list delimiter", ';', listHandler.getDelimiter());
assertNotSame("Interpolator was copied", ci, config.getInterpolator());
@@ -190,7 +190,7 @@ public class TestMultiFileConfigurationB
@Test
public void testSchemaValidationError()
{
- MultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final MultiFileConfigurationBuilder<XMLConfiguration> builder =
createTestBuilder(new XMLBuilderParametersImpl().setValidating(
true).setSchemaValidation(true));
switchToConfig("2001");
@@ -199,7 +199,7 @@ public class TestMultiFileConfigurationB
builder.getConfiguration();
fail("No exception thrown");
}
- catch (ConfigurationException ex)
+ catch (final ConfigurationException ex)
{
Throwable cause = ex.getCause();
while (cause != null && !(cause instanceof SAXParseException))
@@ -227,12 +227,12 @@ public class TestMultiFileConfigurationB
@Test
public void testFileNotFoundAllowFailOnInit() throws ConfigurationException
{
- BasicBuilderParameters params = createTestBuilderParameters(null);
- MultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final BasicBuilderParameters params = createTestBuilderParameters(null);
+ final MultiFileConfigurationBuilder<XMLConfiguration> builder =
new MultiFileConfigurationBuilder<>(
XMLConfiguration.class, params.getParameters(), true);
switchToConfig("unknown configuration ID");
- XMLConfiguration config = builder.getConfiguration();
+ final XMLConfiguration config = builder.getConfiguration();
assertTrue("Got content", config.isEmpty());
}
@@ -242,10 +242,10 @@ public class TestMultiFileConfigurationB
@Test(expected = ConfigurationException.class)
public void testNoPattern() throws ConfigurationException
{
- BasicBuilderParameters params =
+ final BasicBuilderParameters params =
new MultiFileBuilderParametersImpl()
.setInterpolator(createInterpolator());
- MultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final MultiFileConfigurationBuilder<XMLConfiguration> builder =
new MultiFileConfigurationBuilder<>(
XMLConfiguration.class, params.getParameters(), true);
switchToConfig(1);
@@ -258,16 +258,17 @@ public class TestMultiFileConfigurationB
@Test
public void testAddConfigurationListener() throws ConfigurationException
{
- EventListener<ConfigurationEvent> l1 = new EventListenerTestImpl(null);
+ final EventListener<ConfigurationEvent> l1 = new EventListenerTestImpl(null);
@SuppressWarnings("unchecked")
+ final
EventListener<Event> l2 =
EasyMock.createMock(EventListener.class);
EasyMock.replay(l2);
- MultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final MultiFileConfigurationBuilder<XMLConfiguration> builder =
createTestBuilder(null);
builder.addEventListener(ConfigurationEvent.ANY, l1);
switchToConfig(1);
- XMLConfiguration config = builder.getConfiguration();
+ final XMLConfiguration config = builder.getConfiguration();
assertTrue("Listener not added", config.getEventListeners(ConfigurationEvent.ANY)
.contains(l1));
builder.addEventListener(Event.ANY, l2);
@@ -279,7 +280,7 @@ public class TestMultiFileConfigurationB
assertFalse("Listener not removed", config.getEventListeners(Event.ANY)
.contains(l2));
switchToConfig(2);
- XMLConfiguration config2 = builder.getConfiguration();
+ final XMLConfiguration config2 = builder.getConfiguration();
assertFalse("Listener not globally removed", config2
.getEventListeners(Event.ANY).contains(l2));
}
@@ -290,9 +291,9 @@ public class TestMultiFileConfigurationB
@Test
public void testCaching() throws ConfigurationException
{
- Collection<FileBasedConfigurationBuilder<XMLConfiguration>> managedBuilders =
+ final Collection<FileBasedConfigurationBuilder<XMLConfiguration>> managedBuilders =
new ArrayList<>();
- MultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final MultiFileConfigurationBuilder<XMLConfiguration> builder =
createBuilderWithAccessToManagedBuilders(managedBuilders);
switchToConfig(1);
builder.getConfiguration();
@@ -314,9 +315,9 @@ public class TestMultiFileConfigurationB
@Test
public void testCachingWithReset() throws ConfigurationException
{
- Collection<FileBasedConfigurationBuilder<XMLConfiguration>> managedBuilders =
+ final Collection<FileBasedConfigurationBuilder<XMLConfiguration>> managedBuilders =
new ArrayList<>();
- MultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final MultiFileConfigurationBuilder<XMLConfiguration> builder =
createBuilderWithAccessToManagedBuilders(managedBuilders);
switchToConfig(1);
builder.getConfiguration();
@@ -333,13 +334,13 @@ public class TestMultiFileConfigurationB
@Test
public void testInterpolatorReset()
{
- BasicBuilderParameters params =
+ final BasicBuilderParameters params =
new MultiFileBuilderParametersImpl().setFilePattern(PATTERN);
- MultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final MultiFileConfigurationBuilder<XMLConfiguration> builder =
new MultiFileConfigurationBuilder<>(
XMLConfiguration.class);
builder.configure(params);
- ConfigurationInterpolator interpolator = builder.getInterpolator();
+ final ConfigurationInterpolator interpolator = builder.getInterpolator();
assertNotNull("No interpolator", interpolator);
builder.resetParameters();
assertNotSame("No new interpolator", interpolator,
@@ -352,16 +353,16 @@ public class TestMultiFileConfigurationB
@Test
public void testBuilderListenerReset() throws ConfigurationException
{
- BuilderEventListenerImpl listener = new BuilderEventListenerImpl();
- Collection<FileBasedConfigurationBuilder<XMLConfiguration>> managedBuilders =
+ final BuilderEventListenerImpl listener = new BuilderEventListenerImpl();
+ final Collection<FileBasedConfigurationBuilder<XMLConfiguration>> managedBuilders =
new ArrayList<>();
- MultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final MultiFileConfigurationBuilder<XMLConfiguration> builder =
createBuilderWithAccessToManagedBuilders(managedBuilders);
switchToConfig(1);
builder.addEventListener(ConfigurationBuilderEvent.RESET, listener);
- XMLConfiguration configuration = builder.getConfiguration();
+ final XMLConfiguration configuration = builder.getConfiguration();
managedBuilders.iterator().next().resetResult();
- ConfigurationBuilderEvent event =
+ final ConfigurationBuilderEvent event =
listener.nextEvent(ConfigurationBuilderEvent.RESET);
assertSame("Wrong event source", builder, event.getSource());
assertNotSame("Configuration not reset", configuration,
@@ -376,10 +377,10 @@ public class TestMultiFileConfigurationB
public void testRemoveBuilderListenerOnReset()
throws ConfigurationException
{
- BuilderEventListenerImpl listener = new BuilderEventListenerImpl();
- Collection<FileBasedConfigurationBuilder<XMLConfiguration>> managedBuilders =
+ final BuilderEventListenerImpl listener = new BuilderEventListenerImpl();
+ final Collection<FileBasedConfigurationBuilder<XMLConfiguration>> managedBuilders =
new ArrayList<>();
- MultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final MultiFileConfigurationBuilder<XMLConfiguration> builder =
createBuilderWithAccessToManagedBuilders(managedBuilders);
switchToConfig(1);
builder.addEventListener(ConfigurationBuilderEvent.RESET, listener);
@@ -395,17 +396,17 @@ public class TestMultiFileConfigurationB
@Test
public void testBuilderListenerOtherTypes() throws ConfigurationException
{
- BuilderEventListenerImpl listener = new BuilderEventListenerImpl();
- MultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final BuilderEventListenerImpl listener = new BuilderEventListenerImpl();
+ final MultiFileConfigurationBuilder<XMLConfiguration> builder =
createTestBuilder(null);
builder.addEventListener(ConfigurationBuilderEvent.ANY, listener);
switchToConfig(1);
builder.getConfiguration();
- ConfigurationBuilderEvent event =
+ final ConfigurationBuilderEvent event =
listener.nextEvent(ConfigurationBuilderEvent.CONFIGURATION_REQUEST);
assertEquals("Wrong event source of request event", builder,
event.getSource());
- ConfigurationBuilderResultCreatedEvent createdEvent =
+ final ConfigurationBuilderResultCreatedEvent createdEvent =
listener.nextEvent(ConfigurationBuilderResultCreatedEvent.RESULT_CREATED);
assertEquals("Wrong source of creation event", builder,
createdEvent.getSource());
@@ -420,13 +421,13 @@ public class TestMultiFileConfigurationB
public void testGetManagedBuilderClonedParameters()
throws ConfigurationException
{
- MultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final MultiFileConfigurationBuilder<XMLConfiguration> builder =
createTestBuilder(new XMLBuilderParametersImpl());
switchToConfig(1);
- FileBasedConfigurationBuilder<XMLConfiguration> managedBuilder1 =
+ final FileBasedConfigurationBuilder<XMLConfiguration> managedBuilder1 =
builder.getManagedBuilder();
switchToConfig(2);
- FileBasedConfigurationBuilder<XMLConfiguration> managedBuilder2 =
+ final FileBasedConfigurationBuilder<XMLConfiguration> managedBuilder2 =
builder.getManagedBuilder();
assertNotSame("Managed parameters not cloned",
managedBuilder1.getFileHandler(),
@@ -442,18 +443,18 @@ public class TestMultiFileConfigurationB
@Test
public void testRecursiveInterpolation()
{
- DynamicCombinedConfiguration config =
+ final DynamicCombinedConfiguration config =
new DynamicCombinedConfiguration();
config.setKeyPattern(PATTERN_VAR);
- BasicBuilderParameters params = createTestBuilderParameters(null);
- ConfigurationInterpolator ci = new ConfigurationInterpolator();
+ final BasicBuilderParameters params = createTestBuilderParameters(null);
+ final ConfigurationInterpolator ci = new ConfigurationInterpolator();
ci.addDefaultLookup(new ConfigurationLookup(config));
params.setInterpolator(ci);
- MultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final MultiFileConfigurationBuilder<XMLConfiguration> builder =
new MultiFileConfigurationBuilder<>(
XMLConfiguration.class, null, true);
builder.configure(params);
- BuilderConfigurationWrapperFactory wrapFactory =
+ final BuilderConfigurationWrapperFactory wrapFactory =
new BuilderConfigurationWrapperFactory();
config.addConfiguration(wrapFactory.createBuilderConfigurationWrapper(
HierarchicalConfiguration.class, builder), "Multi");
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiWrapDynaBean.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiWrapDynaBean.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiWrapDynaBean.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestMultiWrapDynaBean.java Thu Sep 27 22:24:23 2018
@@ -60,11 +60,11 @@ public class TestMultiWrapDynaBean
* wrapped beans
* @return the test bean
*/
- private MultiWrapDynaBean createBean(boolean withDynaBean)
+ private MultiWrapDynaBean createBean(final boolean withDynaBean)
{
params = new BasicBuilderParameters();
wrapBean = new WrappedBeanTestImpl();
- Collection<Object> beans = new ArrayList<>();
+ final Collection<Object> beans = new ArrayList<>();
beans.add(params);
beans.add(wrapBean);
if (withDynaBean)
@@ -94,8 +94,8 @@ public class TestMultiWrapDynaBean
@Test
public void testGetSimpleProperty() throws Exception
{
- MultiWrapDynaBean bean = createBean(false);
- String text = "testText";
+ final MultiWrapDynaBean bean = createBean(false);
+ final String text = "testText";
wrapBean.setText(text);
assertEquals("Wrong value", text,
PropertyUtils.getProperty(bean, "text"));
@@ -118,7 +118,7 @@ public class TestMultiWrapDynaBean
@Test
public void testGetIndexedProperty() throws Exception
{
- MultiWrapDynaBean bean = createBean(false);
+ final MultiWrapDynaBean bean = createBean(false);
wrapBean.setIndexedProperty(3, 20121117);
assertEquals("Wrong value", 20121117,
PropertyUtils.getIndexedProperty(bean, "indexedProperty", 3));
@@ -130,9 +130,9 @@ public class TestMultiWrapDynaBean
@Test
public void testSetMappedProperty() throws Exception
{
- MultiWrapDynaBean bean = createBean(true);
- String key = "testKey";
- String text = "Hello World";
+ final MultiWrapDynaBean bean = createBean(true);
+ final String key = "testKey";
+ final String text = "Hello World";
PropertyUtils.setMappedProperty(bean, MAPPED_PROPERTY, key, text);
assertEquals("Property not set", text,
wrapDynaBean.get(MAPPED_PROPERTY, key));
@@ -144,9 +144,9 @@ public class TestMultiWrapDynaBean
@Test
public void testGetMappedProperty() throws Exception
{
- MultiWrapDynaBean bean = createBean(true);
- String key = "testKey";
- String value = "Hello World";
+ final MultiWrapDynaBean bean = createBean(true);
+ final String key = "testKey";
+ final String value = "Hello World";
wrapDynaBean.set(MAPPED_PROPERTY, key, value);
assertEquals("Wrong value", value,
PropertyUtils.getMappedProperty(bean, MAPPED_PROPERTY, key));
@@ -167,7 +167,7 @@ public class TestMultiWrapDynaBean
@Test
public void testGetDynaClass()
{
- DynaClass cls = createBean(false).getDynaClass();
+ final DynaClass cls = createBean(false).getDynaClass();
assertNotNull("Property not found (1)",
cls.getDynaProperty("throwExceptionOnMissing"));
assertNotNull("Property not found (2)", cls.getDynaProperty("text"));
@@ -217,7 +217,7 @@ public class TestMultiWrapDynaBean
@Test
public void testOrderOfProperties() throws Exception
{
- Collection<Object> beans = new ArrayList<>();
+ final Collection<Object> beans = new ArrayList<>();
params = new BasicBuilderParameters();
beans.add(params);
beans.add(new FileBasedBuilderParametersImpl());
@@ -225,13 +225,13 @@ public class TestMultiWrapDynaBean
{
beans.add(new BasicBuilderParameters());
}
- MultiWrapDynaBean bean = new MultiWrapDynaBean(beans);
- ListDelimiterHandler listHandler = new DefaultListDelimiterHandler('+');
+ final MultiWrapDynaBean bean = new MultiWrapDynaBean(beans);
+ final ListDelimiterHandler listHandler = new DefaultListDelimiterHandler('+');
PropertyUtils
.setProperty(bean, "throwExceptionOnMissing", Boolean.TRUE);
PropertyUtils
.setProperty(bean, "listDelimiterHandler", listHandler);
- Map<String, Object> map = params.getParameters();
+ final Map<String, Object> map = params.getParameters();
assertEquals("Exception flag not set", Boolean.TRUE,
map.get("throwExceptionOnMissing"));
assertEquals("List delimiter handler not set", listHandler,
@@ -253,22 +253,22 @@ public class TestMultiWrapDynaBean
/** A simple property. */
private String text;
- public String getMapProperty(String key)
+ public String getMapProperty(final String key)
{
return mapProperties.get(key);
}
- public void setMapProperty(String key, String value)
+ public void setMapProperty(final String key, final String value)
{
mapProperties.put(key, value);
}
- public int getIndexedProperty(int idx)
+ public int getIndexedProperty(final int idx)
{
return indexedValues[idx];
}
- public void setIndexedProperty(int idx, int value)
+ public void setIndexedProperty(final int idx, final int value)
{
indexedValues[idx] = value;
}
@@ -278,7 +278,7 @@ public class TestMultiWrapDynaBean
return text;
}
- public void setText(String text)
+ public void setText(final String text)
{
this.text = text;
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilder.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilder.java Thu Sep 27 22:24:23 2018
@@ -58,7 +58,7 @@ public class TestReloadingCombinedConfig
@Test
public void testNoReloadableSources() throws ConfigurationException
{
- File testFile =
+ final File testFile =
ConfigurationAssert
.getTestFile("testDigesterConfiguration.xml");
builder.configure(new CombinedBuilderParametersImpl()
@@ -68,7 +68,7 @@ public class TestReloadingCombinedConfig
.setDefinitionBuilderParameters(
new FileBasedBuilderParametersImpl().setFile(testFile)));
builder.getConfiguration();
- CombinedReloadingController rc =
+ final CombinedReloadingController rc =
(CombinedReloadingController) builder.getReloadingController();
assertTrue("Got sub reloading controllers", rc.getSubControllers()
.isEmpty());
@@ -81,20 +81,20 @@ public class TestReloadingCombinedConfig
@Test
public void testReloadableDefinitionBuilder() throws ConfigurationException
{
- File testFile =
+ final File testFile =
ConfigurationAssert
.getTestFile("testDigesterConfiguration.xml");
- ReloadingCombinedConfigurationBuilder confBuilder =
+ final ReloadingCombinedConfigurationBuilder confBuilder =
builder.configure(new FileBasedBuilderParametersImpl()
.setFile(testFile));
assertSame("Wrong configured builder instance", builder, confBuilder);
builder.getConfiguration();
- CombinedReloadingController rc =
+ final CombinedReloadingController rc =
(CombinedReloadingController) builder.getReloadingController();
- Collection<ReloadingController> subControllers = rc.getSubControllers();
+ final Collection<ReloadingController> subControllers = rc.getSubControllers();
assertEquals("Wrong number of sub controllers", 1,
subControllers.size());
- ReloadingController subctrl =
+ final ReloadingController subctrl =
((ReloadingControllerSupport) builder.getDefinitionBuilder())
.getReloadingController();
assertSame("Wrong sub controller", subctrl, subControllers.iterator()
@@ -108,21 +108,21 @@ public class TestReloadingCombinedConfig
@Test
public void testNestedReloadableSources() throws ConfigurationException
{
- File testFile =
+ final File testFile =
ConfigurationAssert.getTestFile("testCCReloadingNested.xml");
builder.configure(new FileBasedBuilderParametersImpl()
.setFile(testFile));
builder.getConfiguration();
- CombinedReloadingController rc =
+ final CombinedReloadingController rc =
(CombinedReloadingController) builder.getReloadingController();
- Collection<ReloadingController> subControllers = rc.getSubControllers();
+ final Collection<ReloadingController> subControllers = rc.getSubControllers();
assertEquals("Wrong number of sub controllers", 2,
subControllers.size());
- ReloadingControllerSupport ccBuilder =
+ final ReloadingControllerSupport ccBuilder =
(ReloadingControllerSupport) builder.getNamedBuilder("cc");
assertTrue("Sub controller not found",
subControllers.contains(ccBuilder.getReloadingController()));
- CombinedReloadingController rc2 =
+ final CombinedReloadingController rc2 =
(CombinedReloadingController) ccBuilder
.getReloadingController();
assertEquals("Wrong number of sub controllers (2)", 3, rc2
@@ -135,14 +135,14 @@ public class TestReloadingCombinedConfig
@Test
public void testInitWithParameters() throws ConfigurationException
{
- FileBasedBuilderParametersImpl params =
+ final FileBasedBuilderParametersImpl params =
new FileBasedBuilderParametersImpl();
params.setFile(ConfigurationAssert
.getTestFile("testDigesterConfiguration.xml"));
builder =
new ReloadingCombinedConfigurationBuilder(
params.getParameters());
- CombinedConfiguration cc = builder.getConfiguration();
+ final CombinedConfiguration cc = builder.getConfiguration();
assertTrue("Property not found", cc.getBoolean("test.boolean"));
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingCombinedConfigurationBuilderFileBased.java Thu Sep 27 22:24:23 2018
@@ -94,7 +94,7 @@ public class TestReloadingCombinedConfig
* @param config the definition configuration
* @param fileName the name of the file
*/
- private static void addReloadSource(Configuration config, String fileName)
+ private static void addReloadSource(final Configuration config, final String fileName)
{
config.addProperty(PROP_SRC + "(-1)[@fileName]", fileName);
config.addProperty(PROP_SRC + "[@config-reload]", Boolean.TRUE);
@@ -107,7 +107,7 @@ public class TestReloadingCombinedConfig
* @param content the file's content
* @throws IOException if an error occurs
*/
- private static void writeFile(File file, String content) throws IOException
+ private static void writeFile(final File file, final String content) throws IOException
{
PrintWriter out = null;
try
@@ -134,9 +134,9 @@ public class TestReloadingCombinedConfig
* @return the <code>File</code> object for the test file
* @throws IOException if an error occurs
*/
- private File writeReloadFile(File f, String content) throws IOException
+ private File writeReloadFile(final File f, final String content) throws IOException
{
- File file = (f != null) ? f : folder.newFile();
+ final File file = (f != null) ? f : folder.newFile();
writeFile(file, content);
return file;
}
@@ -150,7 +150,7 @@ public class TestReloadingCombinedConfig
* @return the file that was written
* @throws IOException if an error occurs
*/
- private File writeReloadFile(File f, int tagIdx, int value)
+ private File writeReloadFile(final File f, final int tagIdx, final int value)
throws IOException
{
return writeReloadFile(f,
@@ -163,7 +163,7 @@ public class TestReloadingCombinedConfig
* @param idx the index of the property
* @return the test property with this index
*/
- private static String testProperty(int idx)
+ private static String testProperty(final int idx)
{
return PROP_RELOAD + idx;
}
@@ -174,21 +174,21 @@ public class TestReloadingCombinedConfig
@Test
public void testReloadFromFile() throws ConfigurationException, IOException
{
- File xmlConf1 = writeReloadFile(null, 1, 0);
- File xmlConf2 = writeReloadFile(null, 2, 0);
- ReloadingDetectorFactory detectorFactory =
+ final File xmlConf1 = writeReloadFile(null, 1, 0);
+ final File xmlConf2 = writeReloadFile(null, 2, 0);
+ final ReloadingDetectorFactory detectorFactory =
new ReloadingDetectorFactory()
{
@Override
public ReloadingDetector createReloadingDetector(
- FileHandler handler,
- FileBasedBuilderParametersImpl params)
+ final FileHandler handler,
+ final FileBasedBuilderParametersImpl params)
throws ConfigurationException
{
return new AlwaysReloadingDetector();
}
};
- BaseHierarchicalConfiguration defConf = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration defConf = new BaseHierarchicalConfiguration();
addReloadSource(defConf, xmlConf1.getAbsolutePath());
addReloadSource(defConf, xmlConf2.getAbsolutePath());
builder.configure(parameters
@@ -230,26 +230,26 @@ public class TestReloadingCombinedConfig
{
final int threadCount = 4;
final int loopCount = 100;
- ReloadingDetectorFactory detectorFactory =
+ final ReloadingDetectorFactory detectorFactory =
new ReloadingDetectorFactory()
{
@Override
public ReloadingDetector createReloadingDetector(
- FileHandler handler,
- FileBasedBuilderParametersImpl params)
+ final FileHandler handler,
+ final FileBasedBuilderParametersImpl params)
throws ConfigurationException
{
return new RandomReloadingDetector();
}
};
- BaseHierarchicalConfiguration defConf = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration defConf = new BaseHierarchicalConfiguration();
defConf.addProperty("header.result.nodeCombiner[@config-class]",
MergeCombiner.class.getName());
defConf.addProperty("header.result.expressionEngine[@config-class]",
XPathExpressionEngine.class.getName());
addReloadSource(defConf, "configA.xml");
addReloadSource(defConf, "configB.xml");
- Synchronizer sync = new ReadWriteSynchronizer();
+ final Synchronizer sync = new ReadWriteSynchronizer();
builder.configure(parameters
.combined()
.setDefinitionBuilder(new ConstantConfigurationBuilder(defConf))
@@ -268,8 +268,8 @@ public class TestReloadingCombinedConfig
assertEquals("Wrong initial value", "100", builder.getConfiguration()
.getString("/property[@name='config']/@value"));
- Thread testThreads[] = new Thread[threadCount];
- int failures[] = new int[threadCount];
+ final Thread testThreads[] = new Thread[threadCount];
+ final int failures[] = new int[threadCount];
for (int i = 0; i < testThreads.length; ++i)
{
@@ -296,11 +296,11 @@ public class TestReloadingCombinedConfig
* @throws ConfigurationException if a configuration-related error occurs
* @throws InterruptedException if waiting is interrupted
*/
- private void checkReloadDefinitionFile(File defFile) throws IOException,
+ private void checkReloadDefinitionFile(final File defFile) throws IOException,
ConfigurationException, InterruptedException
{
- File src1 = writeReloadFile(null, 1, 0);
- File src2 = writeReloadFile(null, 1, 1);
+ final File src1 = writeReloadFile(null, 1, 0);
+ final File src2 = writeReloadFile(null, 1, 1);
writeDefinitionFile(defFile, src1);
CombinedConfiguration config = builder.getConfiguration();
assertEquals("Wrong initial value", 0, config.getInt(testProperty(1)));
@@ -330,7 +330,7 @@ public class TestReloadingCombinedConfig
public void testReloadDefinitionFileExplicitBuilder()
throws ConfigurationException, IOException, InterruptedException
{
- File defFile = folder.newFile();
+ final File defFile = folder.newFile();
builder.configure(parameters.combined().setDefinitionBuilder(
new ReloadingFileBasedConfigurationBuilder<>(
XMLConfiguration.class).configure(parameters.xml()
@@ -346,7 +346,7 @@ public class TestReloadingCombinedConfig
public void testReloadDefinitionFileDefaultBuilder()
throws ConfigurationException, IOException, InterruptedException
{
- File defFile = folder.newFile();
+ final File defFile = folder.newFile();
builder.configure(parameters.combined().setDefinitionBuilderParameters(
parameters.xml().setReloadingRefreshDelay(0L).setFile(defFile)));
checkReloadDefinitionFile(defFile);
@@ -360,10 +360,10 @@ public class TestReloadingCombinedConfig
* @param src the configuration source file to be referenced
* @throws ConfigurationException if an error occurs
*/
- private void writeDefinitionFile(File defFile, File src)
+ private void writeDefinitionFile(final File defFile, final File src)
throws ConfigurationException
{
- XMLConfiguration defConf = new XMLConfiguration();
+ final XMLConfiguration defConf = new XMLConfiguration();
addReloadSource(defConf, src.getAbsolutePath());
new FileHandler(defConf).save(defFile);
}
@@ -376,7 +376,7 @@ public class TestReloadingCombinedConfig
{
private final BaseHierarchicalConfiguration configuration;
- public ConstantConfigurationBuilder(BaseHierarchicalConfiguration conf)
+ public ConstantConfigurationBuilder(final BaseHierarchicalConfiguration conf)
{
super(BaseHierarchicalConfiguration.class);
configuration = conf;
@@ -407,8 +407,8 @@ public class TestReloadingCombinedConfig
/** The number of test operations. */
private final int count;
- ReloadThread(ReloadingCombinedConfigurationBuilder bldr,
- int[] failures, int index, int count)
+ ReloadThread(final ReloadingCombinedConfigurationBuilder bldr,
+ final int[] failures, final int index, final int count)
{
builder = bldr;
this.failures = failures;
@@ -425,7 +425,7 @@ public class TestReloadingCombinedConfig
try
{
builder.getReloadingController().checkForReloading(null);
- String value =
+ final String value =
builder.getConfiguration().getString(
"/property[@name='config']/@value");
if (value == null || !value.equals("100"))
@@ -433,7 +433,7 @@ public class TestReloadingCombinedConfig
++failures[index];
}
}
- catch (Exception ex)
+ catch (final Exception ex)
{
++failures[index];
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingMultiFileConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingMultiFileConfigurationBuilder.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingMultiFileConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestReloadingMultiFileConfigurationBuilder.java Thu Sep 27 22:24:23 2018
@@ -52,15 +52,15 @@ public class TestReloadingMultiFileConfi
@Test
public void testInitWithParameters() throws ConfigurationException
{
- ExpressionEngine engine = new XPathExpressionEngine();
- BasicBuilderParameters params =
+ final ExpressionEngine engine = new XPathExpressionEngine();
+ final BasicBuilderParameters params =
createTestBuilderParameters(new XMLBuilderParametersImpl()
.setExpressionEngine(engine));
- ReloadingMultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final ReloadingMultiFileConfigurationBuilder<XMLConfiguration> builder =
new ReloadingMultiFileConfigurationBuilder<>(
XMLConfiguration.class, params.getParameters());
switchToConfig(1);
- XMLConfiguration config = builder.getConfiguration();
+ final XMLConfiguration config = builder.getConfiguration();
assertSame("Expression engine not set", engine,
config.getExpressionEngine());
}
@@ -71,10 +71,10 @@ public class TestReloadingMultiFileConfi
@Test
public void testCreateManagedBuilder() throws ConfigurationException
{
- ReloadingMultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final ReloadingMultiFileConfigurationBuilder<XMLConfiguration> builder =
new ReloadingMultiFileConfigurationBuilder<>(
XMLConfiguration.class);
- FileBasedConfigurationBuilder<XMLConfiguration> managedBuilder =
+ final FileBasedConfigurationBuilder<XMLConfiguration> managedBuilder =
builder.createManagedBuilder("test.xml",
createTestBuilderParameters(null).getParameters());
assertTrue(
@@ -91,10 +91,10 @@ public class TestReloadingMultiFileConfi
public void testCreateManagedBuilderWithAllowFailFlag()
throws ConfigurationException
{
- ReloadingMultiFileConfigurationBuilder<XMLConfiguration> builder =
+ final ReloadingMultiFileConfigurationBuilder<XMLConfiguration> builder =
new ReloadingMultiFileConfigurationBuilder<>(
XMLConfiguration.class, null, true);
- FileBasedConfigurationBuilder<XMLConfiguration> managedBuilder =
+ final FileBasedConfigurationBuilder<XMLConfiguration> managedBuilder =
builder.createManagedBuilder("test.xml",
createTestBuilderParameters(null).getParameters());
assertTrue("Wrong flag value", managedBuilder.isAllowFailOnInit());
@@ -106,18 +106,18 @@ public class TestReloadingMultiFileConfi
@Test
public void testReloadingControllerCheck() throws ConfigurationException
{
- ReloadingMultiFileConfigurationBuilderTestImpl builder =
+ final ReloadingMultiFileConfigurationBuilderTestImpl builder =
new ReloadingMultiFileConfigurationBuilderTestImpl();
switchToConfig(1);
builder.getConfiguration();
switchToConfig(2);
builder.getConfiguration();
- List<ReloadingController> controllers =
+ final List<ReloadingController> controllers =
builder.getReloadingControllers();
assertEquals("Wrong number of reloading controllers", 2,
controllers.size());
EasyMock.reset(controllers.toArray());
- for (ReloadingController c : controllers)
+ for (final ReloadingController c : controllers)
{
EasyMock.expect(c.checkForReloading(null)).andReturn(Boolean.FALSE);
}
@@ -134,14 +134,14 @@ public class TestReloadingMultiFileConfi
public void testReloadingControllerCheckReloadingRequired()
throws ConfigurationException
{
- ReloadingMultiFileConfigurationBuilderTestImpl builder =
+ final ReloadingMultiFileConfigurationBuilderTestImpl builder =
new ReloadingMultiFileConfigurationBuilderTestImpl();
for (int i = 1; i <= 3; i++)
{
switchToConfig(i);
builder.getConfiguration();
}
- List<ReloadingController> controllers =
+ final List<ReloadingController> controllers =
builder.getReloadingControllers();
EasyMock.reset(controllers.toArray());
EasyMock.expect(controllers.get(0).checkForReloading(null))
@@ -164,16 +164,16 @@ public class TestReloadingMultiFileConfi
public void testReloadingControllerResetReloadingState()
throws ConfigurationException
{
- ReloadingMultiFileConfigurationBuilderTestImpl builder =
+ final ReloadingMultiFileConfigurationBuilderTestImpl builder =
new ReloadingMultiFileConfigurationBuilderTestImpl();
switchToConfig(1);
builder.getConfiguration();
switchToConfig(2);
builder.getConfiguration();
- List<ReloadingController> controllers =
+ final List<ReloadingController> controllers =
builder.getReloadingControllers();
EasyMock.reset(controllers.toArray());
- for (ReloadingController c : controllers)
+ for (final ReloadingController c : controllers)
{
EasyMock.expect(c.checkForReloading(null)).andReturn(Boolean.TRUE)
.anyTimes();
@@ -223,7 +223,7 @@ public class TestReloadingMultiFileConfi
*/
@Override
protected FileBasedConfigurationBuilder<XMLConfiguration> createManagedBuilder(
- String fileName, Map<String, Object> params)
+ final String fileName, final Map<String, Object> params)
throws ConfigurationException
{
final ReloadingController ctrl =
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/fluent/TestConfigurations.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/fluent/TestConfigurations.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/fluent/TestConfigurations.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/fluent/TestConfigurations.java Thu Sep 27 22:24:23 2018
@@ -63,7 +63,7 @@ public class TestConfigurations
* @param name the name of the test file
* @return the full path to this file
*/
- private static String filePath(String name)
+ private static String filePath(final String name)
{
return ConfigurationAssert.getTestFile(name).getAbsolutePath();
}
@@ -75,7 +75,7 @@ public class TestConfigurations
@Test
public void testDefaultParameters()
{
- Configurations configs = new Configurations();
+ final Configurations configs = new Configurations();
assertNotNull("No parameters", configs.getParameters());
}
@@ -85,8 +85,8 @@ public class TestConfigurations
@Test
public void testInitWithParameters()
{
- Parameters params = new Parameters();
- Configurations configs = new Configurations(params);
+ final Parameters params = new Parameters();
+ final Configurations configs = new Configurations(params);
assertSame("Wrong parameters", params, configs.getParameters());
}
@@ -97,9 +97,9 @@ public class TestConfigurations
@Test
public void testFileBasedBuilderWithFile()
{
- Configurations configs = new Configurations();
- File file = ConfigurationAssert.getTestFile(TEST_PROPERTIES);
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final Configurations configs = new Configurations();
+ final File file = ConfigurationAssert.getTestFile(TEST_PROPERTIES);
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
configs.fileBasedBuilder(PropertiesConfiguration.class, file);
assertEquals("Wrong file", file.toURI(), builder.getFileHandler()
.getFile().toURI());
@@ -112,9 +112,9 @@ public class TestConfigurations
@Test
public void testFileBasedBuilderWithURL()
{
- Configurations configs = new Configurations();
- URL url = ConfigurationAssert.getTestURL("test.properties");
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final Configurations configs = new Configurations();
+ final URL url = ConfigurationAssert.getTestURL("test.properties");
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
configs.fileBasedBuilder(PropertiesConfiguration.class, url);
assertEquals("Wrong URL", url, builder.getFileHandler().getURL());
}
@@ -126,9 +126,9 @@ public class TestConfigurations
@Test
public void testFileBasedBuilderWithPath()
{
- Configurations configs = new Configurations();
- String filePath = filePath(TEST_PROPERTIES);
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final Configurations configs = new Configurations();
+ final String filePath = filePath(TEST_PROPERTIES);
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
configs.fileBasedBuilder(PropertiesConfiguration.class,
filePath);
assertEquals("Wrong path", filePath, builder.getFileHandler()
@@ -140,7 +140,7 @@ public class TestConfigurations
*
* @param config the configuration instance to be checked.
*/
- private static void checkPList(Configuration config)
+ private static void checkPList(final Configuration config)
{
assertEquals("string1", config.getProperty("simple-string"));
}
@@ -151,8 +151,8 @@ public class TestConfigurations
@Test
public void testFileBasedFile() throws ConfigurationException
{
- Configurations configs = new Configurations();
- PropertyListConfiguration config =
+ final Configurations configs = new Configurations();
+ final PropertyListConfiguration config =
configs.fileBased(PropertyListConfiguration.class,
ConfigurationAssert.getTestFile(TEST_PLIST));
checkPList(config);
@@ -164,8 +164,8 @@ public class TestConfigurations
@Test
public void testFileBasedURL() throws ConfigurationException
{
- Configurations configs = new Configurations();
- PropertyListConfiguration config =
+ final Configurations configs = new Configurations();
+ final PropertyListConfiguration config =
configs.fileBased(PropertyListConfiguration.class,
ConfigurationAssert.getTestURL(TEST_PLIST));
checkPList(config);
@@ -177,8 +177,8 @@ public class TestConfigurations
@Test
public void testFileBasedPath() throws ConfigurationException
{
- Configurations configs = new Configurations();
- PropertyListConfiguration config =
+ final Configurations configs = new Configurations();
+ final PropertyListConfiguration config =
configs.fileBased(PropertyListConfiguration.class,
filePath(TEST_PLIST));
checkPList(config);
@@ -189,7 +189,7 @@ public class TestConfigurations
*
* @param config the configuration instance to be checked.
*/
- private static void checkProperties(Configuration config)
+ private static void checkProperties(final Configuration config)
{
assertEquals("true", config.getString("configuration.loaded"));
}
@@ -201,8 +201,8 @@ public class TestConfigurations
@Test
public void testPropertiesBuilderFromFile() throws ConfigurationException
{
- Configurations configs = new Configurations();
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final Configurations configs = new Configurations();
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
configs.propertiesBuilder(ConfigurationAssert
.getTestFile(TEST_PROPERTIES));
checkProperties(builder.getConfiguration());
@@ -214,8 +214,8 @@ public class TestConfigurations
@Test
public void testPropertiesFromFile() throws ConfigurationException
{
- Configurations configs = new Configurations();
- PropertiesConfiguration config =
+ final Configurations configs = new Configurations();
+ final PropertiesConfiguration config =
configs.properties(ConfigurationAssert
.getTestFile(TEST_PROPERTIES));
checkProperties(config);
@@ -228,8 +228,8 @@ public class TestConfigurations
@Test
public void testPropertiesBuilderFromURL() throws ConfigurationException
{
- Configurations configs = new Configurations();
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final Configurations configs = new Configurations();
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
configs.propertiesBuilder(ConfigurationAssert
.getTestURL(TEST_PROPERTIES));
checkProperties(builder.getConfiguration());
@@ -241,8 +241,8 @@ public class TestConfigurations
@Test
public void testPropertiesFromURL() throws ConfigurationException
{
- Configurations configs = new Configurations();
- PropertiesConfiguration config =
+ final Configurations configs = new Configurations();
+ final PropertiesConfiguration config =
configs.properties(ConfigurationAssert
.getTestURL(TEST_PROPERTIES));
checkProperties(config);
@@ -255,8 +255,8 @@ public class TestConfigurations
@Test
public void testPropertiesBuilderFromPath() throws ConfigurationException
{
- Configurations configs = new Configurations();
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final Configurations configs = new Configurations();
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
configs.propertiesBuilder(filePath(TEST_PROPERTIES));
checkProperties(builder.getConfiguration());
}
@@ -267,8 +267,8 @@ public class TestConfigurations
@Test
public void testPropertiesFromPath() throws ConfigurationException
{
- Configurations configs = new Configurations();
- PropertiesConfiguration config =
+ final Configurations configs = new Configurations();
+ final PropertiesConfiguration config =
configs.properties(filePath(TEST_PROPERTIES));
checkProperties(config);
}
@@ -278,7 +278,7 @@ public class TestConfigurations
*
* @param config the configuration instance to be checked.
*/
- private static void checkXML(Configuration config)
+ private static void checkXML(final Configuration config)
{
assertEquals("value", config.getProperty("element"));
}
@@ -290,8 +290,8 @@ public class TestConfigurations
@Test
public void testXMLBuilderFromFile() throws ConfigurationException
{
- Configurations configs = new Configurations();
- FileBasedConfigurationBuilder<XMLConfiguration> builder =
+ final Configurations configs = new Configurations();
+ final FileBasedConfigurationBuilder<XMLConfiguration> builder =
configs.xmlBuilder(ConfigurationAssert.getTestFile(TEST_XML));
checkXML(builder.getConfiguration());
}
@@ -302,8 +302,8 @@ public class TestConfigurations
@Test
public void testXMLFromFile() throws ConfigurationException
{
- Configurations configs = new Configurations();
- XMLConfiguration config =
+ final Configurations configs = new Configurations();
+ final XMLConfiguration config =
configs.xml(ConfigurationAssert.getTestFile(TEST_XML));
checkXML(config);
}
@@ -315,8 +315,8 @@ public class TestConfigurations
@Test
public void testXMLBuilderFromURL() throws ConfigurationException
{
- Configurations configs = new Configurations();
- FileBasedConfigurationBuilder<XMLConfiguration> builder =
+ final Configurations configs = new Configurations();
+ final FileBasedConfigurationBuilder<XMLConfiguration> builder =
configs.xmlBuilder(ConfigurationAssert.getTestURL(TEST_XML));
checkXML(builder.getConfiguration());
}
@@ -327,8 +327,8 @@ public class TestConfigurations
@Test
public void testXMLFromURL() throws ConfigurationException
{
- Configurations configs = new Configurations();
- XMLConfiguration config =
+ final Configurations configs = new Configurations();
+ final XMLConfiguration config =
configs.xml(ConfigurationAssert.getTestURL(TEST_XML));
checkXML(config);
}
@@ -340,8 +340,8 @@ public class TestConfigurations
@Test
public void testXMLBuilderFromPath() throws ConfigurationException
{
- Configurations configs = new Configurations();
- FileBasedConfigurationBuilder<XMLConfiguration> builder =
+ final Configurations configs = new Configurations();
+ final FileBasedConfigurationBuilder<XMLConfiguration> builder =
configs.xmlBuilder(filePath(TEST_XML));
checkXML(builder.getConfiguration());
}
@@ -352,8 +352,8 @@ public class TestConfigurations
@Test
public void testXMLFromPath() throws ConfigurationException
{
- Configurations configs = new Configurations();
- XMLConfiguration config = configs.xml(filePath(TEST_XML));
+ final Configurations configs = new Configurations();
+ final XMLConfiguration config = configs.xml(filePath(TEST_XML));
checkXML(config);
}
@@ -362,7 +362,7 @@ public class TestConfigurations
*
* @param config the configuration instance to be checked.
*/
- private static void checkINI(INIConfiguration config)
+ private static void checkINI(final INIConfiguration config)
{
assertEquals("yes", config.getProperty("testini.loaded"));
}
@@ -374,8 +374,8 @@ public class TestConfigurations
@Test
public void testINIBuilderFromFile() throws ConfigurationException
{
- Configurations configs = new Configurations();
- FileBasedConfigurationBuilder<INIConfiguration> builder =
+ final Configurations configs = new Configurations();
+ final FileBasedConfigurationBuilder<INIConfiguration> builder =
configs.iniBuilder(ConfigurationAssert.getTestFile(TEST_INI));
checkINI(builder.getConfiguration());
}
@@ -386,8 +386,8 @@ public class TestConfigurations
@Test
public void testINIFromFile() throws ConfigurationException
{
- Configurations configs = new Configurations();
- INIConfiguration config =
+ final Configurations configs = new Configurations();
+ final INIConfiguration config =
configs.ini(ConfigurationAssert.getTestFile(TEST_INI));
checkINI(config);
}
@@ -399,8 +399,8 @@ public class TestConfigurations
@Test
public void testINIBuilderFromURL() throws ConfigurationException
{
- Configurations configs = new Configurations();
- FileBasedConfigurationBuilder<INIConfiguration> builder =
+ final Configurations configs = new Configurations();
+ final FileBasedConfigurationBuilder<INIConfiguration> builder =
configs.iniBuilder(ConfigurationAssert.getTestURL(TEST_INI));
checkINI(builder.getConfiguration());
}
@@ -411,8 +411,8 @@ public class TestConfigurations
@Test
public void testINIFromURL() throws ConfigurationException
{
- Configurations configs = new Configurations();
- INIConfiguration config =
+ final Configurations configs = new Configurations();
+ final INIConfiguration config =
configs.ini(ConfigurationAssert.getTestURL(TEST_INI));
checkINI(config);
}
@@ -424,8 +424,8 @@ public class TestConfigurations
@Test
public void testINIBuilderFromPath() throws ConfigurationException
{
- Configurations configs = new Configurations();
- FileBasedConfigurationBuilder<INIConfiguration> builder =
+ final Configurations configs = new Configurations();
+ final FileBasedConfigurationBuilder<INIConfiguration> builder =
configs.iniBuilder(filePath(TEST_INI));
checkINI(builder.getConfiguration());
}
@@ -436,8 +436,8 @@ public class TestConfigurations
@Test
public void testINIFromPath() throws ConfigurationException
{
- Configurations configs = new Configurations();
- INIConfiguration config = configs.ini(filePath(TEST_INI));
+ final Configurations configs = new Configurations();
+ final INIConfiguration config = configs.ini(filePath(TEST_INI));
checkINI(config);
}
@@ -446,7 +446,7 @@ public class TestConfigurations
*
* @param config the configuration instance to be checked.
*/
- private static void checkCombined(Configuration config)
+ private static void checkCombined(final Configuration config)
{
checkProperties(config);
checkXML(config);
@@ -459,8 +459,8 @@ public class TestConfigurations
@Test
public void testCombinedBuilderFromFile() throws ConfigurationException
{
- Configurations configs = new Configurations();
- CombinedConfigurationBuilder builder =
+ final Configurations configs = new Configurations();
+ final CombinedConfigurationBuilder builder =
configs.combinedBuilder(ConfigurationAssert
.getTestFile(TEST_COMBINED));
checkCombined(builder.getConfiguration());
@@ -472,8 +472,8 @@ public class TestConfigurations
@Test
public void testCombinedFromFile() throws ConfigurationException
{
- Configurations configs = new Configurations();
- CombinedConfiguration config =
+ final Configurations configs = new Configurations();
+ final CombinedConfiguration config =
configs.combined(ConfigurationAssert.getTestFile(TEST_COMBINED));
checkCombined(config);
}
@@ -485,8 +485,8 @@ public class TestConfigurations
@Test
public void testCombinedBuilderFromURL() throws ConfigurationException
{
- Configurations configs = new Configurations();
- CombinedConfigurationBuilder builder =
+ final Configurations configs = new Configurations();
+ final CombinedConfigurationBuilder builder =
configs.combinedBuilder(ConfigurationAssert
.getTestURL(TEST_COMBINED));
checkCombined(builder.getConfiguration());
@@ -498,8 +498,8 @@ public class TestConfigurations
@Test
public void testCombinedFromURL() throws ConfigurationException
{
- Configurations configs = new Configurations();
- CombinedConfiguration config =
+ final Configurations configs = new Configurations();
+ final CombinedConfiguration config =
configs.combined(ConfigurationAssert.getTestURL(TEST_COMBINED));
checkCombined(config);
}
@@ -511,8 +511,8 @@ public class TestConfigurations
@Test
public void testCombinedBuilderFromPath() throws ConfigurationException
{
- Configurations configs = new Configurations();
- CombinedConfigurationBuilder builder =
+ final Configurations configs = new Configurations();
+ final CombinedConfigurationBuilder builder =
configs.combinedBuilder(filePath(TEST_COMBINED));
checkCombined(builder.getConfiguration());
}
@@ -523,8 +523,8 @@ public class TestConfigurations
@Test
public void testCombinedFromPath() throws ConfigurationException
{
- Configurations configs = new Configurations();
- CombinedConfiguration config =
+ final Configurations configs = new Configurations();
+ final CombinedConfiguration config =
configs.combined(filePath(TEST_COMBINED));
checkCombined(config);
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/fluent/TestParameters.java Thu Sep 27 22:24:23 2018
@@ -67,7 +67,7 @@ public class TestParameters
@Test
public void testDefaultParametersManager()
{
- Parameters parameters = new Parameters();
+ final Parameters parameters = new Parameters();
assertNotNull("No default manager",
parameters.getDefaultParametersManager());
}
@@ -78,7 +78,7 @@ public class TestParameters
@Test
public void testBasic()
{
- BasicBuilderParameters basic = new Parameters().basic();
+ final BasicBuilderParameters basic = new Parameters().basic();
assertNotNull("No result object", basic);
}
@@ -88,7 +88,7 @@ public class TestParameters
*
* @param map the map to be tested
*/
- private static void checkBasicProperties(Map<String, Object> map)
+ private static void checkBasicProperties(final Map<String, Object> map)
{
assertEquals("Wrong delimiter handler", listHandler,
map.get("listDelimiterHandler"));
@@ -102,11 +102,11 @@ public class TestParameters
@Test
public void testFileBased()
{
- Map<String, Object> map =
+ final Map<String, Object> map =
new Parameters().fileBased().setThrowExceptionOnMissing(true)
.setEncoding(DEF_ENCODING).setListDelimiterHandler(listHandler)
.setFileName("test.xml").getParameters();
- FileBasedBuilderParametersImpl fbparams =
+ final FileBasedBuilderParametersImpl fbparams =
FileBasedBuilderParametersImpl.fromParameters(map);
assertEquals("Wrong file name", "test.xml", fbparams.getFileHandler()
.getFileName());
@@ -122,7 +122,7 @@ public class TestParameters
* @param obj the object to be checked
* @param cls the class
*/
- private static void checkInstanceOf(Object obj, Class<?> cls)
+ private static void checkInstanceOf(final Object obj, final Class<?> cls)
{
assertTrue(obj + " is not an instance of " + cls, cls.isInstance(obj));
}
@@ -134,10 +134,10 @@ public class TestParameters
* @param params the parameters object to check
* @param ifcClasses the interface classes to be implemented
*/
- private static void checkInheritance(Object params, Class<?>... ifcClasses)
+ private static void checkInheritance(final Object params, final Class<?>... ifcClasses)
{
checkInstanceOf(params, BasicBuilderProperties.class);
- for (Class<?> c : ifcClasses)
+ for (final Class<?> c : ifcClasses)
{
checkInstanceOf(params, c);
}
@@ -159,8 +159,8 @@ public class TestParameters
@Test
public void testProxyObjectMethods()
{
- FileBasedBuilderParameters params = new Parameters().fileBased();
- String s = params.toString();
+ final FileBasedBuilderParameters params = new Parameters().fileBased();
+ final String s = params.toString();
assertTrue(
"Wrong string: " + s,
s.indexOf(FileBasedBuilderParametersImpl.class.getSimpleName()) >= 0);
@@ -173,11 +173,11 @@ public class TestParameters
@Test
public void testCombined()
{
- Map<String, Object> map =
+ final Map<String, Object> map =
new Parameters().combined().setThrowExceptionOnMissing(true)
.setBasePath("test").setListDelimiterHandler(listHandler)
.getParameters();
- CombinedBuilderParametersImpl cparams =
+ final CombinedBuilderParametersImpl cparams =
CombinedBuilderParametersImpl.fromParameters(map);
assertEquals("Wrong base path", "test", cparams.getBasePath());
checkBasicProperties(map);
@@ -189,7 +189,7 @@ public class TestParameters
@Test
public void testJndi()
{
- Map<String, Object> map =
+ final Map<String, Object> map =
new Parameters().jndi().setThrowExceptionOnMissing(true)
.setPrefix("test").setListDelimiterHandler(listHandler)
.getParameters();
@@ -204,13 +204,13 @@ public class TestParameters
@Test
public void testHierarchical()
{
- ExpressionEngine engine = EasyMock.createMock(ExpressionEngine.class);
- Map<String, Object> map =
+ final ExpressionEngine engine = EasyMock.createMock(ExpressionEngine.class);
+ final Map<String, Object> map =
new Parameters().hierarchical().setThrowExceptionOnMissing(true)
.setExpressionEngine(engine).setFileName("test.xml")
.setListDelimiterHandler(listHandler).getParameters();
checkBasicProperties(map);
- FileBasedBuilderParametersImpl fbp =
+ final FileBasedBuilderParametersImpl fbp =
FileBasedBuilderParametersImpl.fromParameters(map);
assertEquals("Wrong file name", "test.xml", fbp.getFileHandler()
.getFileName());
@@ -235,14 +235,14 @@ public class TestParameters
@Test
public void testXml()
{
- ExpressionEngine engine = EasyMock.createMock(ExpressionEngine.class);
- Map<String, Object> map =
+ final ExpressionEngine engine = EasyMock.createMock(ExpressionEngine.class);
+ final Map<String, Object> map =
new Parameters().xml().setThrowExceptionOnMissing(true)
.setFileName("test.xml").setValidating(true)
.setExpressionEngine(engine).setListDelimiterHandler(listHandler)
.setSchemaValidation(true).getParameters();
checkBasicProperties(map);
- FileBasedBuilderParametersImpl fbp =
+ final FileBasedBuilderParametersImpl fbp =
FileBasedBuilderParametersImpl.fromParameters(map);
assertEquals("Wrong file name", "test.xml", fbp.getFileHandler()
.getFileName());
@@ -271,15 +271,15 @@ public class TestParameters
@Test
public void testProperties()
{
- PropertiesConfiguration.IOFactory factory =
+ final PropertiesConfiguration.IOFactory factory =
EasyMock.createMock(PropertiesConfiguration.IOFactory.class);
- Map<String, Object> map =
+ final Map<String, Object> map =
new Parameters().properties().setThrowExceptionOnMissing(true)
.setFileName("test.properties").setIOFactory(factory)
.setListDelimiterHandler(listHandler).setIncludesAllowed(false)
.getParameters();
checkBasicProperties(map);
- FileBasedBuilderParametersImpl fbp =
+ final FileBasedBuilderParametersImpl fbp =
FileBasedBuilderParametersImpl.fromParameters(map);
assertEquals("Wrong file name", "test.properties", fbp.getFileHandler()
.getFileName());
@@ -304,14 +304,14 @@ public class TestParameters
@Test
public void testMultiFile()
{
- BuilderParameters bp = EasyMock.createMock(BuilderParameters.class);
- String pattern = "a pattern";
- Map<String, Object> map =
+ final BuilderParameters bp = EasyMock.createMock(BuilderParameters.class);
+ final String pattern = "a pattern";
+ final Map<String, Object> map =
new Parameters().multiFile().setThrowExceptionOnMissing(true)
.setFilePattern(pattern).setListDelimiterHandler(listHandler)
.setManagedBuilderParameters(bp).getParameters();
checkBasicProperties(map);
- MultiFileBuilderParametersImpl params =
+ final MultiFileBuilderParametersImpl params =
MultiFileBuilderParametersImpl.fromParameters(map);
assertSame("Wrong builder parameters", bp,
params.getManagedBuilderParameters());
@@ -325,7 +325,7 @@ public class TestParameters
@Test
public void testDatabase()
{
- Map<String, Object> map =
+ final Map<String, Object> map =
new Parameters().database().setThrowExceptionOnMissing(true)
.setAutoCommit(true).setTable("table")
.setListDelimiterHandler(listHandler).setKeyColumn("keyColumn")
@@ -345,18 +345,18 @@ public class TestParameters
@Test
public void testInheritance()
{
- Object params = new Parameters().xml();
+ final Object params = new Parameters().xml();
assertTrue("No instance of base interface",
params instanceof FileBasedBuilderParameters);
assertTrue("No instance of base interface (dynamic)",
FileBasedBuilderParameters.class.isInstance(params));
- FileBasedBuilderParameters fbParams =
+ final FileBasedBuilderParameters fbParams =
(FileBasedBuilderParameters) params;
fbParams.setListDelimiterHandler(listHandler).setFileName("test.xml")
.setThrowExceptionOnMissing(true);
- ExpressionEngine engine = EasyMock.createMock(ExpressionEngine.class);
+ final ExpressionEngine engine = EasyMock.createMock(ExpressionEngine.class);
((HierarchicalBuilderParameters) params).setExpressionEngine(engine);
- Map<String, Object> map = fbParams.getParameters();
+ final Map<String, Object> map = fbParams.getParameters();
checkBasicProperties(map);
assertSame("Wrong expression engine", engine, map.get("expressionEngine"));
}
@@ -368,7 +368,7 @@ public class TestParameters
@Test
public void testApplyDefaults()
{
- DefaultParametersManager manager =
+ final DefaultParametersManager manager =
EasyMock.createMock(DefaultParametersManager.class);
final List<Object> initializedParams = new ArrayList<>(1);
manager.initializeParameters(EasyMock
@@ -384,8 +384,8 @@ public class TestParameters
});
EasyMock.replay(manager);
- Parameters params = new Parameters(manager);
- XMLBuilderParameters xmlParams = params.xml();
+ final Parameters params = new Parameters(manager);
+ final XMLBuilderParameters xmlParams = params.xml();
assertEquals("Wrong number of initializations", 1,
initializedParams.size());
assertSame("Wrong initialized object", xmlParams,
@@ -400,6 +400,7 @@ public class TestParameters
private static DefaultParametersHandler<XMLBuilderParameters> createHandlerMock()
{
@SuppressWarnings("unchecked")
+ final
DefaultParametersHandler<XMLBuilderParameters> handler =
EasyMock.createMock(DefaultParametersHandler.class);
return handler;
@@ -411,15 +412,15 @@ public class TestParameters
@Test
public void testRegisterDefaultsHandlerWithStartClass()
{
- DefaultParametersManager manager =
+ final DefaultParametersManager manager =
EasyMock.createMock(DefaultParametersManager.class);
- DefaultParametersHandler<XMLBuilderParameters> handler =
+ final DefaultParametersHandler<XMLBuilderParameters> handler =
createHandlerMock();
manager.registerDefaultsHandler(XMLBuilderParameters.class, handler,
FileBasedBuilderParameters.class);
EasyMock.replay(manager, handler);
- Parameters params = new Parameters(manager);
+ final Parameters params = new Parameters(manager);
params.registerDefaultsHandler(XMLBuilderParameters.class, handler,
FileBasedBuilderParameters.class);
EasyMock.verify(manager);
@@ -432,14 +433,14 @@ public class TestParameters
@Test
public void testRegisterDefaultsHandlerNoStartClass()
{
- DefaultParametersManager manager =
+ final DefaultParametersManager manager =
EasyMock.createMock(DefaultParametersManager.class);
- DefaultParametersHandler<XMLBuilderParameters> handler =
+ final DefaultParametersHandler<XMLBuilderParameters> handler =
createHandlerMock();
manager.registerDefaultsHandler(XMLBuilderParameters.class, handler);
EasyMock.replay(manager, handler);
- Parameters params = new Parameters(manager);
+ final Parameters params = new Parameters(manager);
params.registerDefaultsHandler(XMLBuilderParameters.class, handler);
EasyMock.verify(manager);
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/convert/TestDefaultConversionHandler.java Thu Sep 27 22:24:23 2018
@@ -68,7 +68,7 @@ public class TestDefaultConversionHandle
return new ConfigurationInterpolator()
{
@Override
- public Object interpolate(Object value)
+ public Object interpolate(final Object value)
{
if (VAR.equals(value))
{
@@ -84,7 +84,7 @@ public class TestDefaultConversionHandle
*
* @param expResult the expected result
*/
- private void checkSingleValue(Integer expResult)
+ private void checkSingleValue(final Integer expResult)
{
assertEquals("Wrong result", Integer.parseInt(REPLACEMENT),
expResult.intValue());
@@ -96,7 +96,7 @@ public class TestDefaultConversionHandle
@Test
public void testToWithInterpolator()
{
- Integer result = handler.to(VAR, Integer.class, createInterpolator());
+ final Integer result = handler.to(VAR, Integer.class, createInterpolator());
checkSingleValue(result);
}
@@ -106,7 +106,7 @@ public class TestDefaultConversionHandle
@Test
public void testToNoInterpolator()
{
- Integer result = handler.to(REPLACEMENT, Integer.class, null);
+ final Integer result = handler.to(REPLACEMENT, Integer.class, null);
checkSingleValue(result);
}
@@ -125,7 +125,7 @@ public class TestDefaultConversionHandle
@Test
public void testToFromArray()
{
- Object[] src = {
+ final Object[] src = {
VAR, true, 20130808221759L
};
checkSingleValue(handler.to(src, Integer.class, createInterpolator()));
@@ -137,7 +137,7 @@ public class TestDefaultConversionHandle
@Test
public void testToFromCollection()
{
- Collection<String> src = Arrays.asList(VAR, "true", "1000");
+ final Collection<String> src = Arrays.asList(VAR, "true", "1000");
checkSingleValue(handler.to(src, Integer.class, createInterpolator()));
}
@@ -147,7 +147,7 @@ public class TestDefaultConversionHandle
@Test
public void testToFromIterator()
{
- Iterator<String> src = Arrays.asList(VAR, "true", "1000").iterator();
+ final Iterator<String> src = Arrays.asList(VAR, "true", "1000").iterator();
checkSingleValue(handler.to(src, Integer.class, createInterpolator()));
}
@@ -177,7 +177,7 @@ public class TestDefaultConversionHandle
@Test
public void testToCollectionNullInput()
{
- ArrayList<Integer> col = new ArrayList<>();
+ final ArrayList<Integer> col = new ArrayList<>();
handler.toCollection(null, Integer.class, null, col);
assertTrue("Got elements", col.isEmpty());
}
@@ -197,10 +197,10 @@ public class TestDefaultConversionHandle
@Test
public void testToCollectionSuccess()
{
- Object[] src = new Object[] {
+ final Object[] src = new Object[] {
VAR, "100"
};
- List<Integer> col = new ArrayList<>(src.length);
+ final List<Integer> col = new ArrayList<>(src.length);
handler.toCollection(src, Integer.class, createInterpolator(), col);
assertEquals("Wrong number of elements", src.length, col.size());
assertEquals("Wrong element (1)", Integer.parseInt(REPLACEMENT), col
@@ -216,7 +216,7 @@ public class TestDefaultConversionHandle
@Test
public void testToCollectionEmptyString()
{
- List<Integer> col = new ArrayList<>(1);
+ final List<Integer> col = new ArrayList<>(1);
handler.toCollection("", Integer.class, null, col);
assertTrue("Got elements", col.isEmpty());
}
@@ -236,8 +236,8 @@ public class TestDefaultConversionHandle
@Test
public void testToArrayObject()
{
- List<String> src = Arrays.asList(VAR, "100");
- Integer[] array =
+ final List<String> src = Arrays.asList(VAR, "100");
+ final Integer[] array =
(Integer[]) handler.toArray(src, Integer.class,
createInterpolator());
assertEquals("Wrong number of elements", src.size(), array.length);
@@ -253,10 +253,10 @@ public class TestDefaultConversionHandle
@Test
public void testToArrayPrimitiveSameType()
{
- int[] src = new int[] {
+ final int[] src = new int[] {
1, 2, 3, 4, 5, 6
};
- int[] array =
+ final int[] array =
(int[]) handler
.toArray(src, Integer.TYPE, createInterpolator());
Assert.assertArrayEquals("Wrong array result", src, array);
@@ -269,10 +269,10 @@ public class TestDefaultConversionHandle
@Test
public void testToArrayPrimitiveWrapperType()
{
- Integer[] src = new Integer[] {
+ final Integer[] src = new Integer[] {
0, 1, 2, 4, 8, 16, 32, 64, 128
};
- int[] array =
+ final int[] array =
(int[]) handler
.toArray(src, Integer.TYPE, createInterpolator());
assertEquals("Wrong array length", src.length, array.length);
@@ -289,8 +289,8 @@ public class TestDefaultConversionHandle
@Test
public void testToArrayPrimitiveOtherType()
{
- List<String> src = Arrays.asList(VAR, "100");
- int[] array =
+ final List<String> src = Arrays.asList(VAR, "100");
+ final int[] array =
(int[]) handler
.toArray(src, Integer.TYPE, createInterpolator());
assertEquals("Wrong element (1)", Integer.parseInt(REPLACEMENT),
@@ -306,7 +306,7 @@ public class TestDefaultConversionHandle
@Test
public void testToArrayEmptyString()
{
- int[] array = (int[]) handler.toArray("", Integer.TYPE, null);
+ final int[] array = (int[]) handler.toArray("", Integer.TYPE, null);
assertEquals("Got elements", 0, array.length);
}
@@ -327,7 +327,7 @@ public class TestDefaultConversionHandle
@Test
public void testSetDateFormat()
{
- String dateFormat = "dd.MM.yyyy";
+ final String dateFormat = "dd.MM.yyyy";
handler.setDateFormat(dateFormat);
assertEquals("Date format not changed", dateFormat,
handler.getDateFormat());
@@ -341,8 +341,8 @@ public class TestDefaultConversionHandle
public void testToDateWithFormat()
{
handler.setDateFormat("dd.MM.yyyy");
- Date dt = handler.to("19.08.2013", Date.class, null);
- Calendar cal = Calendar.getInstance();
+ final Date dt = handler.to("19.08.2013", Date.class, null);
+ final Calendar cal = Calendar.getInstance();
cal.setTime(dt);
assertEquals("Wrong day", 19, cal.get(Calendar.DATE));
assertEquals("Wrong month", Calendar.AUGUST, cal.get(Calendar.MONTH));
@@ -355,7 +355,7 @@ public class TestDefaultConversionHandle
@Test
public void testToCalendarWithDefaultFormat()
{
- Calendar cal = handler.to("2013-08-19 21:17:22", Calendar.class, null);
+ final Calendar cal = handler.to("2013-08-19 21:17:22", Calendar.class, null);
assertEquals("Wrong day", 19, cal.get(Calendar.DATE));
assertEquals("Wrong month", Calendar.AUGUST, cal.get(Calendar.MONTH));
assertEquals("Wrong year", 2013, cal.get(Calendar.YEAR));
@@ -370,8 +370,8 @@ public class TestDefaultConversionHandle
@Test
public void testToPrimitive()
{
- Long value = 20130819214935L;
- Object result = handler.to(value.toString(), Long.TYPE, null);
+ final Long value = 20130819214935L;
+ final Object result = handler.to(value.toString(), Long.TYPE, null);
assertEquals("Wrong conversion result", value, result);
}
}