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 [16/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/TestAbstractConfigurationBasicFeatures.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java Thu Sep 27 22:24:23 2018
@@ -68,16 +68,16 @@ public class TestAbstractConfigurationBa
@Test
public void testClearIteratorNoRemove()
{
- AbstractConfiguration config = new TestConfigurationImpl(
+ final AbstractConfiguration config = new TestConfigurationImpl(
new BaseConfiguration())
{
// return an iterator that does not support remove operations
@Override
protected Iterator<String> getKeysInternal()
{
- Collection<String> keyCol = new ArrayList<>();
+ final Collection<String> keyCol = new ArrayList<>();
ConfigurationAssert.appendKeys(getUnderlyingConfiguration(), keyCol);
- String[] keys = keyCol.toArray(new String[keyCol.size()]);
+ final String[] keys = keyCol.toArray(new String[keyCol.size()]);
return Arrays.asList(keys).iterator();
}
};
@@ -96,7 +96,7 @@ public class TestAbstractConfigurationBa
@Test
public void testInterpolateEscape()
{
- AbstractConfiguration config = new TestConfigurationImpl(
+ final AbstractConfiguration config = new TestConfigurationImpl(
new PropertiesConfiguration());
config.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
config
@@ -126,7 +126,7 @@ public class TestAbstractConfigurationBa
@Test
public void testAddPropertyListNoDelimiterParsing()
{
- AbstractConfiguration config = new TestConfigurationImpl(
+ final AbstractConfiguration config = new TestConfigurationImpl(
new PropertiesConfiguration());
checkAddListProperty(config);
}
@@ -136,16 +136,16 @@ public class TestAbstractConfigurationBa
*
* @param config the configuration to be used for testing
*/
- private void checkAddListProperty(AbstractConfiguration config)
+ private void checkAddListProperty(final AbstractConfiguration config)
{
config.addProperty("test", "value1");
- Object[] lstValues1 = new Object[]
+ final Object[] lstValues1 = new Object[]
{ "value2", "value3" };
- Object[] lstValues2 = new Object[]
+ final Object[] lstValues2 = new Object[]
{ "value4", "value5", "value6" };
config.addProperty("test", lstValues1);
config.addProperty("test", Arrays.asList(lstValues2));
- List<Object> lst = config.getList("test");
+ final List<Object> lst = config.getList("test");
assertEquals("Wrong number of list elements", 6, lst.size());
for (int i = 0; i < lst.size(); i++)
{
@@ -160,12 +160,12 @@ public class TestAbstractConfigurationBa
@Test
public void testCopy()
{
- AbstractConfiguration config = setUpDestConfig();
- Configuration srcConfig = setUpSourceConfig();
+ final AbstractConfiguration config = setUpDestConfig();
+ final Configuration srcConfig = setUpSourceConfig();
config.copy(srcConfig);
for (int i = 0; i < PROP_COUNT; i++)
{
- String key = KEY_PREFIX + i;
+ final String key = KEY_PREFIX + i;
if (srcConfig.containsKey(key))
{
assertEquals("Value not replaced: " + key, srcConfig
@@ -186,8 +186,8 @@ public class TestAbstractConfigurationBa
@Test
public void testCopyWithLists()
{
- Configuration srcConfig = setUpSourceConfig();
- AbstractConfiguration config = setUpDestConfig();
+ final Configuration srcConfig = setUpSourceConfig();
+ final AbstractConfiguration config = setUpDestConfig();
config.copy(srcConfig);
checkListProperties(config);
}
@@ -198,9 +198,9 @@ public class TestAbstractConfigurationBa
@Test
public void testCopyEvents()
{
- AbstractConfiguration config = setUpDestConfig();
- Configuration srcConfig = setUpSourceConfig();
- CollectingConfigurationListener l = new CollectingConfigurationListener();
+ final AbstractConfiguration config = setUpDestConfig();
+ final Configuration srcConfig = setUpSourceConfig();
+ final CollectingConfigurationListener l = new CollectingConfigurationListener();
config.addEventListener(ConfigurationEvent.ANY, l);
config.copy(srcConfig);
checkCopyEvents(l, srcConfig, ConfigurationEvent.SET_PROPERTY);
@@ -212,7 +212,7 @@ public class TestAbstractConfigurationBa
@Test
public void testCopyNull()
{
- AbstractConfiguration config = setUpDestConfig();
+ final AbstractConfiguration config = setUpDestConfig();
config.copy(null);
ConfigurationAssert.assertConfigurationEquals(setUpDestConfig(), config);
}
@@ -224,8 +224,8 @@ public class TestAbstractConfigurationBa
@Test
public void testCopyDelimiterHandling()
{
- BaseConfiguration srcConfig = new BaseConfiguration();
- BaseConfiguration dstConfig = new BaseConfiguration();
+ final BaseConfiguration srcConfig = new BaseConfiguration();
+ final BaseConfiguration dstConfig = new BaseConfiguration();
dstConfig.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
srcConfig.setProperty(KEY_PREFIX, "C:\\Temp\\,D:\\Data");
dstConfig.copy(srcConfig);
@@ -239,15 +239,15 @@ public class TestAbstractConfigurationBa
@Test
public void testAppend()
{
- AbstractConfiguration config = setUpDestConfig();
- Configuration srcConfig = setUpSourceConfig();
+ final AbstractConfiguration config = setUpDestConfig();
+ final Configuration srcConfig = setUpSourceConfig();
config.append(srcConfig);
for (int i = 0; i < PROP_COUNT; i++)
{
- String key = KEY_PREFIX + i;
+ final String key = KEY_PREFIX + i;
if (srcConfig.containsKey(key))
{
- List<Object> values = config.getList(key);
+ final List<Object> values = config.getList(key);
assertEquals("Value not added: " + key, 2, values.size());
assertEquals("Wrong value 1 for " + key, "value" + i, values
.get(0));
@@ -269,7 +269,7 @@ public class TestAbstractConfigurationBa
@Test
public void testAppendWithLists()
{
- AbstractConfiguration config = setUpDestConfig();
+ final AbstractConfiguration config = setUpDestConfig();
config.append(setUpSourceConfig());
checkListProperties(config);
}
@@ -280,9 +280,9 @@ public class TestAbstractConfigurationBa
@Test
public void testAppendEvents()
{
- AbstractConfiguration config = setUpDestConfig();
- Configuration srcConfig = setUpSourceConfig();
- CollectingConfigurationListener l = new CollectingConfigurationListener();
+ final AbstractConfiguration config = setUpDestConfig();
+ final Configuration srcConfig = setUpSourceConfig();
+ final CollectingConfigurationListener l = new CollectingConfigurationListener();
config.addEventListener(ConfigurationEvent.ANY, l);
config.append(srcConfig);
checkCopyEvents(l, srcConfig, ConfigurationEvent.ADD_PROPERTY);
@@ -294,7 +294,7 @@ public class TestAbstractConfigurationBa
@Test
public void testAppendNull()
{
- AbstractConfiguration config = setUpDestConfig();
+ final AbstractConfiguration config = setUpDestConfig();
config.append(null);
ConfigurationAssert.assertConfigurationEquals(setUpDestConfig(), config);
}
@@ -306,8 +306,8 @@ public class TestAbstractConfigurationBa
@Test
public void testAppendDelimiterHandling()
{
- BaseConfiguration srcConfig = new BaseConfiguration();
- BaseConfiguration dstConfig = new BaseConfiguration();
+ final BaseConfiguration srcConfig = new BaseConfiguration();
+ final BaseConfiguration dstConfig = new BaseConfiguration();
dstConfig.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
srcConfig.setProperty(KEY_PREFIX, "C:\\Temp\\,D:\\Data");
dstConfig.append(srcConfig);
@@ -321,7 +321,7 @@ public class TestAbstractConfigurationBa
@Test
public void testInterpolateEnvironmentVariables()
{
- AbstractConfiguration config = new TestConfigurationImpl(
+ final AbstractConfiguration config = new TestConfigurationImpl(
new PropertiesConfiguration());
InterpolationTestHelper.testInterpolationEnvironment(config);
}
@@ -333,15 +333,15 @@ public class TestAbstractConfigurationBa
@Test
public void testSetPrefixLookupsExistingInterpolator()
{
- Lookup look = EasyMock.createMock(Lookup.class);
+ final Lookup look = EasyMock.createMock(Lookup.class);
EasyMock.replay(look);
- AbstractConfiguration config =
+ final AbstractConfiguration config =
new TestConfigurationImpl(new PropertiesConfiguration());
- int count = config.getInterpolator().getLookups().size();
- Map<String, Lookup> lookups = new HashMap<>();
+ final int count = config.getInterpolator().getLookups().size();
+ final Map<String, Lookup> lookups = new HashMap<>();
lookups.put("test", look);
config.setPrefixLookups(lookups);
- Map<String, Lookup> lookups2 = config.getInterpolator().getLookups();
+ final Map<String, Lookup> lookups2 = config.getInterpolator().getLookups();
assertEquals("Not added", count + 1, lookups2.size());
assertSame("Not found", look, lookups2.get("test"));
}
@@ -353,13 +353,13 @@ public class TestAbstractConfigurationBa
@Test
public void testSetPrefixLookupsNoInterpolator()
{
- Lookup look = EasyMock.createMock(Lookup.class);
+ final Lookup look = EasyMock.createMock(Lookup.class);
EasyMock.replay(look);
- AbstractConfiguration config =
+ final AbstractConfiguration config =
new TestConfigurationImpl(new PropertiesConfiguration());
config.setInterpolator(null);
config.setPrefixLookups(Collections.singletonMap("test", look));
- Map<String, Lookup> lookups = config.getInterpolator().getLookups();
+ final Map<String, Lookup> lookups = config.getInterpolator().getLookups();
assertEquals("Wrong number of lookups", 1, lookups.size());
assertSame("Not found", look, lookups.get("test"));
}
@@ -371,14 +371,14 @@ public class TestAbstractConfigurationBa
@Test
public void testSetDefaultLookupsExistingInterpolator()
{
- Lookup look = EasyMock.createMock(Lookup.class);
+ final Lookup look = EasyMock.createMock(Lookup.class);
EasyMock.replay(look);
- AbstractConfiguration config =
+ final AbstractConfiguration config =
new TestConfigurationImpl(new PropertiesConfiguration());
config.getInterpolator().addDefaultLookup(
new ConfigurationLookup(new PropertiesConfiguration()));
config.setDefaultLookups(Collections.singleton(look));
- List<Lookup> lookups = config.getInterpolator().getDefaultLookups();
+ final List<Lookup> lookups = config.getInterpolator().getDefaultLookups();
assertEquals("Wrong number of default lookups", 3, lookups.size());
assertSame("Wrong lookup at 1", look, lookups.get(1));
assertTrue("Wrong lookup at 2: " + lookups,
@@ -392,13 +392,13 @@ public class TestAbstractConfigurationBa
@Test
public void testSetDefaultLookupsNoInterpolator()
{
- Lookup look = EasyMock.createMock(Lookup.class);
+ final Lookup look = EasyMock.createMock(Lookup.class);
EasyMock.replay(look);
- AbstractConfiguration config =
+ final AbstractConfiguration config =
new TestConfigurationImpl(new PropertiesConfiguration());
config.setInterpolator(null);
config.setDefaultLookups(Collections.singleton(look));
- List<Lookup> lookups = config.getInterpolator().getDefaultLookups();
+ final List<Lookup> lookups = config.getInterpolator().getDefaultLookups();
assertEquals("Wrong number of default lookups", 2, lookups.size());
assertSame("Wrong lookup at 0", look, lookups.get(0));
assertTrue("Wrong lookup at 1",
@@ -412,12 +412,12 @@ public class TestAbstractConfigurationBa
@Test
public void testInstallInterpolatorNull()
{
- AbstractConfiguration config =
+ final AbstractConfiguration config =
new TestConfigurationImpl(new PropertiesConfiguration());
config.installInterpolator(null, null);
assertTrue("Got prefix lookups", config.getInterpolator().getLookups()
.isEmpty());
- List<Lookup> defLookups = config.getInterpolator().getDefaultLookups();
+ final List<Lookup> defLookups = config.getInterpolator().getDefaultLookups();
assertEquals("Wrong number of default lookups", 1, defLookups.size());
assertTrue("Wrong default lookup",
defLookups.get(0) instanceof ConfigurationLookup);
@@ -430,12 +430,12 @@ public class TestAbstractConfigurationBa
@Test
public void testSetParentInterpolatorExistingInterpolator()
{
- ConfigurationInterpolator parent =
+ final ConfigurationInterpolator parent =
EasyMock.createMock(ConfigurationInterpolator.class);
EasyMock.replay(parent);
- AbstractConfiguration config =
+ final AbstractConfiguration config =
new TestConfigurationImpl(new PropertiesConfiguration());
- ConfigurationInterpolator ci = config.getInterpolator();
+ final ConfigurationInterpolator ci = config.getInterpolator();
config.setParentInterpolator(parent);
assertSame("Parent was not set", parent, config.getInterpolator()
.getParentInterpolator());
@@ -449,10 +449,10 @@ public class TestAbstractConfigurationBa
@Test
public void testSetParentInterpolatorNoInterpolator()
{
- ConfigurationInterpolator parent =
+ final ConfigurationInterpolator parent =
EasyMock.createMock(ConfigurationInterpolator.class);
EasyMock.replay(parent);
- AbstractConfiguration config =
+ final AbstractConfiguration config =
new TestConfigurationImpl(new PropertiesConfiguration());
config.setInterpolator(null);
config.setParentInterpolator(parent);
@@ -467,8 +467,8 @@ public class TestAbstractConfigurationBa
@Test
public void testInterpolateArray()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
- String[] values = {"some", "test", "values"};
+ final PropertiesConfiguration config = new PropertiesConfiguration();
+ final String[] values = {"some", "test", "values"};
final String keyArray = "testArray";
config.addProperty(keyArray, values);
config.addProperty(KEY_PREFIX, "${" + keyArray + "}");
@@ -483,8 +483,8 @@ public class TestAbstractConfigurationBa
@Test
public void testInterpolateList()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
- List<String> values = Arrays.asList("some", "test", "values");
+ final PropertiesConfiguration config = new PropertiesConfiguration();
+ final List<String> values = Arrays.asList("some", "test", "values");
final String keyList = "testList";
config.addProperty(keyList, values);
config.addProperty(KEY_PREFIX, "${" + keyList + "}");
@@ -528,8 +528,8 @@ public class TestAbstractConfigurationBa
@Test
public void testGetStringArrayUnknown()
{
- BaseConfiguration config = new BaseConfiguration();
- String[] array = config.getStringArray(KEY_PREFIX);
+ final BaseConfiguration config = new BaseConfiguration();
+ final String[] array = config.getStringArray(KEY_PREFIX);
assertEquals("Got elements", 0, array.length);
}
@@ -537,11 +537,11 @@ public class TestAbstractConfigurationBa
* Helper method for checking getList() if the property value is a scalar.
* @param value the value of the property
*/
- private void checkGetListScalar(Object value)
+ private void checkGetListScalar(final Object value)
{
- BaseConfiguration config = new BaseConfiguration();
+ final BaseConfiguration config = new BaseConfiguration();
config.addProperty(KEY_PREFIX, value);
- List<Object> lst = config.getList(KEY_PREFIX);
+ final List<Object> lst = config.getList(KEY_PREFIX);
assertEquals("Wrong number of values", 1, lst.size());
assertEquals("Wrong value", value.toString(), lst.get(0));
}
@@ -552,11 +552,11 @@ public class TestAbstractConfigurationBa
*
* @param value the value of the property
*/
- private void checkGetStringArrayScalar(Object value)
+ private void checkGetStringArrayScalar(final Object value)
{
- BaseConfiguration config = new BaseConfiguration();
+ final BaseConfiguration config = new BaseConfiguration();
config.addProperty(KEY_PREFIX, value);
- String[] array = config.getStringArray(KEY_PREFIX);
+ final String[] array = config.getStringArray(KEY_PREFIX);
assertEquals("Weong number of elements", 1, array.length);
assertEquals("Wrong value", value.toString(), array[0]);
}
@@ -567,7 +567,7 @@ public class TestAbstractConfigurationBa
@Test
public void testNestedVariableInterpolation()
{
- BaseConfiguration config = new BaseConfiguration();
+ final BaseConfiguration config = new BaseConfiguration();
config.getInterpolator().setEnableSubstitutionInVariables(true);
config.addProperty("java.version", "1.4");
config.addProperty("jre-1.4", "C:\\java\\1.4");
@@ -582,7 +582,7 @@ public class TestAbstractConfigurationBa
@Test(expected = IllegalArgumentException.class)
public void testSetListDelimiterHandlerNull()
{
- BaseConfiguration config = new BaseConfiguration();
+ final BaseConfiguration config = new BaseConfiguration();
config.setListDelimiterHandler(null);
}
@@ -592,7 +592,7 @@ public class TestAbstractConfigurationBa
@Test
public void testDefaultListDelimiterHandler()
{
- BaseConfiguration config = new BaseConfiguration();
+ final BaseConfiguration config = new BaseConfiguration();
assertTrue(
"Wrong list delimiter handler",
config.getListDelimiterHandler() instanceof DisabledListDelimiterHandler);
@@ -604,7 +604,7 @@ public class TestAbstractConfigurationBa
@Test
public void testInterpolateString()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
config.addProperty("animal", "quick brown fox");
config.addProperty("target", "lazy dog");
config.addProperty(KEY_PREFIX, SUBST_TXT);
@@ -620,7 +620,7 @@ public class TestAbstractConfigurationBa
@Test
public void testInterpolateRecursive()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
config.addProperty("animal", "${animal_attr} fox");
config.addProperty("target", "${target_attr} dog");
config.addProperty("animal_attr", "quick brown");
@@ -638,7 +638,7 @@ public class TestAbstractConfigurationBa
@Test(expected = IllegalStateException.class)
public void testCyclicInterpolation()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
config.addProperty("animal", "${animal_attr} ${species}");
config.addProperty("animal_attr", "quick brown");
config.addProperty("species", "${animal}");
@@ -653,7 +653,7 @@ public class TestAbstractConfigurationBa
@Test
public void testInterpolationUnknownVariable()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
config.addProperty("animal", "quick brown fox");
config.addProperty(KEY_PREFIX, SUBST_TXT);
assertEquals("Wrong interpolation",
@@ -668,7 +668,7 @@ public class TestAbstractConfigurationBa
@Test
public void testInterpolationNoInterpolator()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
config.addProperty("animal", "quick brown fox");
config.addProperty("target", "lazy dog");
config.addProperty(KEY_PREFIX, SUBST_TXT);
@@ -683,7 +683,7 @@ public class TestAbstractConfigurationBa
@Test
public void testDefaultConversionHandler()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
assertEquals("Wrong default conversion handler",
DefaultConversionHandler.class, config.getConversionHandler()
.getClass());
@@ -696,8 +696,8 @@ public class TestAbstractConfigurationBa
@Test
public void testDefaultConversionHandlerSharedInstance()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
- PropertiesConfiguration config2 = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config2 = new PropertiesConfiguration();
assertSame("Multiple conversion handlers",
config.getConversionHandler(), config2.getConversionHandler());
}
@@ -708,8 +708,8 @@ public class TestAbstractConfigurationBa
@Test
public void testSetDefaultConversionHandler()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
- ConversionHandler handler = new DefaultConversionHandler();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
+ final ConversionHandler handler = new DefaultConversionHandler();
config.setConversionHandler(handler);
assertSame("Handler not set", handler, config.getConversionHandler());
}
@@ -729,8 +729,8 @@ public class TestAbstractConfigurationBa
@Test
public void testGet()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
- Integer value = 20130816;
+ final PropertiesConfiguration config = new PropertiesConfiguration();
+ final Integer value = 20130816;
config.addProperty(KEY_PREFIX, value.toString());
assertEquals("Wrong result", value, config.get(Integer.class, KEY_PREFIX));
}
@@ -741,7 +741,7 @@ public class TestAbstractConfigurationBa
@Test
public void testGetUnknownNoDefaultValue()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
assertNull("Wrong result", config.get(Integer.class, KEY_PREFIX));
}
@@ -751,8 +751,8 @@ public class TestAbstractConfigurationBa
@Test
public void testGetUnknownWithDefaultValue()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
- Integer defaultValue = 2121;
+ final PropertiesConfiguration config = new PropertiesConfiguration();
+ final Integer defaultValue = 2121;
assertEquals("Wrong result", defaultValue,
config.get(Integer.class, KEY_PREFIX, defaultValue));
}
@@ -764,7 +764,7 @@ public class TestAbstractConfigurationBa
@Test(expected = NoSuchElementException.class)
public void testGetUnknownWithThrowExceptionOnMissing()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
config.setThrowExceptionOnMissing(true);
config.get(Integer.class, KEY_PREFIX);
}
@@ -777,9 +777,9 @@ public class TestAbstractConfigurationBa
@Test
public void testGetUnownWithDefaultValueThrowExceptionOnMissing()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
config.setThrowExceptionOnMissing(true);
- Integer defaultValue = 2121;
+ final Integer defaultValue = 2121;
assertEquals("Wrong result", defaultValue,
config.get(Integer.class, KEY_PREFIX, defaultValue));
}
@@ -790,14 +790,14 @@ public class TestAbstractConfigurationBa
@Test
public void testGetArray()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
- Integer[] expected = new Integer[PROP_COUNT];
+ final PropertiesConfiguration config = new PropertiesConfiguration();
+ final Integer[] expected = new Integer[PROP_COUNT];
for (int i = 0; i < PROP_COUNT; i++)
{
config.addProperty(KEY_PREFIX, String.valueOf(i));
expected[i] = Integer.valueOf(i);
}
- Integer[] result = config.get(Integer[].class, KEY_PREFIX);
+ final Integer[] result = config.get(Integer[].class, KEY_PREFIX);
assertArrayEquals("Wrong result", expected, result);
}
@@ -807,14 +807,14 @@ public class TestAbstractConfigurationBa
@Test
public void testGetArrayPrimitive()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
- short[] expected = new short[PROP_COUNT];
+ final PropertiesConfiguration config = new PropertiesConfiguration();
+ final short[] expected = new short[PROP_COUNT];
for (int i = 0; i < PROP_COUNT; i++)
{
config.addProperty(KEY_PREFIX, String.valueOf(i));
expected[i] = (short) i;
}
- short[] result =
+ final short[] result =
config.get(short[].class, KEY_PREFIX, new short[0]);
assertArrayEquals("Wrong result", expected, result);
}
@@ -825,7 +825,7 @@ public class TestAbstractConfigurationBa
@Test
public void testGetArrayUnknownNoDefault()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
assertNull("Wrong result", config.get(Integer[].class, KEY_PREFIX));
}
@@ -835,8 +835,8 @@ public class TestAbstractConfigurationBa
@Test
public void testGetArrayUnknownWithDefault()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
- int[] defValue = {
+ final PropertiesConfiguration config = new PropertiesConfiguration();
+ final int[] defValue = {
1, 2, 3
};
assertArrayEquals("Wrong result", defValue,
@@ -849,7 +849,7 @@ public class TestAbstractConfigurationBa
@Test(expected = IllegalArgumentException.class)
public void testGetArrayDefaultValueNotAnArray()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
config.getArray(Integer.class, KEY_PREFIX, this);
}
@@ -860,7 +860,7 @@ public class TestAbstractConfigurationBa
@Test(expected = IllegalArgumentException.class)
public void testGetArrayDefaultValueWrongComponentClass()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
config.getArray(Integer.class, KEY_PREFIX, new short[1]);
}
@@ -872,9 +872,9 @@ public class TestAbstractConfigurationBa
* @param config the test configuration
* @return the list with expected values
*/
- private static List<Integer> prepareListTest(PropertiesConfiguration config)
+ private static List<Integer> prepareListTest(final PropertiesConfiguration config)
{
- List<Integer> expected = new ArrayList<>(PROP_COUNT);
+ final List<Integer> expected = new ArrayList<>(PROP_COUNT);
for (int i = 0; i < PROP_COUNT; i++)
{
config.addProperty(KEY_PREFIX, String.valueOf(i));
@@ -889,9 +889,9 @@ public class TestAbstractConfigurationBa
@Test
public void testGetList()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
- List<Integer> expected = prepareListTest(config);
- List<Integer> result = config.getList(Integer.class, KEY_PREFIX);
+ final PropertiesConfiguration config = new PropertiesConfiguration();
+ final List<Integer> expected = prepareListTest(config);
+ final List<Integer> result = config.getList(Integer.class, KEY_PREFIX);
assertEquals("Wrong result", expected, result);
}
@@ -902,7 +902,7 @@ public class TestAbstractConfigurationBa
@Test
public void testGetListUnknownNoDefault()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
assertNull("Wrong result", config.getList(Integer.class, KEY_PREFIX));
}
@@ -913,8 +913,8 @@ public class TestAbstractConfigurationBa
@Test
public void testGetListUnknownWithDefault()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
- List<Integer> defValue = Arrays.asList(1, 2, 3);
+ final PropertiesConfiguration config = new PropertiesConfiguration();
+ final List<Integer> defValue = Arrays.asList(1, 2, 3);
assertEquals("Wrong result", defValue, config.getList(Integer.class, KEY_PREFIX, defValue));
}
@@ -924,9 +924,9 @@ public class TestAbstractConfigurationBa
@Test
public void testGetCollection()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
- List<Integer> expected = prepareListTest(config);
- List<Integer> result = new ArrayList<>(PROP_COUNT);
+ final PropertiesConfiguration config = new PropertiesConfiguration();
+ final List<Integer> expected = prepareListTest(config);
+ final List<Integer> result = new ArrayList<>(PROP_COUNT);
assertSame("Wrong result", result, config.getCollection(Integer.class, KEY_PREFIX, result));
assertEquals("Wrong converted content", expected, result);
}
@@ -937,9 +937,9 @@ public class TestAbstractConfigurationBa
@Test
public void testGetCollectionNullTarget()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
- List<Integer> expected = prepareListTest(config);
- Collection<Integer> result = config.getCollection(Integer.class, KEY_PREFIX, null, new ArrayList<Integer>());
+ final PropertiesConfiguration config = new PropertiesConfiguration();
+ final List<Integer> expected = prepareListTest(config);
+ final Collection<Integer> result = config.getCollection(Integer.class, KEY_PREFIX, null, new ArrayList<Integer>());
assertEquals("Wrong result", expected, result);
}
@@ -949,9 +949,9 @@ public class TestAbstractConfigurationBa
@Test
public void testGetCollectionSingleValue()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
config.addProperty(KEY_PREFIX, "1");
- List<Integer> result = new ArrayList<>(1);
+ final List<Integer> result = new ArrayList<>(1);
config.getCollection(Integer.class, KEY_PREFIX, result);
assertEquals("Wrong number of elements", 1, result.size());
assertEquals("Wrong element", Integer.valueOf(1), result.get(0));
@@ -964,8 +964,8 @@ public class TestAbstractConfigurationBa
@Test
public void testGetCollectionUnknownNoDefault()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
- List<Integer> result = new ArrayList<>();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
+ final List<Integer> result = new ArrayList<>();
assertNull("Wrong result", config.getCollection(Integer.class, KEY_PREFIX, result));
assertTrue("Got elements", result.isEmpty());
}
@@ -977,9 +977,9 @@ public class TestAbstractConfigurationBa
@Test
public void testGetCollectionUnknownWithDefault()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
- List<Integer> defValue = Arrays.asList(1, 2, 4, 8, 16, 32);
- Collection<Integer> result = config.getCollection(Integer.class, KEY_PREFIX, null, defValue);
+ final PropertiesConfiguration config = new PropertiesConfiguration();
+ final List<Integer> defValue = Arrays.asList(1, 2, 4, 8, 16, 32);
+ final Collection<Integer> result = config.getCollection(Integer.class, KEY_PREFIX, null, defValue);
assertEquals("Wrong result", defValue, result);
}
@@ -989,7 +989,7 @@ public class TestAbstractConfigurationBa
@Test(expected = IllegalArgumentException.class)
public void testGetEncodedStringNoDecoder()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
config.getEncodedString(KEY_PREFIX, null);
}
@@ -999,10 +999,10 @@ public class TestAbstractConfigurationBa
@Test
public void testGetEncodedStringNoValue()
{
- ConfigurationDecoder decoder =
+ final ConfigurationDecoder decoder =
EasyMock.createMock(ConfigurationDecoder.class);
EasyMock.replay(decoder);
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
assertNull("Got a value", config.getEncodedString(KEY_PREFIX, decoder));
}
@@ -1012,14 +1012,14 @@ public class TestAbstractConfigurationBa
@Test
public void testGetEncodedStringValue()
{
- ConfigurationDecoder decoder =
+ final ConfigurationDecoder decoder =
EasyMock.createMock(ConfigurationDecoder.class);
final String value = "original value";
final String decodedValue = "decoded value";
EasyMock.expect(decoder.decode(value)).andReturn(decodedValue);
EasyMock.replay(decoder);
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
config.addProperty(KEY_PREFIX, value);
assertEquals("Wrong decoded value", decodedValue,
config.getEncodedString(KEY_PREFIX, decoder));
@@ -1032,7 +1032,7 @@ public class TestAbstractConfigurationBa
@Test(expected = IllegalStateException.class)
public void testGetEncodedStringNoDefaultDecoderDefined()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
config.getEncodedString(KEY_PREFIX);
}
@@ -1042,14 +1042,14 @@ public class TestAbstractConfigurationBa
@Test
public void testGetEncodedStringWithDefaultDecoder()
{
- ConfigurationDecoder decoder =
+ final ConfigurationDecoder decoder =
EasyMock.createMock(ConfigurationDecoder.class);
final String value = "original value";
final String decodedValue = "decoded value";
EasyMock.expect(decoder.decode(value)).andReturn(decodedValue);
EasyMock.replay(decoder);
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
config.setConfigurationDecoder(decoder);
config.addProperty(KEY_PREFIX, value);
assertEquals("Wrong decoded value", decodedValue,
@@ -1062,7 +1062,7 @@ public class TestAbstractConfigurationBa
@Test
public void testSizeInternal()
{
- AbstractConfiguration config =
+ final AbstractConfiguration config =
new TestConfigurationImpl(new PropertiesConfiguration());
for (int i = 0; i < PROP_COUNT; i++)
{
@@ -1080,7 +1080,7 @@ public class TestAbstractConfigurationBa
*/
private Configuration setUpSourceConfig()
{
- BaseConfiguration config = new BaseConfiguration();
+ final BaseConfiguration config = new BaseConfiguration();
config.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
for (int i = 1; i < PROP_COUNT; i += 2)
{
@@ -1100,7 +1100,7 @@ public class TestAbstractConfigurationBa
*/
private AbstractConfiguration setUpDestConfig()
{
- AbstractConfiguration config = new TestConfigurationImpl(
+ final AbstractConfiguration config = new TestConfigurationImpl(
new PropertiesConfiguration());
config.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
for (int i = 0; i < PROP_COUNT; i++)
@@ -1115,7 +1115,7 @@ public class TestAbstractConfigurationBa
*
* @param config the configuration to test
*/
- private void checkListProperties(Configuration config)
+ private void checkListProperties(final Configuration config)
{
List<Object> values = config.getList("list1");
assertEquals("Wrong number of elements in list 1", 3, values.size());
@@ -1132,11 +1132,11 @@ public class TestAbstractConfigurationBa
* @param src the configuration that was copied
* @param eventType the expected event type
*/
- private void checkCopyEvents(CollectingConfigurationListener l,
- Configuration src, EventType<?> eventType)
+ private void checkCopyEvents(final CollectingConfigurationListener l,
+ final Configuration src, final EventType<?> eventType)
{
- Map<String, ConfigurationEvent> events = new HashMap<>();
- for (ConfigurationEvent e : l.events)
+ final Map<String, ConfigurationEvent> events = new HashMap<>();
+ for (final ConfigurationEvent e : l.events)
{
assertEquals("Wrong event type", eventType, e.getEventType());
assertTrue("Unknown property: " + e.getPropertyName(), src
@@ -1152,9 +1152,9 @@ public class TestAbstractConfigurationBa
}
}
- for (Iterator<String> it = src.getKeys(); it.hasNext();)
+ for (final Iterator<String> it = src.getKeys(); it.hasNext();)
{
- String key = it.next();
+ final String key = it.next();
assertTrue("No event received for key " + key, events
.containsKey(key));
}
@@ -1177,19 +1177,19 @@ public class TestAbstractConfigurationBa
return config;
}
- public TestConfigurationImpl(AbstractConfiguration wrappedConfig)
+ public TestConfigurationImpl(final AbstractConfiguration wrappedConfig)
{
config = wrappedConfig;
}
@Override
- protected void addPropertyDirect(String key, Object value)
+ protected void addPropertyDirect(final String key, final Object value)
{
config.addPropertyDirect(key, value);
}
@Override
- protected boolean containsKeyInternal(String key)
+ protected boolean containsKeyInternal(final String key)
{
return config.containsKey(key);
}
@@ -1201,7 +1201,7 @@ public class TestAbstractConfigurationBa
}
@Override
- protected Object getPropertyInternal(String key)
+ protected Object getPropertyInternal(final String key)
{
return config.getProperty(key);
}
@@ -1213,7 +1213,7 @@ public class TestAbstractConfigurationBa
}
@Override
- protected void clearPropertyDirect(String key)
+ protected void clearPropertyDirect(final String key)
{
config.clearPropertyDirect(key);
}
@@ -1229,7 +1229,7 @@ public class TestAbstractConfigurationBa
final List<ConfigurationEvent> events = new ArrayList<>();
@Override
- public void onEvent(ConfigurationEvent event)
+ public void onEvent(final ConfigurationEvent event)
{
events.add(event);
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationSynchronization.java Thu Sep 27 22:24:23 2018
@@ -53,7 +53,7 @@ public class TestAbstractConfigurationSy
public void setUp() throws Exception
{
// any concrete class will do
- PropertiesConfiguration c = new PropertiesConfiguration();
+ final PropertiesConfiguration c = new PropertiesConfiguration();
new FileHandler(c).load(ConfigurationAssert
.getTestFile("test.properties"));
sync = new SynchronizerTestImpl();
@@ -230,7 +230,7 @@ public class TestAbstractConfigurationSy
@Test
public void testSubsetSynchronized()
{
- AbstractConfiguration subset =
+ final AbstractConfiguration subset =
(AbstractConfiguration) config.subset("configuration");
sync.verify();
assertEquals("Wrong synchronizer for subset",
@@ -244,7 +244,7 @@ public class TestAbstractConfigurationSy
*/
private static Configuration prepareConfigurationMockForCopy()
{
- Configuration config2 = EasyMock.createStrictMock(Configuration.class);
+ final Configuration config2 = EasyMock.createStrictMock(Configuration.class);
config2.lock(LockMode.READ);
EasyMock.expect(config2.getKeys()).andReturn(
Collections.<String> emptySet().iterator());
@@ -259,7 +259,7 @@ public class TestAbstractConfigurationSy
@Test
public void testAppendSynchronized()
{
- Configuration config2 = prepareConfigurationMockForCopy();
+ final Configuration config2 = prepareConfigurationMockForCopy();
config.append(config2);
EasyMock.verify(config2);
}
@@ -270,7 +270,7 @@ public class TestAbstractConfigurationSy
@Test
public void testCopySynchronized()
{
- Configuration config2 = prepareConfigurationMockForCopy();
+ final Configuration config2 = prepareConfigurationMockForCopy();
config.copy(config2);
EasyMock.verify(config2);
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractHierarchicalConfiguration.java Thu Sep 27 22:24:23 2018
@@ -63,7 +63,7 @@ public class TestAbstractHierarchicalCon
@Before
public void setUp() throws Exception
{
- ImmutableNode root =
+ final ImmutableNode root =
new ImmutableNode.Builder(1).addChild(
NodeStructureHelper.ROOT_TABLES_TREE).create();
config =
@@ -105,8 +105,8 @@ public class TestAbstractHierarchicalCon
@Test
public void testIsEmptyNodesWithNoValues()
{
- ImmutableNode.Builder rootBuilder = new ImmutableNode.Builder(1);
- ImmutableNode.Builder nodeBuilder = new ImmutableNode.Builder(1);
+ final ImmutableNode.Builder rootBuilder = new ImmutableNode.Builder(1);
+ final ImmutableNode.Builder nodeBuilder = new ImmutableNode.Builder(1);
nodeBuilder.addChild(NodeStructureHelper.createNode("child", null));
rootBuilder.addChild(nodeBuilder.create());
config =
@@ -115,7 +115,7 @@ public class TestAbstractHierarchicalCon
assertTrue("Not empty", config.isEmpty());
}
- private static void checkGetProperty(AbstractHierarchicalConfiguration<?> testConfig)
+ private static void checkGetProperty(final AbstractHierarchicalConfiguration<?> testConfig)
{
assertNull(testConfig.getProperty("tables.table.resultset"));
assertNull(testConfig.getProperty("tables.table.fields.field"));
@@ -246,7 +246,7 @@ public class TestAbstractHierarchicalCon
boolean found = false;
for (int idx = 0; true; idx++)
{
- String name = config.getString("indexList.index(" + idx
+ final String name = config.getString("indexList.index(" + idx
+ ")[@name]");
if (name == null)
{
@@ -269,7 +269,7 @@ public class TestAbstractHierarchicalCon
// Verify
for (int idx = 0; true; idx++)
{
- String name = config.getString("indexList.index(" + idx
+ final String name = config.getString("indexList.index(" + idx
+ ")[@name]");
if (name == null)
{
@@ -315,8 +315,8 @@ public class TestAbstractHierarchicalCon
@Test
public void testGetKeys()
{
- List<String> keys = new ArrayList<>();
- for (Iterator<String> it = config.getKeys(); it.hasNext();)
+ final List<String> keys = new ArrayList<>();
+ for (final Iterator<String> it = config.getKeys(); it.hasNext();)
{
keys.add(it.next());
}
@@ -336,7 +336,7 @@ public class TestAbstractHierarchicalCon
config.addProperty("order.key2", "value2");
config.addProperty("order.key3", "value3");
- Iterator<String> it = config.getKeys("order");
+ final Iterator<String> it = config.getKeys("order");
assertEquals("1st key", "order.key1", it.next());
assertEquals("2nd key", "order.key2", it.next());
assertEquals("3rd key", "order.key3", it.next());
@@ -349,8 +349,8 @@ public class TestAbstractHierarchicalCon
public void testGetKeysAttribute()
{
config.addProperty("tables.table(0)[@type]", "system");
- Set<String> keys = new HashSet<>();
- for (Iterator<String> it = config.getKeys(); it.hasNext();)
+ final Set<String> keys = new HashSet<>();
+ for (final Iterator<String> it = config.getKeys(); it.hasNext();)
{
keys.add(it.next());
}
@@ -364,7 +364,7 @@ public class TestAbstractHierarchicalCon
public void testGetKeysAttributePrefix()
{
config.addProperty("tables.table(0)[@type]", "system");
- Iterator<String> itKeys = config.getKeys("tables.table[@type]");
+ final Iterator<String> itKeys = config.getKeys("tables.table[@type]");
assertEquals("Wrong key", "tables.table[@type]", itKeys.next());
assertFalse("Too many keys", itKeys.hasNext());
}
@@ -400,7 +400,7 @@ public class TestAbstractHierarchicalCon
{
config.addProperty("order.key1", "value1");
config.addProperty("order.key2", "value2");
- Iterator<String> it = config.getKeys("order.key1");
+ final Iterator<String> it = config.getKeys("order.key1");
assertTrue("no key found", it.hasNext());
assertEquals("1st key", "order.key1", it.next());
assertFalse("more keys than expected", it.hasNext());
@@ -416,7 +416,7 @@ public class TestAbstractHierarchicalCon
config.addProperty("order.key1", "value1");
config.addProperty("order.key1.test", "value2");
config.addProperty("order.key1.test.complex", "value2");
- Iterator<String> it = config.getKeys("order.key1");
+ final Iterator<String> it = config.getKeys("order.key1");
assertEquals("Wrong key 1", "order.key1", it.next());
assertEquals("Wrong key 2", "order.key1.test", it.next());
assertEquals("Wrong key 3", "order.key1.test.complex", it.next());
@@ -445,7 +445,7 @@ public class TestAbstractHierarchicalCon
prop = config.getProperty("tables.table.fields.field(5).name");
assertNotNull(prop);
assertTrue(prop instanceof List);
- List<?> list = (List<?>) prop;
+ final List<?> list = (List<?>) prop;
assertEquals("phone", list.get(0));
assertEquals("fax", list.get(1));
@@ -468,7 +468,7 @@ public class TestAbstractHierarchicalCon
config.addProperty("connection.passwd", "tiger");
assertEquals("tiger", config.getProperty("connection.passwd"));
- DefaultConfigurationKey key = createConfigurationKey();
+ final DefaultConfigurationKey key = createConfigurationKey();
key.append("tables").append("table").appendIndex(0);
key.appendAttribute("tableType");
config.addProperty(key.toString(), "system");
@@ -504,10 +504,10 @@ public class TestAbstractHierarchicalCon
assertEquals(0, config.getMaxIndex("tables.table(1).fields.field(1)"));
assertEquals(-1, config.getMaxIndex("tables.table(2).fields"));
- int maxIdx = config.getMaxIndex("tables.table(0).fields.field.name");
+ final int maxIdx = config.getMaxIndex("tables.table(0).fields.field.name");
for(int i = 0; i <= maxIdx; i++)
{
- DefaultConfigurationKey key =
+ final DefaultConfigurationKey key =
new DefaultConfigurationKey(DefaultExpressionEngine.INSTANCE,
"tables.table(0).fields");
key.append("field").appendIndex(i).append("name");
@@ -518,7 +518,7 @@ public class TestAbstractHierarchicalCon
@Test
public void testClone()
{
- Configuration copy = (Configuration) config.clone();
+ final Configuration copy = (Configuration) config.clone();
assertTrue("Wrong clone result", copy instanceof AbstractHierarchicalConfiguration);
checkContent(copy);
}
@@ -530,9 +530,9 @@ public class TestAbstractHierarchicalCon
@Test
public void testCloneWithEventListeners()
{
- EventListener<ConfigurationEvent> l = new EventListenerTestImpl(null);
+ final EventListener<ConfigurationEvent> l = new EventListenerTestImpl(null);
config.addEventListener(ConfigurationEvent.ANY, l);
- AbstractHierarchicalConfiguration<?> copy =
+ final AbstractHierarchicalConfiguration<?> copy =
(AbstractHierarchicalConfiguration<?>) config.clone();
assertFalse("Event listener registered at clone", copy
.getEventListeners(ConfigurationEvent.ANY).contains(l));
@@ -548,7 +548,7 @@ public class TestAbstractHierarchicalCon
final String keyValue = "value";
config.addProperty(keyAnswer, "The answer is ${" + keyValue + "}.");
config.addProperty(keyValue, 42);
- Configuration clone = (Configuration) config.clone();
+ final Configuration clone = (Configuration) config.clone();
clone.setProperty(keyValue, 43);
assertEquals("Wrong interpolation in original", "The answer is 42.",
config.getString(keyAnswer));
@@ -559,7 +559,7 @@ public class TestAbstractHierarchicalCon
@Test
public void testAddNodes()
{
- Collection<ImmutableNode> nodes = new ArrayList<>();
+ final Collection<ImmutableNode> nodes = new ArrayList<>();
nodes.add(NodeStructureHelper.createFieldNode("birthDate"));
nodes.add(NodeStructureHelper.createFieldNode("lastLogin"));
nodes.add(NodeStructureHelper.createFieldNode("language"));
@@ -577,8 +577,8 @@ public class TestAbstractHierarchicalCon
@Test
public void testAddNodesForNonExistingKey()
{
- Collection<ImmutableNode> nodes = new ArrayList<>();
- ImmutableNode newNode =
+ final Collection<ImmutableNode> nodes = new ArrayList<>();
+ final ImmutableNode newNode =
new ImmutableNode.Builder().name("usr").value("scott")
.addAttribute("pwd", "tiger").create();
nodes.add(newNode);
@@ -597,7 +597,7 @@ public class TestAbstractHierarchicalCon
@Test(expected = IllegalArgumentException.class)
public void testAddNodesWithAttributeKey()
{
- Collection<ImmutableNode> nodes = new ArrayList<>();
+ final Collection<ImmutableNode> nodes = new ArrayList<>();
nodes.add(NodeStructureHelper.createNode("testNode", "yes"));
config.addNodes("database.connection[@settings]", nodes);
}
@@ -608,16 +608,16 @@ public class TestAbstractHierarchicalCon
@Test
public void testAddNodesCopy()
{
- AbstractHierarchicalConfigurationTestImpl configDest =
+ final AbstractHierarchicalConfigurationTestImpl configDest =
new AbstractHierarchicalConfigurationTestImpl(
new InMemoryNodeModel());
configDest.addProperty("test", "TEST");
- Collection<ImmutableNode> nodes = getRootNode().getChildren();
+ final Collection<ImmutableNode> nodes = getRootNode().getChildren();
assertEquals("Wrong number of children", 1, nodes.size());
configDest.addNodes("newNodes", nodes);
for (int i = 0; i < NodeStructureHelper.tablesLength(); i++)
{
- String keyTab = "newNodes.tables.table(" + i + ").";
+ final String keyTab = "newNodes.tables.table(" + i + ").";
assertEquals("Table " + i + " not found",
NodeStructureHelper.table(i),
configDest.getString(keyTab + "name"));
@@ -658,7 +658,7 @@ public class TestAbstractHierarchicalCon
config.addProperty("test.absolute.dir.dir1", "${base.dir}/path1");
config.addProperty("test.absolute.dir.dir2", "${base.dir}/path2");
config.addProperty("test.absolute.dir.dir3", "${base.dir}/path3");
- Configuration sub = config.subset("test.absolute.dir");
+ final Configuration sub = config.subset("test.absolute.dir");
for (int i = 1; i < 4; i++)
{
assertEquals("Wrong interpolation in parent", "/home/foo/path" + i,
@@ -714,8 +714,8 @@ public class TestAbstractHierarchicalCon
config.clear();
config.addProperty("var", "value");
config.addProperty("prop2.prop[@attr]", "${var}");
- Configuration sub1 = config.subset("prop2");
- Configuration sub2 = sub1.subset("prop");
+ final Configuration sub1 = config.subset("prop2");
+ final Configuration sub2 = sub1.subset("prop");
assertEquals("Wrong value", "value", sub2.getString("[@attr]"));
}
@@ -771,7 +771,7 @@ public class TestAbstractHierarchicalCon
public void testInterpolatedConfiguration()
{
config.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
- AbstractHierarchicalConfiguration<?> c = (AbstractHierarchicalConfiguration<?>) InterpolationTestHelper
+ final AbstractHierarchicalConfiguration<?> c = (AbstractHierarchicalConfiguration<?>) InterpolationTestHelper
.testInterpolatedConfiguration(config);
// tests whether the hierarchical structure has been maintained
@@ -784,7 +784,7 @@ public class TestAbstractHierarchicalCon
@Test
public void testInitCopyNull()
{
- BaseHierarchicalConfiguration copy =
+ final BaseHierarchicalConfiguration copy =
new BaseHierarchicalConfiguration(
(BaseHierarchicalConfiguration) null);
assertTrue("Configuration not empty", copy.isEmpty());
@@ -821,7 +821,7 @@ public class TestAbstractHierarchicalCon
@Test
public void testResolveNodeKey()
{
- List<ImmutableNode> nodes =
+ final List<ImmutableNode> nodes =
config.resolveNodeKey(getRootNode(),
"tables.table.name", config.getModel().getNodeHandler());
assertEquals("Wrong number of nodes",
@@ -839,7 +839,7 @@ public class TestAbstractHierarchicalCon
@Test
public void testResolveNodeKeyAttribute()
{
- String attrKey = "tables.table(0)[@type]";
+ final String attrKey = "tables.table(0)[@type]";
config.addProperty(attrKey, "system");
assertTrue(
"Got attribute results",
@@ -854,11 +854,11 @@ public class TestAbstractHierarchicalCon
@Test
public void testNodeKeyEmptyCache()
{
- Map<ImmutableNode, String> cache = new HashMap<>();
- ImmutableNode nodeTabName =
+ final Map<ImmutableNode, String> cache = new HashMap<>();
+ final ImmutableNode nodeTabName =
NodeStructureHelper.nodeForKey(getRootNode(),
"tables/table(0)/name");
- ImmutableNode nodeFldName =
+ final ImmutableNode nodeFldName =
NodeStructureHelper.nodeForKey(getRootNode(),
"tables/table(0)/fields/field(1)/name");
assertEquals("Wrong key (1)", "tables(0).table(0).name(0)",
@@ -876,11 +876,11 @@ public class TestAbstractHierarchicalCon
@Test
public void testNodeKeyCachePopulated()
{
- Map<ImmutableNode, String> cache = new HashMap<>();
- ImmutableNode nodeTabName =
+ final Map<ImmutableNode, String> cache = new HashMap<>();
+ final ImmutableNode nodeTabName =
NodeStructureHelper.nodeForKey(getRootNode(),
"tables/table(0)/name");
- NodeHandler<ImmutableNode> handler = config.getModel().getNodeHandler();
+ final NodeHandler<ImmutableNode> handler = config.getModel().getNodeHandler();
config.nodeKey(nodeTabName, cache, handler);
assertEquals("Wrong number of elements", 4, cache.size());
assertEquals("Wrong entry (1)", "tables(0).table(0).name(0)",
@@ -898,11 +898,11 @@ public class TestAbstractHierarchicalCon
@Test
public void testNodeKeyCacheUsage()
{
- Map<ImmutableNode, String> cache = new HashMap<>();
- ImmutableNode nodeTabName =
+ final Map<ImmutableNode, String> cache = new HashMap<>();
+ final ImmutableNode nodeTabName =
NodeStructureHelper.nodeForKey(getRootNode(),
"tables/table(0)/name");
- NodeHandler<ImmutableNode> handler = config.getModel().getNodeHandler();
+ final NodeHandler<ImmutableNode> handler = config.getModel().getNodeHandler();
cache.put(handler.getParent(nodeTabName), "somePrefix");
assertEquals("Wrong key", "somePrefix.name(0)",
config.nodeKey(nodeTabName, cache, handler));
@@ -914,7 +914,7 @@ public class TestAbstractHierarchicalCon
@Test
public void testNodeKeyRootNode()
{
- Map<ImmutableNode, String> cache = new HashMap<>();
+ final Map<ImmutableNode, String> cache = new HashMap<>();
assertEquals("Wrong root node key", "",
config.nodeKey(getRootNode(), cache, config.getModel()
.getNodeHandler()));
@@ -926,7 +926,7 @@ public class TestAbstractHierarchicalCon
@Test
public void testNodeKeyCacheHit()
{
- Map<ImmutableNode, String> cache = new HashMap<>();
+ final Map<ImmutableNode, String> cache = new HashMap<>();
final String key = "someResultKey";
cache.put(getRootNode(), key);
assertEquals("Wrong result", key, config.nodeKey(getRootNode(),
@@ -939,13 +939,13 @@ public class TestAbstractHierarchicalCon
@Test
public void testGetNodeModel()
{
- SynchronizerTestImpl sync = new SynchronizerTestImpl();
+ final SynchronizerTestImpl sync = new SynchronizerTestImpl();
config.setSynchronizer(sync);
- NodeModel<ImmutableNode> model = config.getNodeModel();
+ final NodeModel<ImmutableNode> model = config.getNodeModel();
assertTrue("Wrong node model: " + model,
model instanceof InMemoryNodeModel);
- ImmutableNode rootNode = model.getNodeHandler().getRootNode();
+ final ImmutableNode rootNode = model.getNodeHandler().getRootNode();
assertEquals("Wrong number of children of root node", 1, rootNode
.getChildren().size());
assertTrue("Wrong children of root node", rootNode.getChildren()
@@ -960,17 +960,17 @@ public class TestAbstractHierarchicalCon
* @param prefix the key to pass into getKeys()
* @param expected the expected result
*/
- private void checkKeys(String prefix, String[] expected)
+ private void checkKeys(final String prefix, final String[] expected)
{
- Set<String> values = new HashSet<>();
- for (String anExpected : expected) {
+ final Set<String> values = new HashSet<>();
+ for (final String anExpected : expected) {
values.add((anExpected.startsWith(prefix)) ? anExpected : prefix + "." + anExpected);
}
- Iterator<String> itKeys = config.getKeys(prefix);
+ final Iterator<String> itKeys = config.getKeys(prefix);
while(itKeys.hasNext())
{
- String key = itKeys.next();
+ final String key = itKeys.next();
if(!values.contains(key))
{
fail("Found unexpected key: " + key);
@@ -1011,7 +1011,7 @@ public class TestAbstractHierarchicalCon
assertNotNull(prop);
assertEquals("creationDate", prop.toString());
- Set<String> keys = ConfigurationAssert.keysToSet(config);
+ final Set<String> keys = ConfigurationAssert.keysToSet(config);
assertEquals("Wrong number of defined keys", 2, keys.size());
assertTrue("Key not found", keys.contains("tables/table/name"));
assertTrue("Key not found", keys
@@ -1039,7 +1039,7 @@ public class TestAbstractHierarchicalCon
*
* @param c the configuration to check
*/
- private static void checkContent(Configuration c)
+ private static void checkContent(final Configuration c)
{
for (int i = 0; i < NodeStructureHelper.tablesLength(); i++)
{
@@ -1071,7 +1071,7 @@ public class TestAbstractHierarchicalCon
private static class AbstractHierarchicalConfigurationTestImpl extends
AbstractHierarchicalConfiguration<ImmutableNode>
{
- public AbstractHierarchicalConfigurationTestImpl(InMemoryNodeModel model)
+ public AbstractHierarchicalConfigurationTestImpl(final InMemoryNodeModel model)
{
super(model);
}
@@ -1083,64 +1083,64 @@ public class TestAbstractHierarchicalCon
}
@Override
- public SubnodeConfiguration configurationAt(String key,
- boolean supportUpdates)
+ public SubnodeConfiguration configurationAt(final String key,
+ final boolean supportUpdates)
{
throw new UnsupportedOperationException("Unexpected method call!");
}
@Override
- public SubnodeConfiguration configurationAt(String key)
+ public SubnodeConfiguration configurationAt(final String key)
{
throw new UnsupportedOperationException("Unexpected method call!");
}
@Override
- public List<HierarchicalConfiguration<ImmutableNode>> configurationsAt(String key)
+ public List<HierarchicalConfiguration<ImmutableNode>> configurationsAt(final String key)
{
throw new UnsupportedOperationException("Unexpected method call!");
}
@Override
- public List<HierarchicalConfiguration<ImmutableNode>> configurationsAt(String key, boolean supportUpdates) {
+ public List<HierarchicalConfiguration<ImmutableNode>> configurationsAt(final String key, final boolean supportUpdates) {
throw new UnsupportedOperationException("Unexpected method call!");
}
@Override
- public List<HierarchicalConfiguration<ImmutableNode>> childConfigurationsAt(String key)
+ public List<HierarchicalConfiguration<ImmutableNode>> childConfigurationsAt(final String key)
{
throw new UnsupportedOperationException("Unexpected method call!");
}
@Override
- public List<HierarchicalConfiguration<ImmutableNode>> childConfigurationsAt(String key, boolean supportUpdates) {
+ public List<HierarchicalConfiguration<ImmutableNode>> childConfigurationsAt(final String key, final boolean supportUpdates) {
throw new UnsupportedOperationException("Unexpected method call!");
}
@Override
public ImmutableHierarchicalConfiguration immutableConfigurationAt(
- String key, boolean supportUpdates)
+ final String key, final boolean supportUpdates)
{
throw new UnsupportedOperationException("Unexpected method call!");
}
@Override
public ImmutableHierarchicalConfiguration immutableConfigurationAt(
- String key)
+ final String key)
{
throw new UnsupportedOperationException("Unexpected method call!");
}
@Override
public List<ImmutableHierarchicalConfiguration> immutableConfigurationsAt(
- String key)
+ final String key)
{
throw new UnsupportedOperationException("Unexpected method call!");
}
@Override
public List<ImmutableHierarchicalConfiguration> immutableChildConfigurationsAt(
- String key)
+ final String key)
{
throw new UnsupportedOperationException("Unexpected method call!");
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseConfiguration.java Thu Sep 27 22:24:23 2018
@@ -94,8 +94,8 @@ public class TestBaseConfiguration
public void testGetByte()
{
config.setProperty("number", "1");
- byte oneB = 1;
- byte twoB = 2;
+ final byte oneB = 1;
+ final byte twoB = 2;
assertEquals("This returns 1(byte)", oneB, config.getByte("number"));
assertEquals("This returns 1(byte)", oneB, config.getByte("number", twoB));
assertEquals("This returns 2(default byte)", twoB, config.getByte("numberNotInConfig", twoB));
@@ -119,8 +119,8 @@ public class TestBaseConfiguration
public void testGetShort()
{
config.setProperty("numberS", "1");
- short oneS = 1;
- short twoS = 2;
+ final short oneS = 1;
+ final short twoS = 2;
assertEquals("This returns 1(short)", oneS, config.getShort("numberS"));
assertEquals("This returns 1(short)", oneS, config.getShort("numberS", twoS));
assertEquals("This returns 2(default short)", twoS, config.getShort("numberNotInConfig", twoS));
@@ -144,8 +144,8 @@ public class TestBaseConfiguration
public void testGetLong()
{
config.setProperty("numberL", "1");
- long oneL = 1;
- long twoL = 2;
+ final long oneL = 1;
+ final long twoL = 2;
assertEquals("This returns 1(long)", oneL, config.getLong("numberL"));
assertEquals("This returns 1(long)", oneL, config.getLong("numberL", twoL));
assertEquals("This returns 2(default long)", twoL, config.getLong("numberNotInConfig", twoL));
@@ -169,8 +169,8 @@ public class TestBaseConfiguration
public void testGetFloat()
{
config.setProperty("numberF", "1.0");
- float oneF = 1;
- float twoF = 2;
+ final float oneF = 1;
+ final float twoF = 2;
assertEquals("This returns 1(float)", oneF, config.getFloat("numberF"), 0);
assertEquals("This returns 1(float)", oneF, config.getFloat("numberF", twoF), 0);
assertEquals("This returns 2(default float)", twoF, config.getFloat("numberNotInConfig", twoF), 0);
@@ -194,8 +194,8 @@ public class TestBaseConfiguration
public void testGetDouble()
{
config.setProperty("numberD", "1.0");
- double oneD = 1;
- double twoD = 2;
+ final double oneD = 1;
+ final double twoD = 2;
assertEquals("This returns 1(double)", oneD, config.getDouble("numberD"), 0);
assertEquals("This returns 1(double)", oneD, config.getDouble("numberD", twoD), 0);
assertEquals("This returns 2(default double)", twoD, config.getDouble("numberNotInConfig", twoD), 0);
@@ -219,8 +219,8 @@ public class TestBaseConfiguration
public void testGetBigDecimal()
{
config.setProperty("numberBigD", "123.456");
- BigDecimal number = new BigDecimal("123.456");
- BigDecimal defaultValue = new BigDecimal("654.321");
+ final BigDecimal number = new BigDecimal("123.456");
+ final BigDecimal defaultValue = new BigDecimal("654.321");
assertEquals("Existing key", number, config.getBigDecimal("numberBigD"));
assertEquals("Existing key with default value", number, config.getBigDecimal("numberBigD", defaultValue));
@@ -244,8 +244,8 @@ public class TestBaseConfiguration
public void testGetBigInteger()
{
config.setProperty("numberBigI", "1234567890");
- BigInteger number = new BigInteger("1234567890");
- BigInteger defaultValue = new BigInteger("654321");
+ final BigInteger number = new BigInteger("1234567890");
+ final BigInteger defaultValue = new BigInteger("654321");
assertEquals("Existing key", number, config.getBigInteger("numberBigI"));
assertEquals("Existing key with default value", number, config.getBigInteger("numberBigI", defaultValue));
@@ -269,8 +269,8 @@ public class TestBaseConfiguration
public void testGetString()
{
config.setProperty("testString", "The quick brown fox");
- String string = "The quick brown fox";
- String defaultValue = "jumps over the lazy dog";
+ final String string = "The quick brown fox";
+ final String defaultValue = "jumps over the lazy dog";
assertEquals("Existing key", string, config.getString("testString"));
assertEquals("Existing key with default value", string, config.getString("testString", defaultValue));
@@ -287,7 +287,7 @@ public class TestBaseConfiguration
public void testGetBoolean()
{
config.setProperty("boolA", Boolean.TRUE);
- boolean boolT = true, boolF = false;
+ final boolean boolT = true, boolF = false;
assertEquals("This returns true", boolT, config.getBoolean("boolA"));
assertEquals("This returns true, not the default", boolT, config.getBoolean("boolA", boolF));
assertEquals("This returns false(default)", boolF, config.getBoolean("boolNotInConfig", boolF));
@@ -312,7 +312,7 @@ public class TestBaseConfiguration
{
config.addProperty("number", "1");
config.addProperty("number", "2");
- List<Object> list = config.getList("number");
+ final List<Object> list = config.getList("number");
assertNotNull("The list is null", list);
assertEquals("List size", 2, list.size());
assertTrue("The number 1 is missing from the list", list.contains("1"));
@@ -337,7 +337,7 @@ public class TestBaseConfiguration
config.addProperty("array", "${number}");
config.addProperty("array", "${number}");
- List<String> list = new ArrayList<>();
+ final List<String> list = new ArrayList<>();
list.add("1");
list.add("1");
@@ -378,9 +378,9 @@ public class TestBaseConfiguration
@Test
public void testCommaSeparatedString()
{
- String prop = "hey, that's a test";
+ final String prop = "hey, that's a test";
config.setProperty("prop.string", prop);
- List<Object> list = config.getList("prop.string");
+ final List<Object> list = config.getList("prop.string");
assertEquals("Wrong number of list elements", 2, list.size());
assertEquals("Wrong element 1", "hey", list.get(0));
}
@@ -388,7 +388,7 @@ public class TestBaseConfiguration
@Test
public void testCommaSeparatedStringEscaped()
{
- String prop2 = "hey\\, that's a test";
+ final String prop2 = "hey\\, that's a test";
config.setProperty("prop.string", prop2);
assertEquals("Wrong value", "hey, that's a test", config.getString("prop.string"));
}
@@ -412,15 +412,15 @@ public class TestBaseConfiguration
props.add("quick");
props.add("brown");
props.add("fox,jumps");
- Object[] data = new Object[] {
+ final Object[] data = new Object[] {
"The", props, "over,the", "lazy", "dog."
};
config.setProperty("complex.property", data);
val = config.getProperty("complex.property");
assertTrue(val instanceof Collection);
col = (Collection<?>) val;
- Iterator<?> it = col.iterator();
- StringTokenizer tok = new StringTokenizer("The quick brown fox jumps over the lazy dog.", " ");
+ final Iterator<?> it = col.iterator();
+ final StringTokenizer tok = new StringTokenizer("The quick brown fox jumps over the lazy dog.", " ");
while(tok.hasMoreTokens())
{
assertTrue(it.hasNext());
@@ -444,7 +444,7 @@ public class TestBaseConfiguration
config.clearProperty("prop.properties");
config.setProperty("prop.properties", "foo=bar, baz=moo, seal=clubber");
- Properties p = new Properties();
+ final Properties p = new Properties();
p.setProperty("foo", "bar");
p.setProperty("baz", "moo");
p.setProperty("seal", "clubber");
@@ -462,8 +462,8 @@ public class TestBaseConfiguration
* when generating the subset
*/
- String prop = "hey, that's a test";
- String prop2 = "hey\\, that's a test";
+ final String prop = "hey, that's a test";
+ final String prop2 = "hey\\, that's a test";
config.setProperty("prop.string", prop2);
config.setProperty("property.string", "hello");
@@ -582,7 +582,7 @@ public class TestBaseConfiguration
@Test
public void testSetInterpolator()
{
- ConfigurationInterpolator interpolator =
+ final ConfigurationInterpolator interpolator =
EasyMock.createMock(ConfigurationInterpolator.class);
EasyMock.replay(interpolator);
config.setInterpolator(interpolator);
@@ -597,22 +597,22 @@ public class TestBaseConfiguration
@Test
public void testInstallInterpolator()
{
- Lookup prefixLookup = EasyMock.createMock(Lookup.class);
- Lookup defLookup = EasyMock.createMock(Lookup.class);
+ final Lookup prefixLookup = EasyMock.createMock(Lookup.class);
+ final Lookup defLookup = EasyMock.createMock(Lookup.class);
EasyMock.replay(prefixLookup, defLookup);
- Map<String, Lookup> prefixLookups = new HashMap<>();
+ final Map<String, Lookup> prefixLookups = new HashMap<>();
prefixLookups.put("test", prefixLookup);
- List<Lookup> defLookups = new ArrayList<>();
+ final List<Lookup> defLookups = new ArrayList<>();
defLookups.add(defLookup);
config.installInterpolator(prefixLookups, defLookups);
- ConfigurationInterpolator interpolator = config.getInterpolator();
+ final ConfigurationInterpolator interpolator = config.getInterpolator();
assertEquals("Wrong prefix lookups", prefixLookups,
interpolator.getLookups());
- List<Lookup> defLookups2 = interpolator.getDefaultLookups();
+ final List<Lookup> defLookups2 = interpolator.getDefaultLookups();
assertEquals("Wrong number of default lookups", 2, defLookups2.size());
assertSame("Wrong default lookup 1", defLookup, defLookups2.get(0));
- String var = "testVariable";
- Object value = 42;
+ final String var = "testVariable";
+ final Object value = 42;
config.addProperty(var, value);
assertEquals("Wrong lookup result", value,
defLookups2.get(1).lookup(var));
@@ -700,11 +700,11 @@ public class TestBaseConfiguration
{
config.addProperty("key" + i, new Integer(i));
}
- BaseConfiguration config2 = (BaseConfiguration) config.clone();
+ final BaseConfiguration config2 = (BaseConfiguration) config.clone();
- for (Iterator<String> it = config.getKeys(); it.hasNext();)
+ for (final Iterator<String> it = config.getKeys(); it.hasNext();)
{
- String key = it.next();
+ final String key = it.next();
assertTrue("Key not found: " + key, config2.containsKey(key));
assertEquals("Wrong value for key " + key, config.getProperty(key),
config2.getProperty(key));
@@ -717,10 +717,10 @@ public class TestBaseConfiguration
@Test
public void testCloneModify()
{
- EventListener<ConfigurationEvent> l = new EventListenerTestImpl(config);
+ final EventListener<ConfigurationEvent> l = new EventListenerTestImpl(config);
config.addEventListener(ConfigurationEvent.ANY, l);
config.addProperty("original", Boolean.TRUE);
- BaseConfiguration config2 = (BaseConfiguration) config.clone();
+ final BaseConfiguration config2 = (BaseConfiguration) config.clone();
config2.addProperty("clone", Boolean.TRUE);
assertFalse("New key appears in original", config.containsKey("clone"));
@@ -741,7 +741,7 @@ public class TestBaseConfiguration
final String key = "list";
config.addProperty(key, "value1");
config.addProperty(key, "value2");
- BaseConfiguration config2 = (BaseConfiguration) config.clone();
+ final BaseConfiguration config2 = (BaseConfiguration) config.clone();
config2.addProperty(key, "value3");
assertEquals("Wrong number of original properties", 2, config.getList(
key).size());
@@ -756,7 +756,7 @@ public class TestBaseConfiguration
final String keyAnswer = "answer";
config.addProperty(keyAnswer, "The answer is ${" + KEY_NUMBER + "}.");
config.addProperty(KEY_NUMBER, 42);
- BaseConfiguration clone = (BaseConfiguration) config.clone();
+ final BaseConfiguration clone = (BaseConfiguration) config.clone();
clone.setProperty(KEY_NUMBER, 43);
assertEquals("Wrong interpolation in original", "The answer is 42.",
config.getString(keyAnswer));
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseConfigurationXMLReader.java Thu Sep 27 22:24:23 2018
@@ -89,27 +89,27 @@ public class TestBaseConfigurationXMLRea
@Test(expected = IOException.class)
public void testParseIOException() throws SAXException, IOException
{
- BaseConfigurationXMLReader reader = new BaseConfigurationXMLReader();
+ final BaseConfigurationXMLReader reader = new BaseConfigurationXMLReader();
reader.parse("document");
}
@Test
public void testSetRootName() throws Exception
{
- BaseConfigurationXMLReader reader = new BaseConfigurationXMLReader(config);
+ final BaseConfigurationXMLReader reader = new BaseConfigurationXMLReader(config);
reader.setRootName("apache");
checkDocument(reader, "apache");
}
- private void checkDocument(BaseConfigurationXMLReader creader,
- String rootName) throws Exception
+ private void checkDocument(final BaseConfigurationXMLReader creader,
+ final String rootName) throws Exception
{
- SAXSource source = new SAXSource(creader, new InputSource());
- DOMResult result = new DOMResult();
- Transformer trans = TransformerFactory.newInstance().newTransformer();
+ final SAXSource source = new SAXSource(creader, new InputSource());
+ final DOMResult result = new DOMResult();
+ final Transformer trans = TransformerFactory.newInstance().newTransformer();
trans.transform(source, result);
- Node root = ((Document) result.getNode()).getDocumentElement();
- JXPathContext ctx = JXPathContext.newContext(root);
+ final Node root = ((Document) result.getNode()).getDocumentElement();
+ final JXPathContext ctx = JXPathContext.newContext(root);
assertEquals("Wrong root name", rootName, root.getNodeName());
assertEquals("Wrong number of children", 3, ctx.selectNodes("/*").size());
@@ -131,17 +131,17 @@ public class TestBaseConfigurationXMLRea
* @param path the path to be checked
* @param values the expected element values
*/
- private void check(JXPathContext ctx, String path, String[] values)
+ private void check(final JXPathContext ctx, final String path, final String[] values)
{
- Iterator<?> it = ctx.iterate(path);
- for (String value : values) {
+ final Iterator<?> it = ctx.iterate(path);
+ for (final String value : values) {
assertTrue("Too few values", it.hasNext());
assertEquals("Wrong property value", value, it.next());
}
assertFalse("Too many values", it.hasNext());
}
- private void check(JXPathContext ctx, String path, String value)
+ private void check(final JXPathContext ctx, final String path, final String value)
{
check(ctx, path, new String[]
{ value });
@@ -151,7 +151,7 @@ public class TestBaseConfigurationXMLRea
private static class TestContentHandler extends DefaultHandler
{
@Override
- public void characters(char[] ch, int start, int length)
+ public void characters(final char[] ch, final int start, final int length)
throws SAXException
{
throw new SAXException("Test exception during parsing");