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 [17/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/TestBaseHierarchicalConfigurationSynchronization.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseHierarchicalConfigurationSynchronization.java Thu Sep 27 22:24:23 2018
@@ -62,7 +62,7 @@ public class TestBaseHierarchicalConfigu
@Before
public void setUp() throws Exception
{
- XMLConfiguration c = new XMLConfiguration();
+ final XMLConfiguration c = new XMLConfiguration();
testFile = ConfigurationAssert.getTestFile("test.xml");
new FileHandler(c).load(testFile);
sync = new SynchronizerTestImpl();
@@ -97,7 +97,7 @@ public class TestBaseHierarchicalConfigu
@Test
public void testCloneSynchronized()
{
- BaseHierarchicalConfiguration clone =
+ final BaseHierarchicalConfiguration clone =
(BaseHierarchicalConfiguration) config.clone();
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
assertNotSame("Synchronizer was not cloned", config.getSynchronizer(),
@@ -110,7 +110,7 @@ public class TestBaseHierarchicalConfigu
@Test
public void testAddNodesSynchronized()
{
- ImmutableNode node = NodeStructureHelper.createNode("newNode", "true");
+ final ImmutableNode node = NodeStructureHelper.createNode("newNode", "true");
config.addNodes("test.addNodes", Collections.singleton(node));
sync.verify(Methods.BEGIN_WRITE, Methods.END_WRITE);
}
@@ -131,7 +131,7 @@ public class TestBaseHierarchicalConfigu
@Test
public void testCopyConstructorSynchronized()
{
- BaseHierarchicalConfiguration copy =
+ final BaseHierarchicalConfiguration copy =
new BaseHierarchicalConfiguration(config);
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
assertNotSame("Synchronizer was copied", sync, copy.getSynchronizer());
@@ -144,7 +144,7 @@ public class TestBaseHierarchicalConfigu
@Test
public void testConfigurationAtSynchronized()
{
- HierarchicalConfiguration<ImmutableNode> sub = config.configurationAt("element2");
+ final HierarchicalConfiguration<ImmutableNode> sub = config.configurationAt("element2");
assertEquals("Wrong property", "I'm complex!",
sub.getString("subelement.subsubelement"));
sync.verify(Methods.BEGIN_READ, Methods.END_READ, Methods.BEGIN_READ,
@@ -158,7 +158,7 @@ public class TestBaseHierarchicalConfigu
@Test
public void testConfigurationsAtSynchronized()
{
- List<HierarchicalConfiguration<ImmutableNode>> subs =
+ final List<HierarchicalConfiguration<ImmutableNode>> subs =
config.configurationsAt("list.item");
assertFalse("No subnode configurations", subs.isEmpty());
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
@@ -170,7 +170,7 @@ public class TestBaseHierarchicalConfigu
@Test
public void testChildConfigurationsAtSynchronized()
{
- List<HierarchicalConfiguration<ImmutableNode>> subs =
+ final List<HierarchicalConfiguration<ImmutableNode>> subs =
config.childConfigurationsAt("clear");
assertFalse("No subnode configurations", subs.isEmpty());
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
@@ -182,10 +182,10 @@ public class TestBaseHierarchicalConfigu
* @param c the configuration to test
* @return a flag whether the root node of this configuration is detached
*/
- private static boolean isDetached(HierarchicalConfiguration<ImmutableNode> c)
+ private static boolean isDetached(final HierarchicalConfiguration<ImmutableNode> c)
{
assertTrue("Not a sub configuration", c instanceof SubnodeConfiguration);
- InMemoryNodeModel nodeModel = ((SubnodeConfiguration) c).getRootNodeModel();
+ final InMemoryNodeModel nodeModel = ((SubnodeConfiguration) c).getRootNodeModel();
return nodeModel.isTrackedNodeDetached(((SubnodeConfiguration) c)
.getRootSelector());
}
@@ -198,9 +198,9 @@ public class TestBaseHierarchicalConfigu
public void testSubnodeUpdate()
{
config.addProperty("element2.test", Boolean.TRUE);
- HierarchicalConfiguration<ImmutableNode> sub =
+ final HierarchicalConfiguration<ImmutableNode> sub =
config.configurationAt("element2", true);
- HierarchicalConfiguration<ImmutableNode> subsub =
+ final HierarchicalConfiguration<ImmutableNode> subsub =
sub.configurationAt("subelement", true);
config.clearTree("element2.subelement");
assertFalse("Sub1 detached", isDetached(sub));
@@ -214,11 +214,11 @@ public class TestBaseHierarchicalConfigu
@Test
public void testSubnodeUpdateBySubnode()
{
- HierarchicalConfiguration<ImmutableNode> sub =
+ final HierarchicalConfiguration<ImmutableNode> sub =
config.configurationAt("element2", true);
- HierarchicalConfiguration<ImmutableNode> subsub =
+ final HierarchicalConfiguration<ImmutableNode> subsub =
sub.configurationAt("subelement", true);
- HierarchicalConfiguration<ImmutableNode> sub2 =
+ final HierarchicalConfiguration<ImmutableNode> sub2 =
config.configurationAt("element2.subelement", true);
sub.clearTree("subelement");
assertTrue("Sub2 still attached", isDetached(sub2));
@@ -232,15 +232,16 @@ public class TestBaseHierarchicalConfigu
@Test
public void testCloneCopySubnodeData()
{
- BaseHierarchicalConfiguration conf2 =
+ final BaseHierarchicalConfiguration conf2 =
new BaseHierarchicalConfiguration(config);
- HierarchicalConfiguration<ImmutableNode> sub =
+ final HierarchicalConfiguration<ImmutableNode> sub =
conf2.configurationAt("element2.subelement", true);
@SuppressWarnings("unchecked") // clone retains the type
+ final
HierarchicalConfiguration<ImmutableNode> copy =
(HierarchicalConfiguration<ImmutableNode>) conf2.clone();
- HierarchicalConfiguration<ImmutableNode> sub2 =
+ final HierarchicalConfiguration<ImmutableNode> sub2 =
copy.configurationAt("element2.subelement", true);
// This must not cause a validate operation on sub1, but on sub2
copy.clearTree("element2");
@@ -254,7 +255,7 @@ public class TestBaseHierarchicalConfigu
@Test
public void testSubsetSynchronized()
{
- Configuration subset = config.subset("test");
+ final Configuration subset = config.subset("test");
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
assertSame("Wrong Synchronizer", sync, subset.getSynchronizer());
}
@@ -267,18 +268,18 @@ public class TestBaseHierarchicalConfigu
public void testReadOnlyAccessToSubConfigurations()
throws ConfigurationException
{
- FileBasedConfigurationBuilder<XMLConfiguration> builder =
+ final FileBasedConfigurationBuilder<XMLConfiguration> builder =
new FileBasedConfigurationBuilder<>(
XMLConfiguration.class);
builder.configure(new Parameters().fileBased().setFile(testFile));
config = builder.getConfiguration();
- CountDownLatch startLatch = new CountDownLatch(1);
- Collection<SubNodeAccessThread> threads =
+ final CountDownLatch startLatch = new CountDownLatch(1);
+ final Collection<SubNodeAccessThread> threads =
new ArrayList<>();
for (int i = 0; i < 4; i++)
{
- SubNodeAccessThread t =
+ final SubNodeAccessThread t =
new SubNodeAccessThread(config, startLatch, "element2",
"subelement.subsubelement");
t.start();
@@ -286,7 +287,7 @@ public class TestBaseHierarchicalConfigu
}
for (int i = 0; i < 4; i++)
{
- SubNodeAccessThread t =
+ final SubNodeAccessThread t =
new SubNodeAccessThread(config, startLatch,
"element2.subelement", "subsubelement");
t.start();
@@ -294,7 +295,7 @@ public class TestBaseHierarchicalConfigu
}
startLatch.countDown();
- for (SubNodeAccessThread t : threads)
+ for (final SubNodeAccessThread t : threads)
{
t.verify();
}
@@ -328,9 +329,9 @@ public class TestBaseHierarchicalConfigu
* @param keySubConfig the key for the sub configuration
* @param keyProperty the key for the property
*/
- public SubNodeAccessThread(HierarchicalConfiguration<ImmutableNode> c,
- CountDownLatch startLatch, String keySubConfig,
- String keyProperty)
+ public SubNodeAccessThread(final HierarchicalConfiguration<ImmutableNode> c,
+ final CountDownLatch startLatch, final String keySubConfig,
+ final String keyProperty)
{
config = c;
latch = startLatch;
@@ -344,11 +345,11 @@ public class TestBaseHierarchicalConfigu
try
{
latch.await();
- HierarchicalConfiguration<ImmutableNode> subConfig =
+ final HierarchicalConfiguration<ImmutableNode> subConfig =
config.configurationAt(keySub, true);
value = subConfig.getString(keyProp);
}
- catch (InterruptedException iex)
+ catch (final InterruptedException iex)
{
// ignore
}
@@ -363,7 +364,7 @@ public class TestBaseHierarchicalConfigu
{
join();
}
- catch (InterruptedException e)
+ catch (final InterruptedException e)
{
fail("Waiting was interrupted: " + e);
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestBaseNullConfiguration.java Thu Sep 27 22:24:23 2018
@@ -75,8 +75,8 @@ public class TestBaseNullConfiguration
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));
@@ -100,8 +100,8 @@ public class TestBaseNullConfiguration
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));
@@ -125,8 +125,8 @@ public class TestBaseNullConfiguration
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));
@@ -150,8 +150,8 @@ public class TestBaseNullConfiguration
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);
@@ -175,8 +175,8 @@ public class TestBaseNullConfiguration
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);
@@ -200,8 +200,8 @@ public class TestBaseNullConfiguration
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));
@@ -225,8 +225,8 @@ public class TestBaseNullConfiguration
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));
@@ -251,8 +251,8 @@ public class TestBaseNullConfiguration
public void testGetString()
{
config.setProperty("testString", "The quick brown fox");
- String string = new String("The quick brown fox");
- String defaultValue = new String("jumps over the lazy dog");
+ final String string = new String("The quick brown fox");
+ final String defaultValue = new String("jumps over the lazy dog");
assertEquals("Existing key", string, config.getString("testString"));
assertEquals("Existing key with default value", string, config.getString("testString", defaultValue));
@@ -269,7 +269,7 @@ public class TestBaseNullConfiguration
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));
@@ -294,7 +294,7 @@ public class TestBaseNullConfiguration
{
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"));
@@ -312,9 +312,9 @@ public class TestBaseNullConfiguration
@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 elements", 2, list.size());
assertEquals("Wrong element 1", "hey", list.get(0));
}
@@ -322,7 +322,7 @@ public class TestBaseNullConfiguration
@Test
public void testCommaSeparatedStringEscaped()
{
- String prop2 = "hey\\, that's a test";
+ final String prop2 = "hey\\, that's a test";
config.clearProperty("prop.string");
config.setProperty("prop.string", prop2);
assertEquals("Wrong value", "hey, that's a test", config.getString("prop.string"));
@@ -340,7 +340,7 @@ public class TestBaseNullConfiguration
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");
@@ -358,8 +358,8 @@ public class TestBaseNullConfiguration
* 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");
@@ -385,12 +385,12 @@ public class TestBaseNullConfiguration
{
config.setProperty("applicationRoot", "/home/applicationRoot");
config.setProperty("db", "${applicationRoot}/db/hypersonic");
- String unInterpolatedValue = "${applicationRoot2}/db/hypersonic";
+ final String unInterpolatedValue = "${applicationRoot2}/db/hypersonic";
config.setProperty("dbFailedInterpolate", unInterpolatedValue);
- String dbProp = "/home/applicationRoot/db/hypersonic";
+ final String dbProp = "/home/applicationRoot/db/hypersonic";
//construct a new config, using config as the defaults config for it.
- BaseConfiguration superProp = config;
+ final BaseConfiguration superProp = config;
assertEquals(
"Checking interpolated variable",dbProp,
@@ -401,7 +401,7 @@ public class TestBaseNullConfiguration
unInterpolatedValue);
superProp.setProperty("arrayInt", "${applicationRoot}/1");
- String[] arrayInt = superProp.getStringArray("arrayInt");
+ final String[] arrayInt = superProp.getStringArray("arrayInt");
assertEquals(
"check first entry was interpolated",
"/home/applicationRoot/1",
@@ -420,7 +420,7 @@ public class TestBaseNullConfiguration
"test.third-level",
"${test.second-level}/third-level");
- String expectedValue =
+ final String expectedValue =
"/base-level/first-level/second-level/third-level";
assertEquals(config.getString("test.third-level"), expectedValue);
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java Thu Sep 27 22:24:23 2018
@@ -66,9 +66,9 @@ public class TestCatalogResolver
* @param fileName the file name
* @throws ConfigurationException if an error occurs
*/
- private void load(String fileName) throws ConfigurationException
+ private void load(final String fileName) throws ConfigurationException
{
- FileHandler handler = new FileHandler(config);
+ final FileHandler handler = new FileHandler(config);
handler.load(fileName);
}
@@ -106,7 +106,7 @@ public class TestCatalogResolver
@Test
public void testLogger() throws Exception
{
- ConfigurationLogger log = new ConfigurationLogger(this.getClass());
+ final ConfigurationLogger log = new ConfigurationLogger(this.getClass());
resolver.setLogger(log);
assertNotNull("No Logger returned", resolver.getLogger());
assertSame("Incorrect Logger", log, resolver.getLogger());
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCombinedConfiguration.java Thu Sep 27 22:24:23 2018
@@ -122,7 +122,7 @@ public class TestCombinedConfiguration
@Test
public void testAddConfiguration()
{
- AbstractConfiguration c = setUpTestConfiguration();
+ final AbstractConfiguration c = setUpTestConfiguration();
config.addConfiguration(c);
checkAddConfig(c);
assertEquals("Wrong number of configs", 1, config
@@ -140,7 +140,7 @@ public class TestCombinedConfiguration
@Test
public void testAddConfigurationWithName()
{
- AbstractConfiguration c = setUpTestConfiguration();
+ final AbstractConfiguration c = setUpTestConfiguration();
config.addConfiguration(c, TEST_NAME);
checkAddConfig(c);
assertEquals("Wrong number of configs", 1, config
@@ -148,7 +148,7 @@ public class TestCombinedConfiguration
assertSame("Added config not found", c, config.getConfiguration(0));
assertSame("Added config not found by name", c, config
.getConfiguration(TEST_NAME));
- Set<String> names = config.getConfigurationNames();
+ final Set<String> names = config.getConfigurationNames();
assertEquals("Wrong number of config names", 1, names.size());
assertTrue("Name not found", names.contains(TEST_NAME));
assertTrue("Wrong property value", config.getBoolean(TEST_KEY));
@@ -173,7 +173,7 @@ public class TestCombinedConfiguration
@Test
public void testAddConfigurationAt()
{
- AbstractConfiguration c = setUpTestConfiguration();
+ final AbstractConfiguration c = setUpTestConfiguration();
config.addConfiguration(c, null, "my");
checkAddConfig(c);
assertTrue("Wrong property value", config.getBoolean("my." + TEST_KEY));
@@ -186,7 +186,7 @@ public class TestCombinedConfiguration
@Test
public void testAddConfigurationComplexAt()
{
- AbstractConfiguration c = setUpTestConfiguration();
+ final AbstractConfiguration c = setUpTestConfiguration();
config.addConfiguration(c, null, "This..is.a.complex");
checkAddConfig(c);
assertTrue("Wrong property value", config
@@ -198,9 +198,9 @@ public class TestCombinedConfiguration
*
* @param c the config to check
*/
- private void checkAddConfig(AbstractConfiguration c)
+ private void checkAddConfig(final AbstractConfiguration c)
{
- Collection<EventListener<? super ConfigurationEvent>> listeners =
+ final Collection<EventListener<? super ConfigurationEvent>> listeners =
c.getEventListeners(ConfigurationEvent.ANY);
assertEquals("Wrong number of configuration listeners", 1, listeners
.size());
@@ -250,7 +250,7 @@ public class TestCombinedConfiguration
@Test
public void testRemoveConfiguration()
{
- AbstractConfiguration c = setUpTestConfiguration();
+ final AbstractConfiguration c = setUpTestConfiguration();
config.addConfiguration(c);
checkAddConfig(c);
assertTrue("Config could not be removed", config.removeConfiguration(c));
@@ -263,7 +263,7 @@ public class TestCombinedConfiguration
@Test
public void testRemoveConfigurationAt()
{
- AbstractConfiguration c = setUpTestConfiguration();
+ final AbstractConfiguration c = setUpTestConfiguration();
config.addConfiguration(c);
assertSame("Wrong config removed", c, config.removeConfigurationAt(0));
checkRemoveConfig(c);
@@ -275,7 +275,7 @@ public class TestCombinedConfiguration
@Test
public void testRemoveConfigurationByName()
{
- AbstractConfiguration c = setUpTestConfiguration();
+ final AbstractConfiguration c = setUpTestConfiguration();
config.addConfiguration(c, TEST_NAME);
assertSame("Wrong config removed", c, config
.removeConfiguration(TEST_NAME));
@@ -288,7 +288,7 @@ public class TestCombinedConfiguration
@Test
public void testRemoveNamedConfiguration()
{
- AbstractConfiguration c = setUpTestConfiguration();
+ final AbstractConfiguration c = setUpTestConfiguration();
config.addConfiguration(c, TEST_NAME);
config.removeConfiguration(c);
checkRemoveConfig(c);
@@ -300,7 +300,7 @@ public class TestCombinedConfiguration
@Test
public void testRemoveNamedConfigurationAt()
{
- AbstractConfiguration c = setUpTestConfiguration();
+ final AbstractConfiguration c = setUpTestConfiguration();
config.addConfiguration(c, TEST_NAME);
assertSame("Wrong config removed", c, config.removeConfigurationAt(0));
checkRemoveConfig(c);
@@ -333,7 +333,7 @@ public class TestCombinedConfiguration
*
* @param c the removed configuration
*/
- private void checkRemoveConfig(AbstractConfiguration c)
+ private void checkRemoveConfig(final AbstractConfiguration c)
{
assertTrue("Listener was not removed",
c.getEventListeners(ConfigurationEvent.ANY).isEmpty());
@@ -351,7 +351,7 @@ public class TestCombinedConfiguration
@Test
public void testUpdateContainedConfiguration()
{
- AbstractConfiguration c = setUpTestConfiguration();
+ final AbstractConfiguration c = setUpTestConfiguration();
config.addConfiguration(c);
c.addProperty("test.otherTest", "yes");
assertEquals("New property not found", "yes", config
@@ -365,7 +365,7 @@ public class TestCombinedConfiguration
@Test
public void testSetNodeCombiner()
{
- NodeCombiner combiner = new UnionCombiner();
+ final NodeCombiner combiner = new UnionCombiner();
config.setNodeCombiner(combiner);
assertSame("Node combiner was not set", combiner, config
.getNodeCombiner());
@@ -391,7 +391,7 @@ public class TestCombinedConfiguration
config.addConfiguration(setUpTestConfiguration(), TEST_NAME, "conf2");
config.addConfiguration(new PropertiesConfiguration(), "props");
- CombinedConfiguration cc2 = (CombinedConfiguration) config.clone();
+ final CombinedConfiguration cc2 = (CombinedConfiguration) config.clone();
assertNotNull("No root node", cc2.getModel().getNodeHandler()
.getRootNode());
assertEquals("Wrong number of contained configurations", config
@@ -406,7 +406,7 @@ public class TestCombinedConfiguration
cc2.getEventListeners(ConfigurationEvent.ANY),
config.getEventListeners(ConfigurationEvent.ANY)));
- StrictConfigurationComparator comp = new StrictConfigurationComparator();
+ final StrictConfigurationComparator comp = new StrictConfigurationComparator();
for (int i = 0; i < config.getNumberOfConfigurations(); i++)
{
assertNotSame("Configuration at " + i + " was not cloned", config
@@ -427,7 +427,7 @@ public class TestCombinedConfiguration
public void testCloneModify()
{
config.addConfiguration(setUpTestConfiguration(), TEST_NAME);
- CombinedConfiguration cc2 = (CombinedConfiguration) config.clone();
+ final CombinedConfiguration cc2 = (CombinedConfiguration) config.clone();
assertTrue("Name is missing", cc2.getConfigurationNames().contains(
TEST_NAME));
cc2.removeConfiguration(TEST_NAME);
@@ -463,11 +463,11 @@ public class TestCombinedConfiguration
@Test
public void testClearRemoveChildListener()
{
- AbstractConfiguration child = setUpTestConfiguration();
+ final AbstractConfiguration child = setUpTestConfiguration();
config.addConfiguration(child);
config.clear();
- for (EventListener<?> listener : child
+ for (final EventListener<?> listener : child
.getEventListeners(ConfigurationEvent.ANY))
{
assertNotEquals("Still registered", config, listener);
@@ -479,8 +479,8 @@ public class TestCombinedConfiguration
*/
private void setUpSourceTest()
{
- BaseHierarchicalConfiguration c1 = new BaseHierarchicalConfiguration();
- PropertiesConfiguration c2 = new PropertiesConfiguration();
+ final BaseHierarchicalConfiguration c1 = new BaseHierarchicalConfiguration();
+ final PropertiesConfiguration c2 = new PropertiesConfiguration();
c1.addProperty(TEST_KEY, TEST_NAME);
c2.addProperty("another.key", "test");
config.addConfiguration(c1, CHILD1);
@@ -581,7 +581,7 @@ public class TestCombinedConfiguration
public void testGetSourceWithCombinedChildConfiguration()
{
setUpSourceTest();
- CombinedConfiguration cc = new CombinedConfiguration();
+ final CombinedConfiguration cc = new CombinedConfiguration();
cc.addConfiguration(config);
assertEquals("Wrong source", config, cc.getSource(TEST_KEY));
}
@@ -596,7 +596,7 @@ public class TestCombinedConfiguration
final String key = "list.key";
config.getConfiguration(CHILD1).addProperty(key, "1,2,3");
config.getConfiguration(CHILD2).addProperty(key, "a,b,c");
- Set<Configuration> sources = config.getSources(key);
+ final Set<Configuration> sources = config.getSources(key);
assertEquals("Wrong number of sources", 2, sources.size());
assertTrue("Source 1 not found",
sources.contains(config.getConfiguration(CHILD1)));
@@ -621,7 +621,7 @@ public class TestCombinedConfiguration
@Test
public void testEscapeListDelimiters()
{
- PropertiesConfiguration sub = new PropertiesConfiguration();
+ final PropertiesConfiguration sub = new PropertiesConfiguration();
sub.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
sub.addProperty("test.pi", "3\\,1415");
config.addConfiguration(sub);
@@ -652,17 +652,17 @@ public class TestCombinedConfiguration
@Test
public void testConversionExpressionEngine()
{
- PropertiesConfiguration child = new PropertiesConfiguration();
+ final PropertiesConfiguration child = new PropertiesConfiguration();
child.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
child.addProperty("test(a)", "1,2,3");
config.addConfiguration(child);
- DefaultExpressionEngine engineQuery =
+ final DefaultExpressionEngine engineQuery =
new DefaultExpressionEngine(
new DefaultExpressionEngineSymbols.Builder(
DefaultExpressionEngineSymbols.DEFAULT_SYMBOLS)
.setIndexStart("<").setIndexEnd(">").create());
config.setExpressionEngine(engineQuery);
- DefaultExpressionEngine engineConvert =
+ final DefaultExpressionEngine engineConvert =
new DefaultExpressionEngine(
new DefaultExpressionEngineSymbols.Builder(
DefaultExpressionEngineSymbols.DEFAULT_SYMBOLS)
@@ -678,12 +678,12 @@ public class TestCombinedConfiguration
{
config.addConfiguration(setUpTestConfiguration());
config.addConfiguration(setUpTestConfiguration(), TEST_NAME, "conf2");
- AbstractConfiguration pc = new PropertiesConfiguration();
+ final AbstractConfiguration pc = new PropertiesConfiguration();
config.addConfiguration(pc, "props");
- List<Configuration> list = config.getConfigurations();
+ final List<Configuration> list = config.getConfigurations();
assertNotNull("No list of configurations returned", list);
assertTrue("Incorrect number of configurations", list.size() == 3);
- Configuration c = list.get(2);
+ final Configuration c = list.get(2);
assertTrue("Incorrect configuration", c == pc);
}
@@ -692,12 +692,12 @@ public class TestCombinedConfiguration
{
config.addConfiguration(setUpTestConfiguration());
config.addConfiguration(setUpTestConfiguration(), TEST_NAME, "conf2");
- AbstractConfiguration pc = new PropertiesConfiguration();
+ final AbstractConfiguration pc = new PropertiesConfiguration();
config.addConfiguration(pc, "props");
- List<String> list = config.getConfigurationNameList();
+ final List<String> list = config.getConfigurationNameList();
assertNotNull("No list of configurations returned", list);
assertTrue("Incorrect number of configurations", list.size() == 3);
- String name = list.get(1);
+ final String name = list.get(1);
assertNotNull("No name returned", name);
assertTrue("Incorrect configuration name", TEST_NAME.equals(name));
}
@@ -709,12 +709,12 @@ public class TestCombinedConfiguration
@Test
public void testCombinedCopyToXML() throws ConfigurationException
{
- XMLConfiguration x1 = new XMLConfiguration();
+ final XMLConfiguration x1 = new XMLConfiguration();
x1.addProperty("key1", "value1");
x1.addProperty("key1[@override]", "USER1");
x1.addProperty("key2", "value2");
x1.addProperty("key2[@override]", "USER2");
- XMLConfiguration x2 = new XMLConfiguration();
+ final XMLConfiguration x2 = new XMLConfiguration();
x2.addProperty("key2", "value2.2");
x2.addProperty("key2[@override]", "USER2");
config.setNodeCombiner(new OverrideCombiner());
@@ -724,9 +724,9 @@ public class TestCombinedConfiguration
assertEquals("Wrong element value", "value2.2", x3.getString("key2"));
assertEquals("Wrong attribute value", "USER2",
x3.getString("key2[@override]"));
- StringWriter w = new StringWriter();
+ final StringWriter w = new StringWriter();
new FileHandler(x3).save(w);
- String s = w.toString();
+ final String s = w.toString();
x3 = new XMLConfiguration();
new FileHandler(x3).load(new StringReader(s));
assertEquals("Wrong element value after load", "value2.2",
@@ -744,7 +744,7 @@ public class TestCombinedConfiguration
private SynchronizerTestImpl setUpSynchronizerTest()
{
setUpSourceTest();
- SynchronizerTestImpl sync = new SynchronizerTestImpl();
+ final SynchronizerTestImpl sync = new SynchronizerTestImpl();
config.setSynchronizer(sync);
return sync;
}
@@ -755,7 +755,7 @@ public class TestCombinedConfiguration
@Test
public void testAddConfigurationSynchronized()
{
- SynchronizerTestImpl sync = setUpSynchronizerTest();
+ final SynchronizerTestImpl sync = setUpSynchronizerTest();
config.addConfiguration(new BaseHierarchicalConfiguration());
sync.verify(Methods.BEGIN_WRITE, Methods.END_WRITE);
checkCombinedRootNotConstructed();
@@ -767,7 +767,7 @@ public class TestCombinedConfiguration
@Test
public void testSetNodeCombinerSynchronized()
{
- SynchronizerTestImpl sync = setUpSynchronizerTest();
+ final SynchronizerTestImpl sync = setUpSynchronizerTest();
config.setNodeCombiner(new UnionCombiner());
sync.verify(Methods.BEGIN_WRITE, Methods.END_WRITE);
checkCombinedRootNotConstructed();
@@ -779,7 +779,7 @@ public class TestCombinedConfiguration
@Test
public void testGetNodeCombinerSynchronized()
{
- SynchronizerTestImpl sync = setUpSynchronizerTest();
+ final SynchronizerTestImpl sync = setUpSynchronizerTest();
assertNotNull("No node combiner", config.getNodeCombiner());
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
checkCombinedRootNotConstructed();
@@ -792,7 +792,7 @@ public class TestCombinedConfiguration
@Test
public void testGetConfigurationByIdxSynchronized()
{
- SynchronizerTestImpl sync = setUpSynchronizerTest();
+ final SynchronizerTestImpl sync = setUpSynchronizerTest();
assertNotNull("No configuration", config.getConfiguration(0));
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
checkCombinedRootNotConstructed();
@@ -805,7 +805,7 @@ public class TestCombinedConfiguration
@Test
public void testGetConfigurationByNameSynchronized()
{
- SynchronizerTestImpl sync = setUpSynchronizerTest();
+ final SynchronizerTestImpl sync = setUpSynchronizerTest();
assertNotNull("No configuration", config.getConfiguration(CHILD1));
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
checkCombinedRootNotConstructed();
@@ -818,7 +818,7 @@ public class TestCombinedConfiguration
@Test
public void testGetConfigurationNamesSynchronized()
{
- SynchronizerTestImpl sync = setUpSynchronizerTest();
+ final SynchronizerTestImpl sync = setUpSynchronizerTest();
assertFalse("No child names", config.getConfigurationNames().isEmpty());
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
checkCombinedRootNotConstructed();
@@ -831,7 +831,7 @@ public class TestCombinedConfiguration
@Test
public void testGetConfigurationNameListSynchronized()
{
- SynchronizerTestImpl sync = setUpSynchronizerTest();
+ final SynchronizerTestImpl sync = setUpSynchronizerTest();
assertFalse("No child names", config.getConfigurationNameList()
.isEmpty());
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
@@ -854,7 +854,7 @@ public class TestCombinedConfiguration
@Test
public void testGetConfigurationsSynchronized()
{
- SynchronizerTestImpl sync = setUpSynchronizerTest();
+ final SynchronizerTestImpl sync = setUpSynchronizerTest();
assertFalse("No child configurations", config.getConfigurations()
.isEmpty());
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
@@ -868,7 +868,7 @@ public class TestCombinedConfiguration
@Test
public void testGetConversionExpressionEngineSynchronized()
{
- SynchronizerTestImpl sync = setUpSynchronizerTest();
+ final SynchronizerTestImpl sync = setUpSynchronizerTest();
assertNull("Got a conversion engine",
config.getConversionExpressionEngine());
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
@@ -882,7 +882,7 @@ public class TestCombinedConfiguration
@Test
public void testSetConversionExpressionEngineSynchronized()
{
- SynchronizerTestImpl sync = setUpSynchronizerTest();
+ final SynchronizerTestImpl sync = setUpSynchronizerTest();
config.setConversionExpressionEngine(new DefaultExpressionEngine(
DefaultExpressionEngineSymbols.DEFAULT_SYMBOLS));
sync.verify(Methods.BEGIN_WRITE, Methods.END_WRITE);
@@ -895,7 +895,7 @@ public class TestCombinedConfiguration
@Test
public void testInvalidateSynchronized()
{
- SynchronizerTestImpl sync = setUpSynchronizerTest();
+ final SynchronizerTestImpl sync = setUpSynchronizerTest();
config.invalidate();
sync.verify(Methods.BEGIN_WRITE, Methods.END_WRITE);
}
@@ -906,7 +906,7 @@ public class TestCombinedConfiguration
@Test
public void testGetSourceSynchronized()
{
- SynchronizerTestImpl sync = setUpSynchronizerTest();
+ final SynchronizerTestImpl sync = setUpSynchronizerTest();
assertNotNull("No source found", config.getSource(TEST_KEY));
sync.verifyStart(Methods.BEGIN_READ);
sync.verifyEnd(Methods.END_READ);
@@ -919,7 +919,7 @@ public class TestCombinedConfiguration
@Test
public void testGetNumberOfConfigurationsSynchronized()
{
- SynchronizerTestImpl sync = setUpSynchronizerTest();
+ final SynchronizerTestImpl sync = setUpSynchronizerTest();
assertEquals("Wrong number of configurations", 2,
config.getNumberOfConfigurations());
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
@@ -935,7 +935,7 @@ public class TestCombinedConfiguration
setUpSourceTest();
config.lock(LockMode.READ); // Causes the root node to be constructed
config.unlock(LockMode.READ);
- SynchronizerTestImpl sync = new SynchronizerTestImpl();
+ final SynchronizerTestImpl sync = new SynchronizerTestImpl();
config.setSynchronizer(sync);
config.clone();
// clone() of base class is wrapped by another read lock
@@ -950,10 +950,10 @@ public class TestCombinedConfiguration
@Test
public void testLockHandlingWithExceptionWhenConstructingRootNode()
{
- SynchronizerTestImpl sync = setUpSynchronizerTest();
+ final SynchronizerTestImpl sync = setUpSynchronizerTest();
final RuntimeException testEx =
new ConfigurationRuntimeException("Test exception");
- BaseHierarchicalConfiguration childEx =
+ final BaseHierarchicalConfiguration childEx =
new BaseHierarchicalConfiguration()
{
@Override
@@ -967,7 +967,7 @@ public class TestCombinedConfiguration
config.lock(LockMode.READ);
fail("Exception not detected!");
}
- catch (Exception ex)
+ catch (final Exception ex)
{
assertEquals("Unexpected exception", testEx, ex);
}
@@ -987,11 +987,11 @@ public class TestCombinedConfiguration
{
// populate the test combined configuration
setUpSourceTest();
- XMLConfiguration xmlConf = new XMLConfiguration();
+ final XMLConfiguration xmlConf = new XMLConfiguration();
new FileHandler(xmlConf).load(ConfigurationAssert
.getTestFile("test.xml"));
config.addConfiguration(xmlConf);
- PropertiesConfiguration propConf = new PropertiesConfiguration();
+ final PropertiesConfiguration propConf = new PropertiesConfiguration();
new FileHandler(propConf).load(ConfigurationAssert
.getTestFile("test.properties"));
for (int i = 0; i < 8; i++)
@@ -1001,9 +1001,9 @@ public class TestCombinedConfiguration
config.getConfiguration(0).addProperty(KEY_CONCURRENT, TEST_NAME);
// Set a single synchronizer for all involved configurations
- Synchronizer sync = new ReadWriteSynchronizer();
+ final Synchronizer sync = new ReadWriteSynchronizer();
config.setSynchronizer(sync);
- for (Configuration c : config.getConfigurations())
+ for (final Configuration c : config.getConfigurations())
{
c.setSynchronizer(sync);
}
@@ -1012,16 +1012,16 @@ public class TestCombinedConfiguration
final int numberOfReaders = 3;
final int readCount = 5000;
final int writeCount = 3000;
- CountDownLatch latch = new CountDownLatch(1);
- AtomicInteger errorCount = new AtomicInteger();
- Collection<Thread> threads = new ArrayList<>(numberOfReaders + 1);
- Thread writeThread =
+ final CountDownLatch latch = new CountDownLatch(1);
+ final AtomicInteger errorCount = new AtomicInteger();
+ final Collection<Thread> threads = new ArrayList<>(numberOfReaders + 1);
+ final Thread writeThread =
new WriteThread(config, latch, errorCount, writeCount);
writeThread.start();
threads.add(writeThread);
for (int i = 0; i < numberOfReaders; i++)
{
- Thread readThread =
+ final Thread readThread =
new ReadThread(config, latch, errorCount, readCount);
readThread.start();
threads.add(readThread);
@@ -1029,7 +1029,7 @@ public class TestCombinedConfiguration
// perform test
latch.countDown();
- for (Thread t : threads)
+ for (final Thread t : threads)
{
t.join();
}
@@ -1044,7 +1044,7 @@ public class TestCombinedConfiguration
*/
private AbstractConfiguration setUpSubConfigTest()
{
- AbstractConfiguration srcConfig = setUpTestConfiguration();
+ final AbstractConfiguration srcConfig = setUpTestConfiguration();
config.addConfiguration(srcConfig, "source", SUB_KEY);
config.addConfiguration(setUpTestConfiguration());
config.addConfiguration(setUpTestConfiguration(), "otherTest",
@@ -1058,8 +1058,8 @@ public class TestCombinedConfiguration
@Test
public void testSubConfigurationWithUpdates()
{
- AbstractConfiguration srcConfig = setUpSubConfigTest();
- HierarchicalConfiguration<ImmutableNode> sub =
+ final AbstractConfiguration srcConfig = setUpSubConfigTest();
+ final HierarchicalConfiguration<ImmutableNode> sub =
config.configurationAt(SUB_KEY, true);
assertTrue("Wrong value before update", sub.getBoolean(TEST_KEY));
srcConfig.setProperty(TEST_KEY, Boolean.FALSE);
@@ -1072,10 +1072,10 @@ public class TestCombinedConfiguration
* Checks the configurationsAt() method.
* @param withUpdates flag whether updates are supported
*/
- private void checkConfigurationsAt(boolean withUpdates)
+ private void checkConfigurationsAt(final boolean withUpdates)
{
setUpSubConfigTest();
- List<HierarchicalConfiguration<ImmutableNode>> subs =
+ final List<HierarchicalConfiguration<ImmutableNode>> subs =
config.configurationsAt(SUB_KEY, withUpdates);
assertEquals("Wrong number of sub configurations", 1, subs.size());
assertTrue("Wrong value in sub configuration",
@@ -1108,7 +1108,7 @@ public class TestCombinedConfiguration
*/
private static AbstractConfiguration setUpTestConfiguration()
{
- BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration config = new BaseHierarchicalConfiguration();
config.addProperty(TEST_KEY, Boolean.TRUE);
config.addProperty("test.comment", "This is a test");
return config;
@@ -1125,7 +1125,7 @@ public class TestCombinedConfiguration
int otherEvents;
@Override
- public void onEvent(ConfigurationEvent event)
+ public void onEvent(final ConfigurationEvent event)
{
if (event.getEventType() == CombinedConfiguration.COMBINED_INVALIDATE)
{
@@ -1143,7 +1143,7 @@ public class TestCombinedConfiguration
* @param expectedInvalidate the expected number of invalidate events
* @param expectedOthers the expected number of other events
*/
- public void checkEvent(int expectedInvalidate, int expectedOthers)
+ public void checkEvent(final int expectedInvalidate, final int expectedOthers)
{
assertEquals("Wrong number of invalidate events",
expectedInvalidate, invalidateEvents);
@@ -1179,8 +1179,8 @@ public class TestCombinedConfiguration
* @param errCnt the counter for read errors
* @param readCount the number of reads to be performed
*/
- public ReadThread(Configuration readConfig, CountDownLatch latch,
- AtomicInteger errCnt, int readCount)
+ public ReadThread(final Configuration readConfig, final CountDownLatch latch,
+ final AtomicInteger errCnt, final int readCount)
{
config = readConfig;
startLatch = latch;
@@ -1202,7 +1202,7 @@ public class TestCombinedConfiguration
readConfiguration();
}
}
- catch (Exception e)
+ catch (final Exception e)
{
errorCount.incrementAndGet();
}
@@ -1214,7 +1214,7 @@ public class TestCombinedConfiguration
*/
private void readConfiguration()
{
- List<Object> values = config.getList(KEY_CONCURRENT);
+ final List<Object> values = config.getList(KEY_CONCURRENT);
if (values.size() < 1 || values.size() > 2)
{
errorCount.incrementAndGet();
@@ -1222,7 +1222,7 @@ public class TestCombinedConfiguration
else
{
boolean ok = true;
- for (Object value : values)
+ for (final Object value : values)
{
if (!TEST_NAME.equals(value))
{
@@ -1270,8 +1270,8 @@ public class TestCombinedConfiguration
* @param errCnt a counter for errors
* @param writeCount the number of writes to be performed
*/
- public WriteThread(CombinedConfiguration cc, CountDownLatch latch,
- AtomicInteger errCnt, int writeCount)
+ public WriteThread(final CombinedConfiguration cc, final CountDownLatch latch,
+ final AtomicInteger errCnt, final int writeCount)
{
testConfigs = cc.getConfigurations();
startLatch = latch;
@@ -1290,7 +1290,7 @@ public class TestCombinedConfiguration
updateConfigurations();
}
}
- catch (InterruptedException e)
+ catch (final InterruptedException e)
{
errorCount.incrementAndGet();
}
@@ -1301,7 +1301,7 @@ public class TestCombinedConfiguration
*/
private void updateConfigurations()
{
- int newIdx = (currentChildConfigIdx + 1) % testConfigs.size();
+ final int newIdx = (currentChildConfigIdx + 1) % testConfigs.size();
testConfigs.get(newIdx).addProperty(KEY_CONCURRENT, TEST_NAME);
testConfigs.get(currentChildConfigIdx)
.clearProperty(KEY_CONCURRENT);
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCompositeConfiguration.java Thu Sep 27 22:24:23 2018
@@ -72,19 +72,19 @@ public class TestCompositeConfiguration
public void setUp() throws Exception
{
cc = new CompositeConfiguration();
- ListDelimiterHandler listHandler = new LegacyListDelimiterHandler(',');
+ final ListDelimiterHandler listHandler = new LegacyListDelimiterHandler(',');
conf1 = new PropertiesConfiguration();
conf1.setListDelimiterHandler(listHandler);
- FileHandler handler1 = new FileHandler(conf1);
+ final FileHandler handler1 = new FileHandler(conf1);
handler1.setFileName(testProperties);
handler1.load();
conf2 = new PropertiesConfiguration();
conf2.setListDelimiterHandler(listHandler);
- FileHandler handler2 = new FileHandler(conf2);
+ final FileHandler handler2 = new FileHandler(conf2);
handler2.setFileName(testProperties2);
handler2.load();
xmlConf = new XMLConfiguration();
- FileHandler handler3 = new FileHandler(xmlConf);
+ final FileHandler handler3 = new FileHandler(xmlConf);
handler3.load(new File(testPropertiesXML));
cc.setThrowExceptionOnMissing(true);
@@ -131,7 +131,7 @@ public class TestCompositeConfiguration
{
cc.addConfiguration(conf1);
cc.addConfiguration(conf2);
- List<Object> l = cc.getList("packages");
+ final List<Object> l = cc.getList("packages");
assertTrue(l.contains("packagea"));
}
@@ -160,7 +160,7 @@ public class TestCompositeConfiguration
cc.clear();
assertEquals(1, cc.getNumberOfConfigurations());
- Configuration internal = cc.getConfiguration(0);
+ final Configuration internal = cc.getConfiguration(0);
cc.removeConfiguration(internal);
assertEquals(1, cc.getNumberOfConfigurations());
@@ -176,7 +176,7 @@ public class TestCompositeConfiguration
assertNull(cc.getString("bogus.property"));
fail("Should have thrown a NoSuchElementException");
}
- catch (NoSuchElementException nsee)
+ catch (final NoSuchElementException nsee)
{
assertTrue(nsee.getMessage().contains("bogus.property"));
}
@@ -310,7 +310,7 @@ public class TestCompositeConfiguration
cc.addConfiguration(config);
cc.addConfiguration(ConfigurationConverter.getConfiguration(System.getProperties()));
- Configuration subset = cc.subset("subset");
+ final Configuration subset = cc.subset("subset");
assertEquals(System.getProperty("java.io.tmpdir") + "/file.tmp", subset.getString("tempfile"));
}
@@ -327,7 +327,7 @@ public class TestCompositeConfiguration
// we should get 3 packages here
assertEquals(3, packages.size());
- List<Object> defaultList = new ArrayList<>();
+ final List<Object> defaultList = new ArrayList<>();
defaultList.add("1");
defaultList.add("2");
@@ -358,11 +358,11 @@ public class TestCompositeConfiguration
@Test
public void testGetList()
{
- Configuration conf1 = new BaseConfiguration();
+ final Configuration conf1 = new BaseConfiguration();
conf1.addProperty("array", "value1");
conf1.addProperty("array", "value2");
- Configuration conf2 = new BaseConfiguration();
+ final Configuration conf2 = new BaseConfiguration();
conf2.addProperty("array", "value3");
conf2.addProperty("array", "value4");
@@ -395,13 +395,13 @@ public class TestCompositeConfiguration
public void testGetKeysPreservesOrder() throws Exception
{
cc.addConfiguration(conf1);
- List<String> orderedList = new ArrayList<>();
- for (Iterator<String> keys = conf1.getKeys(); keys.hasNext();)
+ final List<String> orderedList = new ArrayList<>();
+ for (final Iterator<String> keys = conf1.getKeys(); keys.hasNext();)
{
orderedList.add(keys.next());
}
- List<String> iteratedList = new ArrayList<>();
- for (Iterator<String> keys = cc.getKeys(); keys.hasNext();)
+ final List<String> iteratedList = new ArrayList<>();
+ for (final Iterator<String> keys = cc.getKeys(); keys.hasNext();)
{
iteratedList.add(keys.next());
}
@@ -419,13 +419,13 @@ public class TestCompositeConfiguration
public void testGetKeys2PreservesOrder() throws Exception
{
cc.addConfiguration(conf1);
- List<String> orderedList = new ArrayList<>();
- for (Iterator<String> keys = conf1.getKeys("test"); keys.hasNext();)
+ final List<String> orderedList = new ArrayList<>();
+ for (final Iterator<String> keys = conf1.getKeys("test"); keys.hasNext();)
{
orderedList.add(keys.next());
}
- List<String> iteratedList = new ArrayList<>();
- for (Iterator<String> keys = cc.getKeys("test"); keys.hasNext();)
+ final List<String> iteratedList = new ArrayList<>();
+ for (final Iterator<String> keys = cc.getKeys("test"); keys.hasNext();)
{
iteratedList.add(keys.next());
}
@@ -439,10 +439,10 @@ public class TestCompositeConfiguration
@Test
public void testGetStringWithDefaults()
{
- BaseConfiguration defaults = new BaseConfiguration();
+ final BaseConfiguration defaults = new BaseConfiguration();
defaults.addProperty("default", "default string");
- CompositeConfiguration c = new CompositeConfiguration(defaults);
+ final CompositeConfiguration c = new CompositeConfiguration(defaults);
c.setThrowExceptionOnMissing(cc.isThrowExceptionOnMissing());
c.addProperty("string", "test string");
@@ -452,11 +452,11 @@ public class TestCompositeConfiguration
c.getString("XXX");
fail("Should throw NoSuchElementException exception");
}
- catch (NoSuchElementException e)
+ catch (final NoSuchElementException e)
{
//ok
}
- catch (Exception e)
+ catch (final Exception e)
{
fail("Should throw NoSuchElementException exception, not " + e);
}
@@ -471,20 +471,20 @@ public class TestCompositeConfiguration
@Test
public void testCheckingInMemoryConfiguration() throws Exception
{
- String TEST_KEY = "testKey";
- Configuration defaults = new PropertiesConfiguration();
+ final String TEST_KEY = "testKey";
+ final Configuration defaults = new PropertiesConfiguration();
defaults.setProperty(TEST_KEY, "testValue");
- Configuration testConfiguration = new CompositeConfiguration(defaults);
+ final Configuration testConfiguration = new CompositeConfiguration(defaults);
assertTrue(testConfiguration.containsKey(TEST_KEY));
assertFalse(testConfiguration.isEmpty());
boolean foundTestKey = false;
- Iterator<String> i = testConfiguration.getKeys();
+ final Iterator<String> i = testConfiguration.getKeys();
//assertTrue(i instanceof IteratorChain);
//IteratorChain ic = (IteratorChain)i;
//assertEquals(2,i.size());
for (; i.hasNext();)
{
- String key = i.next();
+ final String key = i.next();
if (key.equals(TEST_KEY))
{
foundTestKey = true;
@@ -498,13 +498,13 @@ public class TestCompositeConfiguration
@Test
public void testStringArrayInterpolation()
{
- CompositeConfiguration config = new CompositeConfiguration();
+ final CompositeConfiguration config = new CompositeConfiguration();
config.addProperty("base", "foo");
config.addProperty("list", "${base}.bar1");
config.addProperty("list", "${base}.bar2");
config.addProperty("list", "${base}.bar3");
- String[] array = config.getStringArray("list");
+ final String[] array = config.getStringArray("list");
assertEquals("size", 3, array.length);
assertEquals("1st element", "foo.bar1", array[0]);
assertEquals("2nd element", "foo.bar2", array[1]);
@@ -517,14 +517,14 @@ public class TestCompositeConfiguration
@Test
public void testListInterpolation()
{
- PropertiesConfiguration c1 = new PropertiesConfiguration();
+ final PropertiesConfiguration c1 = new PropertiesConfiguration();
c1.addProperty("c1.value", "test1");
c1.addProperty("c1.value", "${c2.value}");
cc.addConfiguration(c1);
- PropertiesConfiguration c2 = new PropertiesConfiguration();
+ final PropertiesConfiguration c2 = new PropertiesConfiguration();
c2.addProperty("c2.value", "test2");
cc.addConfiguration(c2);
- List<Object> lst = cc.getList("c1.value");
+ final List<Object> lst = cc.getList("c1.value");
assertEquals("Wrong list size", 2, lst.size());
assertEquals("Wrong first element", "test1", lst.get(0));
assertEquals("Wrong second element", "test2", lst.get(1));
@@ -533,12 +533,12 @@ public class TestCompositeConfiguration
@Test
public void testInstanciateWithCollection()
{
- Collection<Configuration> configs = new ArrayList<>();
+ final Collection<Configuration> configs = new ArrayList<>();
configs.add(xmlConf);
configs.add(conf1);
configs.add(conf2);
- CompositeConfiguration config = new CompositeConfiguration(configs);
+ final CompositeConfiguration config = new CompositeConfiguration(configs);
assertEquals("Number of configurations", 4, config.getNumberOfConfigurations());
assertTrue("The in memory configuration is not empty", config.getInMemoryConfiguration().isEmpty());
}
@@ -546,11 +546,11 @@ public class TestCompositeConfiguration
@Test
public void testClone()
{
- CompositeConfiguration cc2 = (CompositeConfiguration) cc.clone();
+ final CompositeConfiguration cc2 = (CompositeConfiguration) cc.clone();
assertEquals("Wrong number of contained configurations", cc
.getNumberOfConfigurations(), cc2.getNumberOfConfigurations());
- StrictConfigurationComparator comp = new StrictConfigurationComparator();
+ final StrictConfigurationComparator comp = new StrictConfigurationComparator();
for (int i = 0; i < cc.getNumberOfConfigurations(); i++)
{
assertEquals("Wrong configuration class at " + i, cc
@@ -583,7 +583,7 @@ public class TestCompositeConfiguration
public void testCloneEventListener()
{
cc.addEventListener(ConfigurationEvent.ANY, new EventListenerTestImpl(null));
- CompositeConfiguration cc2 = (CompositeConfiguration) cc.clone();
+ final CompositeConfiguration cc2 = (CompositeConfiguration) cc.clone();
assertTrue("Listeners have been cloned", cc2
.getEventListeners(ConfigurationEvent.ANY).isEmpty());
}
@@ -594,7 +594,7 @@ public class TestCompositeConfiguration
@Test
public void testCloneInterpolation()
{
- CompositeConfiguration cc2 = (CompositeConfiguration) cc.clone();
+ final CompositeConfiguration cc2 = (CompositeConfiguration) cc.clone();
assertNotSame("Interpolator was not cloned", cc.getInterpolator(),
cc2.getInterpolator());
}
@@ -605,7 +605,7 @@ public class TestCompositeConfiguration
@Test
public void testEventAddProperty()
{
- EventListenerTestImpl listener = new EventListenerTestImpl(cc);
+ final EventListenerTestImpl listener = new EventListenerTestImpl(cc);
cc.addEventListener(ConfigurationEvent.ANY, listener);
cc.addProperty("test", "value");
listener.checkEvent(ConfigurationEvent.ADD_PROPERTY, "test", "value", true);
@@ -619,7 +619,7 @@ public class TestCompositeConfiguration
@Test
public void testEventSetProperty()
{
- EventListenerTestImpl listener = new EventListenerTestImpl(cc);
+ final EventListenerTestImpl listener = new EventListenerTestImpl(cc);
cc.addEventListener(ConfigurationEvent.ANY, listener);
cc.setProperty("test", "value");
listener.checkEvent(ConfigurationEvent.SET_PROPERTY, "test", "value", true);
@@ -634,10 +634,10 @@ public class TestCompositeConfiguration
public void testEventClearProperty()
{
cc.addConfiguration(conf1);
- String key = "configuration.loaded";
+ final String key = "configuration.loaded";
assertTrue("Wrong value for property", cc
.getBoolean(key));
- EventListenerTestImpl listener = new EventListenerTestImpl(cc);
+ final EventListenerTestImpl listener = new EventListenerTestImpl(cc);
cc.addEventListener(ConfigurationEvent.ANY, listener);
cc.clearProperty(key);
assertFalse("Key still present", cc.containsKey(key));
@@ -681,9 +681,9 @@ public class TestCompositeConfiguration
assertEquals("Wrong value of property", "a,b,c", cc
.getString("test.property"));
- AbstractConfiguration config =
+ final AbstractConfiguration config =
(AbstractConfiguration) cc.getInMemoryConfiguration();
- DefaultListDelimiterHandler listHandler =
+ final DefaultListDelimiterHandler listHandler =
(DefaultListDelimiterHandler) config.getListDelimiterHandler();
assertEquals("Wrong list delimiter", '/', listHandler.getDelimiter());
}
@@ -762,7 +762,7 @@ public class TestCompositeConfiguration
*/
private void prepareInterpolationTest()
{
- PropertiesConfiguration p = new PropertiesConfiguration();
+ final PropertiesConfiguration p = new PropertiesConfiguration();
p.addProperty("foo", "initial");
p.addProperty("bar", "${foo}");
p.addProperty("prefix.foo", "override");
@@ -781,7 +781,7 @@ public class TestCompositeConfiguration
public void testGetListWithInterpolation()
{
prepareInterpolationTest();
- List<Object> lst = cc.getList("bar");
+ final List<Object> lst = cc.getList("bar");
assertEquals("Wrong number of values", 1, lst.size());
assertEquals("Wrong value in list", "override", lst.get(0));
}
@@ -793,7 +793,7 @@ public class TestCompositeConfiguration
public void testGetStringArrayWithInterpolation()
{
prepareInterpolationTest();
- String[] values = cc.getStringArray("bar");
+ final String[] values = cc.getStringArray("bar");
assertEquals("Wrong number of values", 1, values.length);
assertEquals("Wrong value in array", "override", values[0]);
}
@@ -805,10 +805,10 @@ public class TestCompositeConfiguration
@Test
public void testInterpolationInMultipleConfigs()
{
- Configuration c1 = new PropertiesConfiguration();
+ final Configuration c1 = new PropertiesConfiguration();
c1.addProperty("property.one", "one");
c1.addProperty("property.two", "two");
- Configuration c2 = new PropertiesConfiguration();
+ final Configuration c2 = new PropertiesConfiguration();
c2.addProperty("property.one.ref", "${property.one}");
cc.addConfiguration(c1);
cc.addConfiguration(c2);
@@ -823,8 +823,8 @@ public class TestCompositeConfiguration
@Test
public void testInterpolationArrayReference()
{
- Configuration props = new PropertiesConfiguration();
- String[] values = { "a", "property", "with", "multiple", "values" };
+ final Configuration props = new PropertiesConfiguration();
+ final String[] values = { "a", "property", "with", "multiple", "values" };
props.addProperty("keyMultiValues", values);
props.addProperty("keyReference", "${keyMultiValues}");
cc.addConfiguration(props);
@@ -840,7 +840,7 @@ public class TestCompositeConfiguration
@Test
public void testSetListDelimiterInMemoryConfigNonBaseConfig()
{
- Configuration inMemoryConfig = EasyMock.createMock(Configuration.class);
+ final Configuration inMemoryConfig = EasyMock.createMock(Configuration.class);
EasyMock.replay(inMemoryConfig);
cc = new CompositeConfiguration(inMemoryConfig);
cc.setListDelimiterHandler(new DefaultListDelimiterHandler(';'));
@@ -894,7 +894,7 @@ public class TestCompositeConfiguration
{
cc.addConfiguration(conf1);
cc.addConfiguration(conf2);
- SynchronizerTestImpl sync = new SynchronizerTestImpl();
+ final SynchronizerTestImpl sync = new SynchronizerTestImpl();
cc.setSynchronizer(sync);
return sync;
}
@@ -905,7 +905,7 @@ public class TestCompositeConfiguration
@Test
public void testAddConfigurationSynchronized()
{
- SynchronizerTestImpl sync = installSynchronizer();
+ final SynchronizerTestImpl sync = installSynchronizer();
cc.addConfiguration(xmlConf);
sync.verify(Methods.BEGIN_WRITE, Methods.END_WRITE);
}
@@ -916,7 +916,7 @@ public class TestCompositeConfiguration
@Test
public void testRemoveConfigurationSynchronized()
{
- SynchronizerTestImpl sync = installSynchronizer();
+ final SynchronizerTestImpl sync = installSynchronizer();
cc.removeConfiguration(conf1);
sync.verify(Methods.BEGIN_WRITE, Methods.END_WRITE);
}
@@ -927,7 +927,7 @@ public class TestCompositeConfiguration
@Test
public void testGetConfigurationSynchronized()
{
- SynchronizerTestImpl sync = installSynchronizer();
+ final SynchronizerTestImpl sync = installSynchronizer();
assertEquals("Wrong result", conf1, cc.getConfiguration(0));
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
}
@@ -938,7 +938,7 @@ public class TestCompositeConfiguration
@Test
public void testGetInMemoryConfigurationSynchronized()
{
- SynchronizerTestImpl sync = installSynchronizer();
+ final SynchronizerTestImpl sync = installSynchronizer();
cc.getInMemoryConfiguration();
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
}
@@ -950,7 +950,7 @@ public class TestCompositeConfiguration
@Test
public void testGetNumberOfConfigurationsSynchronized()
{
- SynchronizerTestImpl sync = installSynchronizer();
+ final SynchronizerTestImpl sync = installSynchronizer();
assertEquals("Wrong number of configurations", 3,
cc.getNumberOfConfigurations());
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCompositeConfigurationNonStringProperties.java Thu Sep 27 22:24:23 2018
@@ -34,9 +34,9 @@ public class TestCompositeConfigurationN
@Before
public void setUp() throws Exception
{
- CompositeConfiguration cc = new CompositeConfiguration();
- PropertiesConfiguration pc = new PropertiesConfiguration();
- FileHandler handler = new FileHandler(pc);
+ final CompositeConfiguration cc = new CompositeConfiguration();
+ final PropertiesConfiguration pc = new PropertiesConfiguration();
+ final FileHandler handler = new FileHandler(pc);
handler.setFileName(testProperties);
handler.load();
cc.addConfiguration(pc);
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationConverter.java Thu Sep 27 22:24:23 2018
@@ -41,17 +41,17 @@ public class TestConfigurationConverter
@Test
public void testPropertiesToConfiguration()
{
- Properties props = new Properties();
+ final Properties props = new Properties();
props.setProperty("string", "teststring");
props.setProperty("int", "123");
props.setProperty("list", "item 1, item 2");
- AbstractConfiguration config =
+ final AbstractConfiguration config =
(AbstractConfiguration) ConfigurationConverter.getConfiguration(props);
config.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
assertEquals("This returns 'teststring'", "teststring", config.getString("string"));
- List<Object> item1 = config.getList("list");
+ final List<Object> item1 = config.getList("list");
assertEquals("This returns 'item 1'", "item 1", item1.get(0));
assertEquals("This returns 123", 123, config.getInt("int"));
@@ -63,7 +63,7 @@ public class TestConfigurationConverter
*/
private static BaseConfiguration createTestConfiguration()
{
- BaseConfiguration config = new BaseConfiguration();
+ final BaseConfiguration config = new BaseConfiguration();
config.addProperty("string", "teststring");
config.addProperty("array", "item 1");
config.addProperty("array", "item 2");
@@ -80,8 +80,8 @@ public class TestConfigurationConverter
@Test
public void testConfigurationToPropertiesDefaultListHandling()
{
- BaseConfiguration config = createTestConfiguration();
- Properties props = ConfigurationConverter.getProperties(config);
+ final BaseConfiguration config = createTestConfiguration();
+ final Properties props = ConfigurationConverter.getProperties(config);
assertNotNull("null properties", props);
assertEquals("'string' property", "teststring", props.getProperty("string"));
@@ -97,9 +97,9 @@ public class TestConfigurationConverter
@Test
public void testConfigurationToPropertiesListDelimiterHandler()
{
- BaseConfiguration config = createTestConfiguration();
+ final BaseConfiguration config = createTestConfiguration();
config.setListDelimiterHandler(new DefaultListDelimiterHandler(';'));
- Properties props = ConfigurationConverter.getProperties(config);
+ final Properties props = ConfigurationConverter.getProperties(config);
assertEquals("'array' property", "item 1;item 2", props.getProperty("array"));
}
@@ -111,7 +111,7 @@ public class TestConfigurationConverter
@Test
public void testConfigurationToPropertiesNoAbstractConfiguration()
{
- Configuration src = EasyMock.createMock(Configuration.class);
+ final Configuration src = EasyMock.createMock(Configuration.class);
final BaseConfiguration config = createTestConfiguration();
EasyMock.expect(src.getKeys()).andReturn(config.getKeys());
src.getList(EasyMock.anyObject(String.class));
@@ -120,12 +120,12 @@ public class TestConfigurationConverter
@Override
public Object answer() throws Throwable
{
- String key = (String) EasyMock.getCurrentArguments()[0];
+ final String key = (String) EasyMock.getCurrentArguments()[0];
return config.getList(key);
}
}).anyTimes();
EasyMock.replay(src);
- Properties props = ConfigurationConverter.getProperties(src);
+ final Properties props = ConfigurationConverter.getProperties(src);
assertEquals("'array' property", "item 1,item 2",
props.getProperty("array"));
}
@@ -137,19 +137,19 @@ public class TestConfigurationConverter
@Test
public void testConfigurationToPropertiesScalarValue()
{
- BaseConfiguration config = new BaseConfiguration();
+ final BaseConfiguration config = new BaseConfiguration();
config.addProperty("scalar", new Integer(42));
- Properties props = ConfigurationConverter.getProperties(config);
+ final Properties props = ConfigurationConverter.getProperties(config);
assertEquals("Wrong value", "42", props.getProperty("scalar"));
}
@Test
public void testConfigurationToMap()
{
- Configuration config = new BaseConfiguration();
+ final Configuration config = new BaseConfiguration();
config.addProperty("string", "teststring");
- Map<Object, Object> map = ConfigurationConverter.getMap(config);
+ final Map<Object, Object> map = ConfigurationConverter.getMap(config);
assertNotNull("null map", map);
assertEquals("'string' property", "teststring", map.get("string"));
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationLookup.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationLookup.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationLookup.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationLookup.java Thu Sep 27 22:24:23 2018
@@ -52,9 +52,9 @@ public class TestConfigurationLookup
@Test
public void testLookupSuccess()
{
- Configuration conf = new BaseConfiguration();
+ final Configuration conf = new BaseConfiguration();
conf.addProperty(VAR, VALUE);
- ConfigurationLookup lookup = new ConfigurationLookup(conf);
+ final ConfigurationLookup lookup = new ConfigurationLookup(conf);
assertEquals("Wrong result", VALUE, lookup.lookup(VAR));
}
@@ -64,8 +64,8 @@ public class TestConfigurationLookup
@Test
public void testLookupNotFound()
{
- Configuration conf = new BaseConfiguration();
- ConfigurationLookup lookup = new ConfigurationLookup(conf);
+ final Configuration conf = new BaseConfiguration();
+ final ConfigurationLookup lookup = new ConfigurationLookup(conf);
assertNull("Got a value", lookup.lookup(VAR));
}
@@ -76,9 +76,9 @@ public class TestConfigurationLookup
@Test
public void testLookupNotFoundEx()
{
- BaseConfiguration conf = new BaseConfiguration();
+ final BaseConfiguration conf = new BaseConfiguration();
conf.setThrowExceptionOnMissing(true);
- ConfigurationLookup lookup = new ConfigurationLookup(conf);
+ final ConfigurationLookup lookup = new ConfigurationLookup(conf);
assertNull("Got a value", lookup.lookup(VAR));
}
@@ -89,15 +89,15 @@ public class TestConfigurationLookup
public void testLookupComplex()
{
final int count = 5;
- Configuration conf = new BaseConfiguration();
+ final Configuration conf = new BaseConfiguration();
for (int i = 0; i < count; i++)
{
conf.addProperty(VAR, String.valueOf(VALUE) + i);
}
- ConfigurationLookup lookup = new ConfigurationLookup(conf);
- Collection<?> col = (Collection<?>) lookup.lookup(VAR);
+ final ConfigurationLookup lookup = new ConfigurationLookup(conf);
+ final Collection<?> col = (Collection<?>) lookup.lookup(VAR);
assertEquals("Wrong number of elements", count, col.size());
- Iterator<?> it = col.iterator();
+ final Iterator<?> it = col.iterator();
for (int i = 0; i < count; i++)
{
assertEquals("Wrong element at " + i, String.valueOf(VALUE) + i,
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationMap.java Thu Sep 27 22:24:23 2018
@@ -58,7 +58,7 @@ public class TestConfigurationMap
@Before
public void setUp() throws Exception
{
- BaseConfiguration configuration = new BaseConfiguration();
+ final BaseConfiguration configuration = new BaseConfiguration();
for(int i = 0; i < properties.length ; i++) {
configuration.setProperty(properties[i], values[i]);
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationSet.java Thu Sep 27 22:24:23 2018
@@ -60,7 +60,7 @@ public class TestConfigurationSet {
@Before
public void setUp() throws Exception
{
- BaseConfiguration configuration = new BaseConfiguration();
+ final BaseConfiguration configuration = new BaseConfiguration();
for(int i = 0; i < properties.length ; i++) {
configuration.setProperty(properties[i], values[i]);
}
@@ -86,9 +86,9 @@ public class TestConfigurationSet {
*/
@Test
public void testIterator() {
- Iterator<Map.Entry<Object, Object>> iterator = set.iterator();
+ final Iterator<Map.Entry<Object, Object>> iterator = set.iterator();
while(iterator.hasNext()) {
- Map.Entry<Object, Object> entry = iterator.next();
+ final Map.Entry<Object, Object> entry = iterator.next();
boolean found = false;
for(int i = 0; i < properties.length; i++) {
if(entry.getKey().equals(properties[i])) {