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 [23/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/beanutils/TestBeanHelper.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestBeanHelper.java Thu Sep 27 22:24:23 2018
@@ -82,7 +82,7 @@ public class TestBeanHelper
@Test
public void testInitWithBeanFactory()
{
- BeanFactory factory = EasyMock.createMock(BeanFactory.class);
+ final BeanFactory factory = EasyMock.createMock(BeanFactory.class);
EasyMock.replay(factory);
helper = new BeanHelper(factory);
assertSame("Wrong default bean factory", factory,
@@ -149,7 +149,7 @@ public class TestBeanHelper
@Test
public void testDeregisterBeanFactory()
{
- BeanFactory factory = new TestBeanFactory();
+ final BeanFactory factory = new TestBeanFactory();
helper.registerBeanFactory(TEST_FACTORY, factory);
assertSame("Could not deregister factory", factory, helper
.deregisterBeanFactory(TEST_FACTORY));
@@ -182,8 +182,8 @@ public class TestBeanHelper
@Test
public void testInitBean()
{
- BeanDeclarationTestImpl data = setUpBeanDeclaration();
- BeanCreationTestBean bean = new BeanCreationTestBean();
+ final BeanDeclarationTestImpl data = setUpBeanDeclaration();
+ final BeanCreationTestBean bean = new BeanCreationTestBean();
helper.initBean(bean, data);
checkBean(bean);
}
@@ -195,8 +195,8 @@ public class TestBeanHelper
@Test
public void testInitBeanWithNoData()
{
- BeanDeclarationTestImpl data = new BeanDeclarationTestImpl();
- BeanCreationTestBean bean = new BeanCreationTestBean();
+ final BeanDeclarationTestImpl data = new BeanDeclarationTestImpl();
+ final BeanCreationTestBean bean = new BeanCreationTestBean();
helper.initBean(bean, data);
assertNull("Wrong string property", bean.getStringValue());
assertEquals("Wrong int property", 0, bean.getIntValue());
@@ -210,7 +210,7 @@ public class TestBeanHelper
@Test(expected = ConfigurationRuntimeException.class)
public void testInitBeanWithInvalidProperty()
{
- BeanDeclarationTestImpl data = setUpBeanDeclaration();
+ final BeanDeclarationTestImpl data = setUpBeanDeclaration();
data.getBeanProperties().put("nonExistingProperty", Boolean.TRUE);
helper.initBean(new BeanCreationTestBean(), data);
}
@@ -222,9 +222,9 @@ public class TestBeanHelper
@Test
public void testCreateBean()
{
- TestBeanFactory factory = new TestBeanFactory();
+ final TestBeanFactory factory = new TestBeanFactory();
helper.registerBeanFactory(TEST_FACTORY, factory);
- BeanDeclarationTestImpl data = setUpBeanDeclaration();
+ final BeanDeclarationTestImpl data = setUpBeanDeclaration();
data.setBeanFactoryName(TEST_FACTORY);
data.setBeanClassName(BeanCreationTestBean.class.getName());
checkBean((BeanCreationTestBean) helper.createBean(data, null));
@@ -238,9 +238,9 @@ public class TestBeanHelper
@Test
public void testCreateBeanWithListChildBean()
{
- TestBeanFactory factory = new TestBeanFactory();
+ final TestBeanFactory factory = new TestBeanFactory();
helper.registerBeanFactory(TEST_FACTORY, factory);
- BeanDeclarationTestImpl data = setUpBeanDeclarationWithListChild();
+ final BeanDeclarationTestImpl data = setUpBeanDeclarationWithListChild();
data.setBeanFactoryName(TEST_FACTORY);
data.setBeanClassName(BeanCreationTestBeanWithListChild.class.getName());
checkBean((BeanCreationTestBeanWithListChild) helper.createBean(data, null));
@@ -266,7 +266,7 @@ public class TestBeanHelper
public void testCreateBeanWithDefaultClass()
{
helper.registerBeanFactory(TEST_FACTORY, new TestBeanFactory());
- BeanDeclarationTestImpl data = setUpBeanDeclaration();
+ final BeanDeclarationTestImpl data = setUpBeanDeclaration();
data.setBeanFactoryName(TEST_FACTORY);
checkBean((BeanCreationTestBean) helper.createBean(data, BeanCreationTestBean.class));
}
@@ -278,10 +278,10 @@ public class TestBeanHelper
@Test
public void testCreateBeanWithFactoryDefaultClass()
{
- TestBeanFactory factory = new TestBeanFactory();
+ final TestBeanFactory factory = new TestBeanFactory();
factory.supportsDefaultClass = true;
helper.registerBeanFactory(TEST_FACTORY, factory);
- BeanDeclarationTestImpl data = setUpBeanDeclaration();
+ final BeanDeclarationTestImpl data = setUpBeanDeclaration();
data.setBeanFactoryName(TEST_FACTORY);
checkBean((BeanCreationTestBean) helper.createBean(data, null));
assertEquals("Factory not called", 1, factory.getCreateBeanCount());
@@ -295,7 +295,7 @@ public class TestBeanHelper
public void testCreateBeanWithNoClass()
{
helper.registerBeanFactory(TEST_FACTORY, new TestBeanFactory());
- BeanDeclarationTestImpl data = setUpBeanDeclaration();
+ final BeanDeclarationTestImpl data = setUpBeanDeclaration();
data.setBeanFactoryName(TEST_FACTORY);
helper.createBean(data, null);
}
@@ -308,7 +308,7 @@ public class TestBeanHelper
public void testCreateBeanWithInvalidClass()
{
helper.registerBeanFactory(TEST_FACTORY, new TestBeanFactory());
- BeanDeclarationTestImpl data = setUpBeanDeclaration();
+ final BeanDeclarationTestImpl data = setUpBeanDeclaration();
data.setBeanFactoryName(TEST_FACTORY);
data.setBeanClassName("non.existing.ClassName");
helper.createBean(data, null);
@@ -320,10 +320,10 @@ public class TestBeanHelper
@Test
public void testCreateBeanWithDefaultFactory()
{
- BeanDeclarationTestImpl data = setUpBeanDeclaration();
+ final BeanDeclarationTestImpl data = setUpBeanDeclaration();
data.setBeanClassName(BeanCreationTestBean.class.getName());
checkBean((BeanCreationTestBean) helper.createBean(data, null));
- TestBeanFactory factory = (TestBeanFactory) helper.getDefaultBeanFactory();
+ final TestBeanFactory factory = (TestBeanFactory) helper.getDefaultBeanFactory();
assertTrue("Factory not called", factory.getCreateBeanCount() > 0);
}
@@ -333,7 +333,7 @@ public class TestBeanHelper
@Test(expected = ConfigurationRuntimeException.class)
public void testCreateBeanWithUnknownFactory()
{
- BeanDeclarationTestImpl data = setUpBeanDeclaration();
+ final BeanDeclarationTestImpl data = setUpBeanDeclaration();
data.setBeanFactoryName(TEST_FACTORY);
data.setBeanClassName(BeanCreationTestBean.class.getName());
helper.createBean(data, null);
@@ -346,7 +346,7 @@ public class TestBeanHelper
public void testCreateBeanWithException()
{
helper.registerBeanFactory(TEST_FACTORY, new TestBeanFactory());
- BeanDeclarationTestImpl data = setUpBeanDeclaration();
+ final BeanDeclarationTestImpl data = setUpBeanDeclaration();
data.setBeanFactoryName(TEST_FACTORY);
data.setBeanClassName(getClass().getName());
helper.createBean(data, null);
@@ -358,10 +358,10 @@ public class TestBeanHelper
@Test
public void testCreateBeanWithParameter()
{
- Object param = new Integer(42);
- TestBeanFactory factory = new TestBeanFactory();
+ final Object param = new Integer(42);
+ final TestBeanFactory factory = new TestBeanFactory();
helper.registerBeanFactory(TEST_FACTORY, factory);
- BeanDeclarationTestImpl data = setUpBeanDeclaration();
+ final BeanDeclarationTestImpl data = setUpBeanDeclaration();
data.setBeanFactoryName(TEST_FACTORY);
data.setBeanClassName(BeanCreationTestBean.class.getName());
checkBean((BeanCreationTestBean) helper.createBean(data, null, param));
@@ -374,9 +374,9 @@ public class TestBeanHelper
@Test
public void testCreateWrapDynaBean()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
- DynaBean bean = BeanHelper.createWrapDynaBean(config);
- String value = "TestFooter";
+ final PropertiesConfiguration config = new PropertiesConfiguration();
+ final DynaBean bean = BeanHelper.createWrapDynaBean(config);
+ final String value = "TestFooter";
bean.set("footer", value);
assertEquals("Property not set", value, config.getFooter());
}
@@ -396,10 +396,10 @@ public class TestBeanHelper
@Test
public void testCopyProperties() throws Exception
{
- PropertiesConfiguration src = new PropertiesConfiguration();
+ final PropertiesConfiguration src = new PropertiesConfiguration();
src.setHeader("TestHeader");
src.setFooter("TestFooter");
- LazyDynaBean dest = new LazyDynaBean();
+ final LazyDynaBean dest = new LazyDynaBean();
BeanHelper.copyProperties(dest, src);
assertEquals("Wrong footer property", "TestFooter", dest.get("footer"));
assertEquals("Wrong header property", "TestHeader", dest.get("header"));
@@ -412,19 +412,19 @@ public class TestBeanHelper
*/
private BeanDeclarationTestImpl setUpBeanDeclaration()
{
- BeanDeclarationTestImpl data = new BeanDeclarationTestImpl();
- Map<String, Object> properties = new HashMap<>();
+ final BeanDeclarationTestImpl data = new BeanDeclarationTestImpl();
+ final Map<String, Object> properties = new HashMap<>();
properties.put("stringValue", TEST_STRING);
properties.put("intValue", String.valueOf(TEST_INT));
data.setBeanProperties(properties);
- BeanDeclarationTestImpl buddyData = new BeanDeclarationTestImpl();
- Map<String, Object> properties2 = new HashMap<>();
+ final BeanDeclarationTestImpl buddyData = new BeanDeclarationTestImpl();
+ final Map<String, Object> properties2 = new HashMap<>();
properties2.put("stringValue", "Another test string");
properties2.put("intValue", new Integer(100));
buddyData.setBeanProperties(properties2);
buddyData.setBeanClassName(BeanCreationTestBean.class.getName());
- Map<String, Object> nested = new HashMap<>();
+ final Map<String, Object> nested = new HashMap<>();
nested.put("buddy", buddyData);
data.setNestedBeanDeclarations(nested);
return data;
@@ -439,16 +439,16 @@ public class TestBeanHelper
*/
private BeanDeclarationTestImpl setUpBeanDeclarationWithListChild()
{
- BeanDeclarationTestImpl data = new BeanDeclarationTestImpl();
- Map<String, Object> properties = new HashMap<>();
+ final BeanDeclarationTestImpl data = new BeanDeclarationTestImpl();
+ final Map<String, Object> properties = new HashMap<>();
properties.put("stringValue", TEST_STRING);
properties.put("intValue", String.valueOf(TEST_INT));
data.setBeanProperties(properties);
- List<BeanDeclaration> childData = new ArrayList<>();
+ final List<BeanDeclaration> childData = new ArrayList<>();
childData.add(createChildBean("child1"));
childData.add(createChildBean("child2"));
- Map<String, Object> nested = new HashMap<>();
+ final Map<String, Object> nested = new HashMap<>();
nested.put("children", childData);
data.setNestedBeanDeclarations(nested);
return data;
@@ -461,10 +461,10 @@ public class TestBeanHelper
* @param name A name prefix that can be used to disambiguate the children
* @return A simple declaration
*/
- private BeanDeclarationTestImpl createChildBean(String name)
+ private BeanDeclarationTestImpl createChildBean(final String name)
{
- BeanDeclarationTestImpl childBean = new BeanDeclarationTestImpl();
- Map<String, Object> properties2 = new HashMap<>();
+ final BeanDeclarationTestImpl childBean = new BeanDeclarationTestImpl();
+ final Map<String, Object> properties2 = new HashMap<>();
properties2.put("stringValue", name + " Another test string");
properties2.put("intValue", new Integer(100));
childBean.setBeanProperties(properties2);
@@ -479,12 +479,12 @@ public class TestBeanHelper
*
* @param bean the bean to be checked
*/
- private void checkBean(BeanCreationTestBean bean)
+ private void checkBean(final BeanCreationTestBean bean)
{
assertEquals("Wrong string property", TEST_STRING, bean
.getStringValue());
assertEquals("Wrong int property", TEST_INT, bean.getIntValue());
- BeanCreationTestBean buddy = bean.getBuddy();
+ final BeanCreationTestBean buddy = bean.getBuddy();
assertNotNull("Buddy was not set", buddy);
assertEquals("Wrong string property in buddy", "Another test string",
buddy.getStringValue());
@@ -497,12 +497,12 @@ public class TestBeanHelper
*
* @param bean the bean to be checked
*/
- private void checkBean(BeanCreationTestBeanWithListChild bean)
+ private void checkBean(final BeanCreationTestBeanWithListChild bean)
{
assertEquals("Wrong string property", TEST_STRING, bean
.getStringValue());
assertEquals("Wrong int property", TEST_INT, bean.getIntValue());
- List<BeanCreationTestBean> children = bean.getChildren();
+ final List<BeanCreationTestBean> children = bean.getChildren();
assertNotNull("Children were not set", children);
assertEquals("Wrong number of children created", children.size(), 2);
assertNotNull("First child was set as null", children.get(0));
@@ -524,20 +524,20 @@ public class TestBeanHelper
private int createBeanCount;
@Override
- public Object createBean(BeanCreationContext bcc) throws Exception
+ public Object createBean(final BeanCreationContext bcc) throws Exception
{
createBeanCount++;
parameter = bcc.getParameter();
if (BeanCreationTestBean.class.equals(bcc.getBeanClass()))
{
- BeanCreationTestBean bean = new BeanCreationTestBean();
+ final BeanCreationTestBean bean = new BeanCreationTestBean();
helper.initBean(bean, bcc.getBeanDeclaration());
return bean;
}
else if (BeanCreationTestBeanWithListChild.class.equals(bcc
.getBeanClass()))
{
- BeanCreationTestBeanWithListChild bean =
+ final BeanCreationTestBeanWithListChild bean =
new BeanCreationTestBeanWithListChild();
helper.initBean(bean, bcc.getBeanDeclaration());
return bean;
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestCombinedBeanDeclaration.java Thu Sep 27 22:24:23 2018
@@ -68,7 +68,7 @@ public class TestCombinedBeanDeclaration
* @param idx the index
* @return the corresponding mock child bean declaration
*/
- private BeanDeclaration decl(int idx)
+ private BeanDeclaration decl(final int idx)
{
return declarations[idx];
}
@@ -95,8 +95,8 @@ public class TestCombinedBeanDeclaration
@Test
public void testGetBeanFactoryNameDefined()
{
- CombinedBeanDeclaration cd = createCombinedDeclaration();
- String name = "someTestBeanFactory";
+ final CombinedBeanDeclaration cd = createCombinedDeclaration();
+ final String name = "someTestBeanFactory";
EasyMock.expect(decl(0).getBeanFactoryName()).andReturn(null);
EasyMock.expect(decl(1).getBeanFactoryName()).andReturn(name);
replay();
@@ -111,7 +111,7 @@ public class TestCombinedBeanDeclaration
@Test
public void testGetBeanFactoryNameUndefined()
{
- CombinedBeanDeclaration cd = new CombinedBeanDeclaration();
+ final CombinedBeanDeclaration cd = new CombinedBeanDeclaration();
assertNull("Got a factory name", cd.getBeanFactoryName());
}
@@ -122,8 +122,8 @@ public class TestCombinedBeanDeclaration
@Test
public void testGetBeanFactoryParameterDefined()
{
- CombinedBeanDeclaration cd = createCombinedDeclaration();
- Object param = new Object();
+ final CombinedBeanDeclaration cd = createCombinedDeclaration();
+ final Object param = new Object();
EasyMock.expect(decl(0).getBeanFactoryParameter()).andReturn(null);
EasyMock.expect(decl(1).getBeanFactoryParameter()).andReturn(param);
replay();
@@ -138,7 +138,7 @@ public class TestCombinedBeanDeclaration
@Test
public void testGetBeanFactoryParameterUndefined()
{
- CombinedBeanDeclaration cd = new CombinedBeanDeclaration();
+ final CombinedBeanDeclaration cd = new CombinedBeanDeclaration();
assertNull("Got a factory parameter", cd.getBeanFactoryParameter());
}
@@ -149,7 +149,7 @@ public class TestCombinedBeanDeclaration
@Test
public void testGetBeanClassNameDefined()
{
- CombinedBeanDeclaration cd = createCombinedDeclaration();
+ final CombinedBeanDeclaration cd = createCombinedDeclaration();
EasyMock.expect(decl(0).getBeanClassName()).andReturn(null);
EasyMock.expect(decl(1).getBeanClassName()).andReturn(
getClass().getName());
@@ -166,7 +166,7 @@ public class TestCombinedBeanDeclaration
@Test
public void testGetBeanClassNameUndefined()
{
- CombinedBeanDeclaration cd = new CombinedBeanDeclaration();
+ final CombinedBeanDeclaration cd = new CombinedBeanDeclaration();
assertNull("Got a bean class name", cd.getBeanClassName());
}
@@ -177,8 +177,8 @@ public class TestCombinedBeanDeclaration
@Test
public void testGetConstructorArgsDefined()
{
- CombinedBeanDeclaration cd = createCombinedDeclaration();
- Collection<ConstructorArg> args =
+ final CombinedBeanDeclaration cd = createCombinedDeclaration();
+ final Collection<ConstructorArg> args =
Arrays.asList(ConstructorArg.forValue(42));
EasyMock.expect(decl(0).getConstructorArgs()).andReturn(null);
EasyMock.expect(decl(1).getConstructorArgs()).andReturn(args);
@@ -194,7 +194,7 @@ public class TestCombinedBeanDeclaration
@Test
public void testGetConstructorArgsUndefined()
{
- CombinedBeanDeclaration cd = createCombinedDeclaration();
+ final CombinedBeanDeclaration cd = createCombinedDeclaration();
EasyMock.expect(decl(0).getConstructorArgs()).andReturn(null);
EasyMock.expect(decl(1).getConstructorArgs()).andReturn(
new ArrayList<ConstructorArg>());
@@ -211,21 +211,21 @@ public class TestCombinedBeanDeclaration
@Test
public void testGetBeanProperties()
{
- Map<String, Object> props1 = new HashMap<>();
- Map<String, Object> props2 = new HashMap<>();
- Map<String, Object> props3 = new HashMap<>();
+ final Map<String, Object> props1 = new HashMap<>();
+ final Map<String, Object> props2 = new HashMap<>();
+ final Map<String, Object> props3 = new HashMap<>();
props1.put("param1", "value1");
props1.put("param2", "value2");
props2.put("param2", "othervalue");
props2.put("param3", "value3");
props3.put("param1", "differentvalue");
props3.put("param4", "value4");
- CombinedBeanDeclaration cd = createCombinedDeclaration();
+ final CombinedBeanDeclaration cd = createCombinedDeclaration();
EasyMock.expect(decl(0).getBeanProperties()).andReturn(props1);
EasyMock.expect(decl(1).getBeanProperties()).andReturn(props2);
EasyMock.expect(decl(2).getBeanProperties()).andReturn(props3);
replay();
- Map<String, Object> props = cd.getBeanProperties();
+ final Map<String, Object> props = cd.getBeanProperties();
assertEquals("Wrong number of properties", 4, props.size());
for (int i = 1; i <= 4; i++)
{
@@ -241,10 +241,10 @@ public class TestCombinedBeanDeclaration
@Test
public void testGetBeanPropertiesNull()
{
- BeanDeclaration child = EasyMock.createMock(BeanDeclaration.class);
+ final BeanDeclaration child = EasyMock.createMock(BeanDeclaration.class);
EasyMock.expect(child.getBeanProperties()).andReturn(null);
EasyMock.replay(child);
- CombinedBeanDeclaration cd = new CombinedBeanDeclaration(child);
+ final CombinedBeanDeclaration cd = new CombinedBeanDeclaration(child);
assertTrue("Got bean properties", cd.getBeanProperties().isEmpty());
}
@@ -254,21 +254,21 @@ public class TestCombinedBeanDeclaration
@Test
public void testGetNestedBeanDeclarations()
{
- Map<String, Object> decls1 = new HashMap<>();
- Map<String, Object> decls2 = new HashMap<>();
- Map<String, Object> decls3 = new HashMap<>();
+ final Map<String, Object> decls1 = new HashMap<>();
+ final Map<String, Object> decls2 = new HashMap<>();
+ final Map<String, Object> decls3 = new HashMap<>();
decls1.put("param1", "value1");
decls1.put("param2", "value2");
decls2.put("param2", "othervalue");
decls2.put("param3", "value3");
decls3.put("param1", "differentvalue");
decls3.put("param4", "value4");
- CombinedBeanDeclaration cd = createCombinedDeclaration();
+ final CombinedBeanDeclaration cd = createCombinedDeclaration();
EasyMock.expect(decl(0).getNestedBeanDeclarations()).andReturn(decls1);
EasyMock.expect(decl(1).getNestedBeanDeclarations()).andReturn(decls2);
EasyMock.expect(decl(2).getNestedBeanDeclarations()).andReturn(decls3);
replay();
- Map<String, Object> decls = cd.getNestedBeanDeclarations();
+ final Map<String, Object> decls = cd.getNestedBeanDeclarations();
assertEquals("Wrong number of declarations", 4, decls.size());
for (int i = 1; i <= 4; i++)
{
@@ -285,10 +285,10 @@ public class TestCombinedBeanDeclaration
@Test
public void testGetNestedBeanDeclarationsNull()
{
- BeanDeclaration child = EasyMock.createMock(BeanDeclaration.class);
+ final BeanDeclaration child = EasyMock.createMock(BeanDeclaration.class);
EasyMock.expect(child.getNestedBeanDeclarations()).andReturn(null);
EasyMock.replay(child);
- CombinedBeanDeclaration cd = new CombinedBeanDeclaration(child);
+ final CombinedBeanDeclaration cd = new CombinedBeanDeclaration(child);
assertTrue("Got bean declarations", cd.getNestedBeanDeclarations()
.isEmpty());
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestConfigurationDynaBean.java Thu Sep 27 22:24:23 2018
@@ -108,22 +108,22 @@ public class TestConfigurationDynaBean
@Before
public void setUp() throws Exception
{
- Configuration configuration = createConfiguration();
+ final Configuration configuration = createConfiguration();
for (int i = 0; i < properties.length; i++)
{
configuration.setProperty(properties[i], values[i]);
}
- for (int element : intArray) {
+ for (final int element : intArray) {
configuration.addProperty("intIndexed", new Integer(element));
}
- for (String element : stringArray) {
+ for (final String element : stringArray) {
configuration.addProperty("stringIndexed", element);
}
- List<String> list = Arrays.asList(stringArray);
+ final List<String> list = Arrays.asList(stringArray);
configuration.addProperty("listIndexed", list);
bean = new ConfigurationDynaBean(configuration);
@@ -155,7 +155,7 @@ public class TestConfigurationDynaBean
@Test(expected = IllegalArgumentException.class)
public void testGetDescriptorArguments()
{
- DynaProperty descriptor = bean.getDynaClass().getDynaProperty("unknown");
+ final DynaProperty descriptor = bean.getDynaClass().getDynaProperty("unknown");
assertNull("Unknown property descriptor should be null", descriptor);
bean.getDynaClass().getDynaProperty(null);
}
@@ -240,11 +240,11 @@ public class TestConfigurationDynaBean
@Test
public void testGetDescriptors()
{
- DynaProperty pd[] = bean.getDynaClass().getDynaProperties();
+ final DynaProperty pd[] = bean.getDynaClass().getDynaProperties();
assertNotNull("Got descriptors", pd);
- int count[] = new int[properties.length];
- for (DynaProperty element : pd) {
- String name = element.getName();
+ final int count[] = new int[properties.length];
+ for (final DynaProperty element : pd) {
+ final String name = element.getName();
for (int j = 0; j < properties.length; j++)
{
if (name.equals(properties[j]))
@@ -325,10 +325,10 @@ public class TestConfigurationDynaBean
{
try
{
- Object value = bean.get("mappedProperty", "unknown");
+ final Object value = bean.get("mappedProperty", "unknown");
assertNull("Should not return a value", value);
}
- catch (Throwable t)
+ catch (final Throwable t)
{
fail("Threw " + t + " instead of returning null");
}
@@ -365,7 +365,7 @@ public class TestConfigurationDynaBean
@Test
public void testGetSimpleBoolean()
{
- Object value = bean.get("booleanProperty");
+ final Object value = bean.get("booleanProperty");
assertNotNull("Got a value", value);
ObjectAssert.assertInstanceOf("Got correct type", Boolean.class, value);
assertTrue("Got correct value", ((Boolean) value).booleanValue());
@@ -377,7 +377,7 @@ public class TestConfigurationDynaBean
@Test
public void testGetSimpleDouble()
{
- Object value = bean.get("doubleProperty");
+ final Object value = bean.get("doubleProperty");
assertNotNull("Got a value", value);
ObjectAssert.assertInstanceOf("Got correct type", Double.class, value);
assertEquals("Got correct value", ((Double) value).doubleValue(), Double.MAX_VALUE, 0.005);
@@ -389,7 +389,7 @@ public class TestConfigurationDynaBean
@Test
public void testGetSimpleFloat()
{
- Object value = bean.get("floatProperty");
+ final Object value = bean.get("floatProperty");
assertNotNull("Got a value", value);
ObjectAssert.assertInstanceOf("Got correct type", Float.class, value);
assertEquals("Got correct value", ((Float) value).floatValue(), Float.MAX_VALUE, 0.005f);
@@ -401,7 +401,7 @@ public class TestConfigurationDynaBean
@Test
public void testGetSimpleInt()
{
- Object value = bean.get("intProperty");
+ final Object value = bean.get("intProperty");
assertNotNull("Failed to get value", value);
ObjectAssert.assertInstanceOf("Incorrect type", Integer.class, value);
assertEquals("Incorrect value", ((Integer) value).intValue(), Integer.MAX_VALUE);
@@ -413,7 +413,7 @@ public class TestConfigurationDynaBean
@Test
public void testGetSimpleLong()
{
- Object value = bean.get("longProperty");
+ final Object value = bean.get("longProperty");
assertNotNull("Got a value", value);
ObjectAssert.assertInstanceOf("Returned incorrect type", Long.class, value);
assertEquals("Returned value of Incorrect value", ((Long) value).longValue(), Long.MAX_VALUE);
@@ -425,7 +425,7 @@ public class TestConfigurationDynaBean
@Test
public void testGetSimpleShort()
{
- Object value = bean.get("shortProperty");
+ final Object value = bean.get("shortProperty");
assertNotNull("Got a value", value);
ObjectAssert.assertInstanceOf("Got correct type", Short.class, value);
assertEquals("Got correct value", ((Short) value).shortValue(), Short.MAX_VALUE);
@@ -437,7 +437,7 @@ public class TestConfigurationDynaBean
@Test
public void testGetSimpleString()
{
- Object value = bean.get("stringProperty");
+ final Object value = bean.get("stringProperty");
assertNotNull("Got a value", value);
ObjectAssert.assertInstanceOf("Got correct type", String.class, value);
assertEquals("Got correct value", value, "This is a string");
@@ -529,13 +529,13 @@ public class TestConfigurationDynaBean
@Test
public void testSetArrayValue()
{
- MapConfiguration configuration = new MapConfiguration(new HashMap<String, Object>());
+ final MapConfiguration configuration = new MapConfiguration(new HashMap<String, Object>());
configuration.getMap().put("objectArray", new Object[] {"value1", "value2", "value3"});
- ConfigurationDynaBean bean = new ConfigurationDynaBean(configuration);
+ final ConfigurationDynaBean bean = new ConfigurationDynaBean(configuration);
bean.set("objectArray", 1, "New Value 1");
- Object value = bean.get("objectArray", 1);
+ final Object value = bean.get("objectArray", 1);
assertNotNull("Returned new value 1", value);
ObjectAssert.assertInstanceOf("Returned String new value 1", String.class, value);
@@ -561,8 +561,8 @@ public class TestConfigurationDynaBean
@Test
public void testSetSimpleBoolean()
{
- boolean oldValue = ((Boolean) bean.get("booleanProperty")).booleanValue();
- boolean newValue = !oldValue;
+ final boolean oldValue = ((Boolean) bean.get("booleanProperty")).booleanValue();
+ final boolean newValue = !oldValue;
bean.set("booleanProperty", new Boolean(newValue));
assertTrue("Matched new value", newValue == ((Boolean) bean.get("booleanProperty")).booleanValue());
}
@@ -573,8 +573,8 @@ public class TestConfigurationDynaBean
@Test
public void testSetSimpleDouble()
{
- double oldValue = ((Double) bean.get("doubleProperty")).doubleValue();
- double newValue = oldValue + 1.0;
+ final double oldValue = ((Double) bean.get("doubleProperty")).doubleValue();
+ final double newValue = oldValue + 1.0;
bean.set("doubleProperty", new Double(newValue));
assertEquals("Matched new value", newValue, ((Double) bean.get("doubleProperty")).doubleValue(), 0.005);
}
@@ -585,8 +585,8 @@ public class TestConfigurationDynaBean
@Test
public void testSetSimpleFloat()
{
- float oldValue = ((Float) bean.get("floatProperty")).floatValue();
- float newValue = oldValue + (float) 1.0;
+ final float oldValue = ((Float) bean.get("floatProperty")).floatValue();
+ final float newValue = oldValue + (float) 1.0;
bean.set("floatProperty", new Float(newValue));
assertEquals("Matched new value", newValue, ((Float) bean.get("floatProperty")).floatValue(), 0.005f);
}
@@ -597,8 +597,8 @@ public class TestConfigurationDynaBean
@Test
public void testSetSimpleInt()
{
- int oldValue = ((Integer) bean.get("intProperty")).intValue();
- int newValue = oldValue + 1;
+ final int oldValue = ((Integer) bean.get("intProperty")).intValue();
+ final int newValue = oldValue + 1;
bean.set("intProperty", new Integer(newValue));
assertEquals("Matched new value", newValue, ((Integer) bean.get("intProperty")).intValue());
}
@@ -609,8 +609,8 @@ public class TestConfigurationDynaBean
@Test
public void testSetSimpleLong()
{
- long oldValue = ((Long) bean.get("longProperty")).longValue();
- long newValue = oldValue + 1;
+ final long oldValue = ((Long) bean.get("longProperty")).longValue();
+ final long newValue = oldValue + 1;
bean.set("longProperty", new Long(newValue));
assertEquals("Matched new value", newValue, ((Long) bean.get("longProperty")).longValue());
}
@@ -621,8 +621,8 @@ public class TestConfigurationDynaBean
@Test
public void testSetSimpleShort()
{
- short oldValue = ((Short) bean.get("shortProperty")).shortValue();
- short newValue = (short) (oldValue + 1);
+ final short oldValue = ((Short) bean.get("shortProperty")).shortValue();
+ final short newValue = (short) (oldValue + 1);
bean.set("shortProperty", new Short(newValue));
assertEquals("Matched new value", newValue, ((Short) bean.get("shortProperty")).shortValue());
}
@@ -633,8 +633,8 @@ public class TestConfigurationDynaBean
@Test
public void testSetSimpleString()
{
- String oldValue = (String) bean.get("stringProperty");
- String newValue = oldValue + " Extra Value";
+ final String oldValue = (String) bean.get("stringProperty");
+ final String newValue = oldValue + " Extra Value";
bean.set("stringProperty", newValue);
assertEquals("Matched new value", newValue, bean.get("stringProperty"));
}
@@ -663,9 +663,9 @@ public class TestConfigurationDynaBean
* @param name Name of the property to be retrieved
* @param type Expected class type of this property
*/
- protected void testGetDescriptorBase(String name, Class<?> type)
+ protected void testGetDescriptorBase(final String name, final Class<?> type)
{
- DynaProperty descriptor = bean.getDynaClass().getDynaProperty(name);
+ final DynaProperty descriptor = bean.getDynaClass().getDynaProperty(name);
assertNotNull("Failed to get descriptor", descriptor);
assertEquals("Got incorrect type", type, descriptor.getType());
@@ -677,9 +677,9 @@ public class TestConfigurationDynaBean
@Test
public void testNestedPropeties()
{
- ConfigurationDynaBean nested = (ConfigurationDynaBean) bean.get("mappedProperty");
+ final ConfigurationDynaBean nested = (ConfigurationDynaBean) bean.get("mappedProperty");
- String value = (String) nested.get("key1");
+ final String value = (String) nested.get("key1");
assertEquals("Can find first value", "First Value", value);
nested.set("key1", "undefined");
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestConstructorArg.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestConstructorArg.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestConstructorArg.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestConstructorArg.java Thu Sep 27 22:24:23 2018
@@ -44,9 +44,9 @@ public class TestConstructorArg
@Test
public void testIsNestedBeanDeclarationTrue()
{
- BeanDeclaration decl = EasyMock.createMock(BeanDeclaration.class);
+ final BeanDeclaration decl = EasyMock.createMock(BeanDeclaration.class);
EasyMock.replay(decl);
- ConstructorArg arg = ConstructorArg.forBeanDeclaration(decl);
+ final ConstructorArg arg = ConstructorArg.forBeanDeclaration(decl);
assertTrue("No bean declaration", arg.isNestedBeanDeclaration());
}
@@ -56,7 +56,7 @@ public class TestConstructorArg
@Test
public void testIsNestedBeanDeclarationFalse()
{
- ConstructorArg arg = ConstructorArg.forValue("test");
+ final ConstructorArg arg = ConstructorArg.forValue("test");
assertFalse("A bean declaration", arg.isNestedBeanDeclaration());
}
@@ -66,7 +66,7 @@ public class TestConstructorArg
@Test
public void testMatchesNoType()
{
- ConstructorArg arg = ConstructorArg.forValue(42);
+ final ConstructorArg arg = ConstructorArg.forValue(42);
assertTrue("No match (1)", arg.matches(String.class));
assertTrue("No match (2)", arg.matches(getClass()));
}
@@ -77,7 +77,7 @@ public class TestConstructorArg
@Test
public void testMatchesWithType()
{
- ConstructorArg arg = ConstructorArg.forValue("42", int.class.getName());
+ final ConstructorArg arg = ConstructorArg.forValue("42", int.class.getName());
assertTrue("Wrong result (1)", arg.matches(Integer.TYPE));
assertFalse("Wrong result (2)", arg.matches(Integer.class));
assertFalse("Wrong result (3)", arg.matches(String.class));
@@ -89,7 +89,7 @@ public class TestConstructorArg
@Test
public void testMatchesNull()
{
- ConstructorArg arg = ConstructorArg.forValue(0);
+ final ConstructorArg arg = ConstructorArg.forValue(0);
assertFalse("Wrong result", arg.matches(null));
}
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestDefaultBeanFactory.java Thu Sep 27 22:24:23 2018
@@ -79,7 +79,7 @@ public class TestDefaultBeanFactory
private final BeanHelper beanHelper = new BeanHelper();
@Override
- public void initBean(Object bean, BeanDeclaration data)
+ public void initBean(final Object bean, final BeanDeclaration data)
{
beanHelper.initBean(bean, data);
}
@@ -103,7 +103,7 @@ public class TestDefaultBeanFactory
}
@Override
- public Object createBean(BeanDeclaration data)
+ public Object createBean(final BeanDeclaration data)
{
return beanHelper.createBean(data);
}
@@ -137,7 +137,7 @@ public class TestDefaultBeanFactory
@Test
public void testInitWithConversionHandler()
{
- ConversionHandler handler =
+ final ConversionHandler handler =
EasyMock.createMock(ConversionHandler.class);
EasyMock.replay(handler);
factory = new DefaultBeanFactory(handler);
@@ -151,15 +151,15 @@ public class TestDefaultBeanFactory
@Test
public void testCreateBean() throws Exception
{
- BeanDeclarationTestImpl decl = new BeanDeclarationTestImpl();
- Map<String, Object> props = new HashMap<>();
+ final BeanDeclarationTestImpl decl = new BeanDeclarationTestImpl();
+ final Map<String, Object> props = new HashMap<>();
props.put("throwExceptionOnMissing", Boolean.TRUE);
decl.setBeanProperties(props);
- Object bean = factory.createBean(createBcc(PropertiesConfiguration.class, decl));
+ final Object bean = factory.createBean(createBcc(PropertiesConfiguration.class, decl));
assertNotNull("New bean is null", bean);
assertEquals("Bean is of wrong class", PropertiesConfiguration.class,
bean.getClass());
- PropertiesConfiguration config = (PropertiesConfiguration) bean;
+ final PropertiesConfiguration config = (PropertiesConfiguration) bean;
assertTrue("Bean was not initialized", config
.isThrowExceptionOnMissing());
}
@@ -170,12 +170,12 @@ public class TestDefaultBeanFactory
@Test
public void testCreateBeanConstructor() throws Exception
{
- BeanDeclarationTestImpl decl = new BeanDeclarationTestImpl();
- Collection<ConstructorArg> args = new ArrayList<>();
+ final BeanDeclarationTestImpl decl = new BeanDeclarationTestImpl();
+ final Collection<ConstructorArg> args = new ArrayList<>();
args.add(ConstructorArg.forValue("test"));
args.add(ConstructorArg.forValue("42"));
decl.setConstructorArgs(args);
- BeanCreationTestCtorBean bean =
+ final BeanCreationTestCtorBean bean =
(BeanCreationTestCtorBean) factory.createBean(createBcc(
BeanCreationTestCtorBean.class, decl));
assertEquals("Wrong string property", "test", bean.getStringValue());
@@ -189,16 +189,16 @@ public class TestDefaultBeanFactory
@Test
public void testCreateBeanConstructorNestedBean() throws Exception
{
- BeanDeclarationTestImpl declNested = new BeanDeclarationTestImpl();
- Collection<ConstructorArg> args = new ArrayList<>();
+ final BeanDeclarationTestImpl declNested = new BeanDeclarationTestImpl();
+ final Collection<ConstructorArg> args = new ArrayList<>();
args.add(ConstructorArg.forValue("test", String.class.getName()));
declNested.setConstructorArgs(args);
declNested.setBeanClassName(BeanCreationTestCtorBean.class.getName());
- BeanDeclarationTestImpl decl = new BeanDeclarationTestImpl();
+ final BeanDeclarationTestImpl decl = new BeanDeclarationTestImpl();
decl.setConstructorArgs(Collections.singleton(ConstructorArg
.forBeanDeclaration(declNested,
BeanCreationTestBean.class.getName())));
- BeanCreationTestCtorBean bean =
+ final BeanCreationTestCtorBean bean =
(BeanCreationTestCtorBean) factory.createBean(createBcc(
BeanCreationTestCtorBean.class, decl));
assertNotNull("Buddy bean was not set", bean.getBuddy());
@@ -212,8 +212,8 @@ public class TestDefaultBeanFactory
@Test
public void testFindMatchingConstructorNoArgs()
{
- BeanDeclarationTestImpl decl = new BeanDeclarationTestImpl();
- Constructor<BeanCreationTestBean> ctor =
+ final BeanDeclarationTestImpl decl = new BeanDeclarationTestImpl();
+ final Constructor<BeanCreationTestBean> ctor =
DefaultBeanFactory.findMatchingConstructor(BeanCreationTestBean.class, decl);
assertEquals("Not the standard constructor", 0,
ctor.getParameterTypes().length);
@@ -226,14 +226,14 @@ public class TestDefaultBeanFactory
@Test
public void testFindMatchingConstructorArgCount()
{
- BeanDeclarationTestImpl decl = new BeanDeclarationTestImpl();
- Collection<ConstructorArg> args = new ArrayList<>();
+ final BeanDeclarationTestImpl decl = new BeanDeclarationTestImpl();
+ final Collection<ConstructorArg> args = new ArrayList<>();
args.add(ConstructorArg.forValue(TEST_STRING));
args.add(ConstructorArg.forValue(String.valueOf(TEST_INT)));
decl.setConstructorArgs(args);
- Constructor<BeanCreationTestCtorBean> ctor =
+ final Constructor<BeanCreationTestCtorBean> ctor =
DefaultBeanFactory.findMatchingConstructor(BeanCreationTestCtorBean.class, decl);
- Class<?>[] paramTypes = ctor.getParameterTypes();
+ final Class<?>[] paramTypes = ctor.getParameterTypes();
assertEquals("Wrong number of parameters", 2, paramTypes.length);
assertEquals("Wrong parameter type 1", String.class, paramTypes[0]);
assertEquals("Wrong parameter type 2", Integer.TYPE, paramTypes[1]);
@@ -245,8 +245,8 @@ public class TestDefaultBeanFactory
@Test(expected = ConfigurationRuntimeException.class)
public void testFindMatchingConstructorAmbiguous()
{
- BeanDeclarationTestImpl decl = new BeanDeclarationTestImpl();
- Collection<ConstructorArg> args = new ArrayList<>();
+ final BeanDeclarationTestImpl decl = new BeanDeclarationTestImpl();
+ final Collection<ConstructorArg> args = new ArrayList<>();
args.add(ConstructorArg.forValue(TEST_STRING));
decl.setConstructorArgs(args);
DefaultBeanFactory.findMatchingConstructor(BeanCreationTestCtorBean.class, decl);
@@ -259,14 +259,14 @@ public class TestDefaultBeanFactory
@Test
public void testFindMatchingConstructorExplicitType()
{
- BeanDeclarationTestImpl decl = new BeanDeclarationTestImpl();
- Collection<ConstructorArg> args = new ArrayList<>();
+ final BeanDeclarationTestImpl decl = new BeanDeclarationTestImpl();
+ final Collection<ConstructorArg> args = new ArrayList<>();
args.add(ConstructorArg.forBeanDeclaration(setUpBeanDeclaration(),
BeanCreationTestBean.class.getName()));
decl.setConstructorArgs(args);
- Constructor<BeanCreationTestCtorBean> ctor =
+ final Constructor<BeanCreationTestCtorBean> ctor =
DefaultBeanFactory.findMatchingConstructor(BeanCreationTestCtorBean.class, decl);
- Class<?>[] paramTypes = ctor.getParameterTypes();
+ final Class<?>[] paramTypes = ctor.getParameterTypes();
assertEquals("Wrong number of parameters", 1, paramTypes.length);
assertEquals("Wrong parameter type", BeanCreationTestBean.class, paramTypes[0]);
}
@@ -278,19 +278,19 @@ public class TestDefaultBeanFactory
*/
private static BeanDeclarationTestImpl setUpBeanDeclaration()
{
- BeanDeclarationTestImpl data = new BeanDeclarationTestImpl();
- Map<String, Object> properties = new HashMap<>();
+ final BeanDeclarationTestImpl data = new BeanDeclarationTestImpl();
+ final Map<String, Object> properties = new HashMap<>();
properties.put("stringValue", TEST_STRING);
properties.put("intValue", String.valueOf(TEST_INT));
data.setBeanProperties(properties);
- BeanDeclarationTestImpl buddyData = new BeanDeclarationTestImpl();
- Map<String, Object> properties2 = new HashMap<>();
+ final BeanDeclarationTestImpl buddyData = new BeanDeclarationTestImpl();
+ final Map<String, Object> properties2 = new HashMap<>();
properties2.put("stringValue", "Another test string");
properties2.put("intValue", new Integer(100));
buddyData.setBeanProperties(properties2);
buddyData.setBeanClassName(BeanCreationTestBean.class.getName());
- Map<String, Object> nested = new HashMap<>();
+ final Map<String, Object> nested = new HashMap<>();
nested.put("buddy", buddyData);
data.setNestedBeanDeclarations(nested);
return data;
@@ -302,8 +302,8 @@ public class TestDefaultBeanFactory
@Test
public void testFindMatchingConstructorNoMatch()
{
- BeanDeclarationTestImpl decl = new BeanDeclarationTestImpl();
- Collection<ConstructorArg> args = new ArrayList<>();
+ final BeanDeclarationTestImpl decl = new BeanDeclarationTestImpl();
+ final Collection<ConstructorArg> args = new ArrayList<>();
args.add(ConstructorArg.forValue(TEST_STRING, getClass().getName()));
decl.setConstructorArgs(args);
try
@@ -311,9 +311,9 @@ public class TestDefaultBeanFactory
DefaultBeanFactory.findMatchingConstructor(BeanCreationTestCtorBean.class, decl);
fail("No exception thrown!");
}
- catch (ConfigurationRuntimeException crex)
+ catch (final ConfigurationRuntimeException crex)
{
- String msg = crex.getMessage();
+ final String msg = crex.getMessage();
assertTrue("Bean class not found:" + msg,
msg.indexOf(BeanCreationTestCtorBean.class.getName()) > 0);
assertTrue("Parameter value not found: " + msg,
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/beanutils/TestXMLBeanDeclaration.java Thu Sep 27 22:24:23 2018
@@ -116,9 +116,9 @@ public class TestXMLBeanDeclaration
@Test
public void testGetBeanClassName()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
config.addProperty(KEY + "[@config-class]", getClass().getName());
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
assertEquals("Wrong class name", getClass().getName(), decl
.getBeanClassName());
}
@@ -129,7 +129,7 @@ public class TestXMLBeanDeclaration
@Test
public void testGetBeanClassNameUndefined()
{
- XMLBeanDeclaration decl = new XMLBeanDeclaration(new BaseHierarchicalConfiguration());
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(new BaseHierarchicalConfiguration());
assertNull(decl.getBeanClassName());
}
@@ -139,9 +139,9 @@ public class TestXMLBeanDeclaration
@Test
public void testGetBeanClassNameUndefinedWithEx()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
config.setThrowExceptionOnMissing(true);
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config);
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config);
assertNull("Got a bean class name", decl.getBeanClassName());
}
@@ -151,10 +151,10 @@ public class TestXMLBeanDeclaration
@Test
public void testGetBeanClassNameFromDefault()
{
- BaseHierarchicalConfiguration config =
+ final BaseHierarchicalConfiguration config =
new BaseHierarchicalConfiguration();
config.addProperty(KEY + "[@someProperty]", Boolean.TRUE);
- XMLBeanDeclaration decl =
+ final XMLBeanDeclaration decl =
new XMLBeanDeclaration(config, KEY, false, getClass().getName());
assertEquals("Wrong class name", getClass().getName(),
decl.getBeanClassName());
@@ -167,10 +167,10 @@ public class TestXMLBeanDeclaration
@Test
public void tetGetBeanClassNameDefaultOverride()
{
- BaseHierarchicalConfiguration config =
+ final BaseHierarchicalConfiguration config =
new BaseHierarchicalConfiguration();
config.addProperty(KEY + "[@config-class]", getClass().getName());
- XMLBeanDeclaration decl =
+ final XMLBeanDeclaration decl =
new XMLBeanDeclaration(config, KEY, false,
"someDefaultClassName");
assertEquals("Wrong class name", getClass().getName(),
@@ -183,9 +183,9 @@ public class TestXMLBeanDeclaration
@Test
public void testGetBeanFactoryName()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
config.addProperty(KEY + "[@config-factory]", "myFactory");
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
assertEquals("Wrong factory name", "myFactory", decl
.getBeanFactoryName());
}
@@ -196,7 +196,7 @@ public class TestXMLBeanDeclaration
@Test
public void testGetBeanFactoryNameUndefined()
{
- XMLBeanDeclaration decl = new XMLBeanDeclaration(new BaseHierarchicalConfiguration());
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(new BaseHierarchicalConfiguration());
assertNull(decl.getBeanFactoryName());
}
@@ -206,9 +206,9 @@ public class TestXMLBeanDeclaration
@Test
public void testGetBeanFactoryNameUndefinedWithEx()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
config.setThrowExceptionOnMissing(true);
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config);
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config);
assertNull("Got a factory name", decl.getBeanFactoryName());
}
@@ -218,11 +218,11 @@ public class TestXMLBeanDeclaration
@Test
public void testGetBeanFactoryParameter()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
config
.addProperty(KEY + "[@config-factoryParam]",
"myFactoryParameter");
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
assertEquals("Wrong factory parameter", "myFactoryParameter", decl
.getBeanFactoryParameter());
}
@@ -233,7 +233,7 @@ public class TestXMLBeanDeclaration
@Test
public void testGetBeanFactoryParameterUndefined()
{
- XMLBeanDeclaration decl = new XMLBeanDeclaration(new BaseHierarchicalConfiguration());
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(new BaseHierarchicalConfiguration());
assertNull(decl.getBeanFactoryParameter());
}
@@ -243,9 +243,9 @@ public class TestXMLBeanDeclaration
@Test
public void testGetBeanFactoryParameterUndefinedWithEx()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
config.setThrowExceptionOnMissing(true);
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config);
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config);
assertNull("Got a factory parameter", decl.getBeanFactoryParameter());
}
@@ -256,9 +256,9 @@ public class TestXMLBeanDeclaration
@Test
public void testGetBeanProperties()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
setupBeanDeclaration(config, KEY, TEST_PROPS, TEST_VALUES);
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
checkProperties(decl, TEST_PROPS, TEST_VALUES);
}
@@ -269,11 +269,11 @@ public class TestXMLBeanDeclaration
@Test
public void testGetBeanPropertiesWithReservedAttributes()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
setupBeanDeclaration(config, KEY, TEST_PROPS, TEST_VALUES);
config.addProperty(KEY + "[@config-testattr]", "yes");
config.addProperty(KEY + "[@config-anothertest]", "this, too");
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
checkProperties(decl, TEST_PROPS, TEST_VALUES);
}
@@ -283,8 +283,8 @@ public class TestXMLBeanDeclaration
@Test
public void testGetBeanPropertiesEmpty()
{
- XMLBeanDeclaration decl = new XMLBeanDeclaration(new BaseHierarchicalConfiguration());
- Map<String, Object> props = decl.getBeanProperties();
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(new BaseHierarchicalConfiguration());
+ final Map<String, Object> props = decl.getBeanProperties();
assertTrue("Properties found", props == null || props.isEmpty());
}
@@ -296,10 +296,10 @@ public class TestXMLBeanDeclaration
*/
private static BaseHierarchicalConfiguration prepareNestedBeanDeclarations()
{
- BaseHierarchicalConfiguration config =
+ final BaseHierarchicalConfiguration config =
new BaseHierarchicalConfiguration();
setupBeanDeclaration(config, KEY, TEST_PROPS, TEST_VALUES);
- String keyCtorArg = KEY + ".config-constrarg";
+ final String keyCtorArg = KEY + ".config-constrarg";
setupBeanDeclaration(config, keyCtorArg, CTOR_COMPLEX_ATTRIBUTES,
CTOR_COMPLEX_VALUES);
config.addProperty(keyCtorArg + "[@config-class]", "TestClass");
@@ -322,16 +322,16 @@ public class TestXMLBeanDeclaration
@Test
public void testGetNestedBeanDeclarations()
{
- BaseHierarchicalConfiguration config = prepareNestedBeanDeclarations();
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
+ final BaseHierarchicalConfiguration config = prepareNestedBeanDeclarations();
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
checkProperties(decl, TEST_PROPS, TEST_VALUES);
- Map<String, Object> nested = decl.getNestedBeanDeclarations();
+ final Map<String, Object> nested = decl.getNestedBeanDeclarations();
assertEquals("Wrong number of nested declarations",
COMPLEX_PROPS.length, nested.size());
for (int i = 0; i < COMPLEX_PROPS.length; i++)
{
- XMLBeanDeclaration d = (XMLBeanDeclaration) nested
+ final XMLBeanDeclaration d = (XMLBeanDeclaration) nested
.get(COMPLEX_PROPS[i]);
assertNotNull("No declaration found for " + COMPLEX_PROPS[i], d);
checkProperties(d, COMPLEX_ATTRIBUTES[i], COMPLEX_VALUES[i]);
@@ -347,12 +347,12 @@ public class TestXMLBeanDeclaration
@Test
public void testGetNestedBeanDeclarationsReservedCharacter()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
- String key = KEY + ".address..private";
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final String key = KEY + ".address..private";
setupBeanDeclaration(config, key, COMPLEX_ATTRIBUTES[0], COMPLEX_VALUES[0]);
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
- Map<String, Object> nested = decl.getNestedBeanDeclarations();
+ final Map<String, Object> nested = decl.getNestedBeanDeclarations();
assertTrue("Key not found", nested.containsKey("address.private"));
}
@@ -363,19 +363,19 @@ public class TestXMLBeanDeclaration
@Test
public void testGetNestedBeanDeclarationsFactoryMethod()
{
- BaseHierarchicalConfiguration config = prepareNestedBeanDeclarations();
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY)
+ final BaseHierarchicalConfiguration config = prepareNestedBeanDeclarations();
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY)
{
@Override
- BeanDeclaration createBeanDeclaration(NodeData<?> node)
+ BeanDeclaration createBeanDeclaration(final NodeData<?> node)
{
return new XMLBeanDeclarationTestImpl(getConfiguration()
.configurationAt(node.nodeName()), node);
}
};
- Map<String, Object> nested = decl.getNestedBeanDeclarations();
- for (String element : COMPLEX_PROPS) {
- Object d = nested.get(element);
+ final Map<String, Object> nested = decl.getNestedBeanDeclarations();
+ for (final String element : COMPLEX_PROPS) {
+ final Object d = nested.get(element);
assertTrue("Wrong class for bean declaration: " + d,
d instanceof XMLBeanDeclarationTestImpl);
}
@@ -387,10 +387,10 @@ public class TestXMLBeanDeclaration
@Test
public void testGetNestedBeanDeclarationsEmpty()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
setupBeanDeclaration(config, KEY, TEST_PROPS, TEST_VALUES);
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
- Map<String, Object> nested = decl.getNestedBeanDeclarations();
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
+ final Map<String, Object> nested = decl.getNestedBeanDeclarations();
assertTrue("Found nested declarations", nested == null
|| nested.isEmpty());
}
@@ -401,15 +401,15 @@ public class TestXMLBeanDeclaration
@Test
public void testGetInterpolatedBeanProperties()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
- String[] varValues = new String[TEST_PROPS.length];
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final String[] varValues = new String[TEST_PROPS.length];
for(int i = 0; i < TEST_PROPS.length; i++)
{
varValues[i] = "${" + VARS + TEST_PROPS[i] + "}";
config.addProperty(VARS + TEST_PROPS[i], TEST_VALUES[i]);
}
setupBeanDeclaration(config, KEY, TEST_PROPS, varValues);
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
checkProperties(decl, TEST_PROPS, TEST_VALUES);
}
@@ -420,7 +420,7 @@ public class TestXMLBeanDeclaration
@Test(expected = ConfigurationRuntimeException.class)
public void testInitFromUndefinedKey()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
setupBeanDeclaration(config, KEY, TEST_PROPS, TEST_VALUES);
new XMLBeanDeclaration(config, "undefined_key");
}
@@ -434,9 +434,9 @@ public class TestXMLBeanDeclaration
@Test
public void testInitFromUndefinedKeyOptional()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
setupBeanDeclaration(config, KEY, TEST_PROPS, TEST_VALUES);
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config, "undefined_key", true);
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config, "undefined_key", true);
assertNull("Found a bean class", decl.getBeanClassName());
}
@@ -447,7 +447,7 @@ public class TestXMLBeanDeclaration
@Test(expected = ConfigurationRuntimeException.class)
public void testInitFromMultiValueKey()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
config.addProperty(KEY, "myFirstKey");
config.addProperty(KEY, "mySecondKey");
new XMLBeanDeclaration(config, KEY);
@@ -459,19 +459,19 @@ public class TestXMLBeanDeclaration
@Test
public void testGetConstructorArgs()
{
- BaseHierarchicalConfiguration config = prepareNestedBeanDeclarations();
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
- Collection<ConstructorArg> args = decl.getConstructorArgs();
+ final BaseHierarchicalConfiguration config = prepareNestedBeanDeclarations();
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
+ final Collection<ConstructorArg> args = decl.getConstructorArgs();
assertEquals("Wrong number of constructor arguments", 2, args.size());
- Iterator<ConstructorArg> it = args.iterator();
- ConstructorArg arg1 = it.next();
+ final Iterator<ConstructorArg> it = args.iterator();
+ final ConstructorArg arg1 = it.next();
assertTrue("No bean declaration", arg1.isNestedBeanDeclaration());
checkProperties(arg1.getBeanDeclaration(), CTOR_COMPLEX_ATTRIBUTES,
CTOR_COMPLEX_VALUES);
assertNull("Got a type", arg1.getTypeName());
assertEquals("Wrong class name", "TestClass", arg1.getBeanDeclaration()
.getBeanClassName());
- ConstructorArg arg2 = it.next();
+ final ConstructorArg arg2 = it.next();
assertFalse("A bean declaration", arg2.isNestedBeanDeclaration());
assertEquals("Wrong value", CTOR_ID, arg2.getValue());
assertEquals("Wrong type", "long", arg2.getTypeName());
@@ -483,13 +483,13 @@ public class TestXMLBeanDeclaration
@Test
public void testGetConstructorArgsNullArg()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
setupBeanDeclaration(config, KEY, TEST_PROPS, TEST_VALUES);
config.addProperty(KEY + ".config-constrarg", "");
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
- Collection<ConstructorArg> args = decl.getConstructorArgs();
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
+ final Collection<ConstructorArg> args = decl.getConstructorArgs();
assertEquals("Wrong number of constructor arguments", 1, args.size());
- ConstructorArg arg = args.iterator().next();
+ final ConstructorArg arg = args.iterator().next();
assertFalse("A bean declaration", arg.isNestedBeanDeclaration());
assertNull("Got a value", arg.getValue());
}
@@ -500,14 +500,14 @@ public class TestXMLBeanDeclaration
@Test
public void testGetInterpolatedConstructorArgs()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
- String expectedValue = "ctorArg";
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final String expectedValue = "ctorArg";
config.addProperty("value", expectedValue);
setupBeanDeclaration(config, KEY, TEST_PROPS, TEST_VALUES);
config.addProperty(KEY + ".config-constrarg[@config-value]", "${value}");
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
- Collection<ConstructorArg> args = decl.getConstructorArgs();
- ConstructorArg arg = args.iterator().next();
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
+ final Collection<ConstructorArg> args = decl.getConstructorArgs();
+ final ConstructorArg arg = args.iterator().next();
assertEquals("Wrong interpolated value", expectedValue, arg.getValue());
}
@@ -517,15 +517,15 @@ public class TestXMLBeanDeclaration
@Test
public void testInterpolateNoInterpolator()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
config.addProperty("value", "expectedValue");
setupBeanDeclaration(config, KEY, TEST_PROPS, TEST_VALUES);
- String value = "${value}";
+ final String value = "${value}";
config.addProperty(KEY + ".config-constrarg[@config-value]", value);
config.setInterpolator(null);
- XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
- Collection<ConstructorArg> args = decl.getConstructorArgs();
- ConstructorArg arg = args.iterator().next();
+ final XMLBeanDeclaration decl = new XMLBeanDeclaration(config, KEY);
+ final Collection<ConstructorArg> args = decl.getConstructorArgs();
+ final ConstructorArg arg = args.iterator().next();
assertEquals("Value was changed", value, arg.getValue());
}
@@ -538,8 +538,8 @@ public class TestXMLBeanDeclaration
* @param names an array with the names of the properties
* @param values an array with the corresponding values
*/
- private static void setupBeanDeclaration(HierarchicalConfiguration<?> config,
- String key, String[] names, String[] values)
+ private static void setupBeanDeclaration(final HierarchicalConfiguration<?> config,
+ final String key, final String[] names, final String[] values)
{
for (int i = 0; i < names.length; i++)
{
@@ -554,10 +554,10 @@ public class TestXMLBeanDeclaration
* @param names an array with the expected property names
* @param values an array with the expected property values
*/
- private static void checkProperties(BeanDeclaration beanDecl, String[] names,
- String[] values)
+ private static void checkProperties(final BeanDeclaration beanDecl, final String[] names,
+ final String[] values)
{
- Map<String, Object> props = beanDecl.getBeanProperties();
+ final Map<String, Object> props = beanDecl.getBeanProperties();
assertEquals("Wrong number of properties", names.length, props.size());
for (int i = 0; i < names.length; i++)
{
@@ -574,8 +574,8 @@ public class TestXMLBeanDeclaration
*/
private static class XMLBeanDeclarationTestImpl extends XMLBeanDeclaration
{
- public XMLBeanDeclarationTestImpl(HierarchicalConfiguration<?> config,
- NodeData<?> node)
+ public XMLBeanDeclarationTestImpl(final HierarchicalConfiguration<?> config,
+ final NodeData<?> node)
{
super(config, node);
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/BuilderEventListenerImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/BuilderEventListenerImpl.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/BuilderEventListenerImpl.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/BuilderEventListenerImpl.java Thu Sep 27 22:24:23 2018
@@ -48,7 +48,7 @@ public class BuilderEventListenerImpl im
* {@inheritDoc} This implementation just records the event.
*/
@Override
- public void onEvent(ConfigurationBuilderEvent event)
+ public void onEvent(final ConfigurationBuilderEvent event)
{
events.add(event);
}
@@ -63,14 +63,15 @@ public class BuilderEventListenerImpl im
* @return the next received event
*/
public <T extends ConfigurationBuilderEvent> T nextEvent(
- EventType<T> eventType)
+ final EventType<T> eventType)
{
- Iterator<ConfigurationBuilderEvent> it = initIterator();
+ final Iterator<ConfigurationBuilderEvent> it = initIterator();
assertTrue("Too few events received", it.hasNext());
- ConfigurationBuilderEvent nextEvent = it.next();
+ final ConfigurationBuilderEvent nextEvent = it.next();
assertEquals("Wrong event type", eventType, nextEvent.getEventType());
// Safe cast because of the comparison of the event type
@SuppressWarnings("unchecked")
+ final
T resultEvent = (T) nextEvent;
return resultEvent;
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/ParametersBeanTestImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/ParametersBeanTestImpl.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/ParametersBeanTestImpl.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/ParametersBeanTestImpl.java Thu Sep 27 22:24:23 2018
@@ -34,7 +34,7 @@ public class ParametersBeanTestImpl exte
return intProperty;
}
- public void setIntProperty(int intProperty)
+ public void setIntProperty(final int intProperty)
{
this.intProperty = intProperty;
}
@@ -44,12 +44,12 @@ public class ParametersBeanTestImpl exte
return stringProperty;
}
- public void setStringProperty(String stringProperty)
+ public void setStringProperty(final String stringProperty)
{
this.stringProperty = stringProperty;
}
- public ParametersBeanTestImpl setFluentProperty(String value)
+ public ParametersBeanTestImpl setFluentProperty(final String value)
{
setStringProperty(value);
return this;
@@ -60,7 +60,7 @@ public class ParametersBeanTestImpl exte
return fluentGetProperty;
}
- public ParametersBeanTestImpl setFluentPropertyWithGet(String s)
+ public ParametersBeanTestImpl setFluentPropertyWithGet(final String s)
{
fluentGetProperty = s;
return this;
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestAutoSaveListener.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestAutoSaveListener.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestAutoSaveListener.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestAutoSaveListener.java Thu Sep 27 22:24:23 2018
@@ -48,7 +48,7 @@ public class TestAutoSaveListener
*
* @param before flag whether the event is before the update
*/
- private void fireChangeEvent(boolean before)
+ private void fireChangeEvent(final boolean before)
{
listener.onEvent(new ConfigurationEvent(this,
ConfigurationEvent.ADD_PROPERTY, "someProperty",
@@ -62,8 +62,8 @@ public class TestAutoSaveListener
@Test
public void testUpdateFileHandler()
{
- FileHandler handler = EasyMock.createMock(FileHandler.class);
- FileHandler handler2 = EasyMock.createMock(FileHandler.class);
+ final FileHandler handler = EasyMock.createMock(FileHandler.class);
+ final FileHandler handler2 = EasyMock.createMock(FileHandler.class);
handler.addFileHandlerListener(listener);
handler.removeFileHandlerListener(listener);
handler2.addFileHandlerListener(listener);
@@ -80,7 +80,7 @@ public class TestAutoSaveListener
@Test
public void testUpdateFileHandlerNull()
{
- FileHandler handler = EasyMock.createMock(FileHandler.class);
+ final FileHandler handler = EasyMock.createMock(FileHandler.class);
handler.addFileHandlerListener(listener);
handler.removeFileHandlerListener(listener);
EasyMock.replay(handler);
@@ -150,7 +150,7 @@ public class TestAutoSaveListener
{
builder.save();
EasyMock.replay(builder);
- FileHandler handler = new FileHandler();
+ final FileHandler handler = new FileHandler();
listener.loading(handler);
fireChangeEvent(false);
listener.loaded(handler);