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 [20/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/TestINIConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestINIConfiguration.java Thu Sep 27 22:24:23 2018
@@ -133,10 +133,10 @@ public class TestINIConfiguration
* @return the initialized configuration
* @throws ConfigurationException if an error occurs
*/
- private static INIConfiguration setUpConfig(String data)
+ private static INIConfiguration setUpConfig(final String data)
throws ConfigurationException
{
- INIConfiguration instance = new INIConfiguration();
+ final INIConfiguration instance = new INIConfiguration();
instance.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
load(instance, data);
return instance;
@@ -149,15 +149,15 @@ public class TestINIConfiguration
* @param data the data to be loaded
* @throws ConfigurationException if an error occurs
*/
- private static void load(INIConfiguration instance, String data)
+ private static void load(final INIConfiguration instance, final String data)
throws ConfigurationException
{
- StringReader reader = new StringReader(data);
+ final StringReader reader = new StringReader(data);
try
{
instance.read(reader);
}
- catch (IOException e)
+ catch (final IOException e)
{
throw new ConfigurationException(e);
}
@@ -172,15 +172,15 @@ public class TestINIConfiguration
* @return the content of this configuration saved to a string
* @throws ConfigurationException if an error occurs
*/
- private static String saveToString(INIConfiguration config)
+ private static String saveToString(final INIConfiguration config)
throws ConfigurationException
{
- StringWriter writer = new StringWriter();
+ final StringWriter writer = new StringWriter();
try
{
config.write(writer);
}
- catch (IOException e)
+ catch (final IOException e)
{
throw new ConfigurationException(e);
}
@@ -194,10 +194,10 @@ public class TestINIConfiguration
* @return the newly created file
* @throws IOException if an error occurs
*/
- private File writeTestFile(String content) throws IOException
+ private File writeTestFile(final String content) throws IOException
{
- File file = folder.newFile();
- PrintWriter out = new PrintWriter(new FileWriter(file));
+ final File file = folder.newFile();
+ final PrintWriter out = new PrintWriter(new FileWriter(file));
try
{
out.println(content);
@@ -215,8 +215,8 @@ public class TestINIConfiguration
@Test
public void testSave() throws Exception
{
- Writer writer = new StringWriter();
- INIConfiguration instance = new INIConfiguration();
+ final Writer writer = new StringWriter();
+ final INIConfiguration instance = new INIConfiguration();
instance.addProperty("section1.var1", "foo");
instance.addProperty("section1.var2", "451");
instance.addProperty("section2.var1", "123.45");
@@ -237,18 +237,18 @@ public class TestINIConfiguration
public void testSeparatorUsedInINIOutput() throws Exception
{
final String outputSeparator = ": ";
- String input = MessageFormat.format(INI_DATA4, "=").trim();
- String expectedOutput = MessageFormat.format(INI_DATA4, outputSeparator).trim();
+ final String input = MessageFormat.format(INI_DATA4, "=").trim();
+ final String expectedOutput = MessageFormat.format(INI_DATA4, outputSeparator).trim();
- INIConfiguration instance = new FileBasedConfigurationBuilder<>(
+ final INIConfiguration instance = new FileBasedConfigurationBuilder<>(
INIConfiguration.class)
.configure(new Parameters().ini().setSeparatorUsedInOutput(outputSeparator))
.getConfiguration();
load(instance, input);
- Writer writer = new StringWriter();
+ final Writer writer = new StringWriter();
instance.write(writer);
- String result = writer.toString().trim();
+ final String result = writer.toString().trim();
assertEquals("Wrong content of ini file", expectedOutput, result);
}
@@ -261,10 +261,10 @@ public class TestINIConfiguration
* @param content the content of the configuration
* @throws ConfigurationException if an error occurs
*/
- private void checkSave(String content) throws ConfigurationException
+ private void checkSave(final String content) throws ConfigurationException
{
- INIConfiguration config = setUpConfig(content);
- String sOutput = saveToString(config);
+ final INIConfiguration config = setUpConfig(content);
+ final String sOutput = saveToString(config);
assertEquals("Wrong content of ini file", content, sOutput);
}
@@ -294,15 +294,15 @@ public class TestINIConfiguration
public void testSaveWithDelimiterParsingDisabled()
throws ConfigurationException
{
- INIConfiguration config = new INIConfiguration();
- String data =
+ final INIConfiguration config = new INIConfiguration();
+ final String data =
INI_DATA.substring(0, INI_DATA.length() - LINE_SEPARATOR.length())
+ "nolist = 1,2, 3";
load(config, data);
assertEquals("Wrong property value", "1,2, 3",
config.getString("section3.nolist"));
- String content = saveToString(config);
- INIConfiguration config2 = new INIConfiguration();
+ final String content = saveToString(config);
+ final INIConfiguration config2 = new INIConfiguration();
load(config2, content);
assertEquals("Wrong property value after reload", "1,2, 3",
config2.getString("section3.nolist"));
@@ -334,13 +334,13 @@ public class TestINIConfiguration
public void testLoadFromBuilder() throws ConfigurationException,
IOException
{
- File file = writeTestFile(INI_DATA);
- FileBasedConfigurationBuilder<INIConfiguration> builder =
+ final File file = writeTestFile(INI_DATA);
+ final FileBasedConfigurationBuilder<INIConfiguration> builder =
new FileBasedConfigurationBuilder<>(
INIConfiguration.class);
builder.configure(new FileBasedBuilderParametersImpl()
.setFile(file));
- INIConfiguration config = builder.getConfiguration();
+ final INIConfiguration config = builder.getConfiguration();
checkContent(config);
}
@@ -350,7 +350,7 @@ public class TestINIConfiguration
*
* @param instance the configuration to check
*/
- private void checkContent(INIConfiguration instance)
+ private void checkContent(final INIConfiguration instance)
{
assertEquals("var1", "foo", instance.getString("section1.var1"));
assertEquals("var2", 451, instance.getInt("section1.var2"));
@@ -374,9 +374,9 @@ public class TestINIConfiguration
*
* @param data the data to load
*/
- private void checkLoad(String data) throws ConfigurationException
+ private void checkLoad(final String data) throws ConfigurationException
{
- INIConfiguration instance = setUpConfig(data);
+ final INIConfiguration instance = setUpConfig(data);
checkContent(instance);
}
@@ -387,7 +387,7 @@ public class TestINIConfiguration
@Test
public void testIsCommentLine()
{
- INIConfiguration instance = new INIConfiguration();
+ final INIConfiguration instance = new INIConfiguration();
assertTrue(instance.isCommentLine("#comment1"));
assertTrue(instance.isCommentLine(";comment1"));
assertFalse(instance.isCommentLine("nocomment=true"));
@@ -401,7 +401,7 @@ public class TestINIConfiguration
@Test
public void testIsSectionLine()
{
- INIConfiguration instance = new INIConfiguration();
+ final INIConfiguration instance = new INIConfiguration();
assertTrue(instance.isSectionLine("[section]"));
assertFalse(instance.isSectionLine("nosection=true"));
assertFalse(instance.isSectionLine(null));
@@ -414,27 +414,27 @@ public class TestINIConfiguration
@Test
public void testGetSections()
{
- INIConfiguration instance = new INIConfiguration();
+ final INIConfiguration instance = new INIConfiguration();
instance.addProperty("test1.foo", "bar");
instance.addProperty("test2.foo", "abc");
- Set<String> expResult = new HashSet<>();
+ final Set<String> expResult = new HashSet<>();
expResult.add("test1");
expResult.add("test2");
- Set<String> result = instance.getSections();
+ final Set<String> result = instance.getSections();
assertEquals(expResult, result);
}
@Test
public void testQuotedValue() throws Exception
{
- INIConfiguration config = setUpConfig(INI_DATA2);
+ final INIConfiguration config = setUpConfig(INI_DATA2);
assertEquals("value", "quoted value", config.getString("section4.var1"));
}
@Test
public void testQuotedValueWithQuotes() throws Exception
{
- INIConfiguration config = setUpConfig(INI_DATA2);
+ final INIConfiguration config = setUpConfig(INI_DATA2);
assertEquals("value", "quoted value\\nwith \"quotes\"", config
.getString("section4.var2"));
}
@@ -442,21 +442,21 @@ public class TestINIConfiguration
@Test
public void testValueWithComment() throws Exception
{
- INIConfiguration config = setUpConfig(INI_DATA2);
+ final INIConfiguration config = setUpConfig(INI_DATA2);
assertEquals("value", "123", config.getString("section4.var3"));
}
@Test
public void testQuotedValueWithComment() throws Exception
{
- INIConfiguration config = setUpConfig(INI_DATA2);
+ final INIConfiguration config = setUpConfig(INI_DATA2);
assertEquals("value", "1;2;3", config.getString("section4.var4"));
}
@Test
public void testQuotedValueWithSingleQuotes() throws Exception
{
- INIConfiguration config = setUpConfig(INI_DATA2);
+ final INIConfiguration config = setUpConfig(INI_DATA2);
assertEquals("value", "'quoted' \"value\"", config
.getString("section4.var5"));
}
@@ -464,13 +464,13 @@ public class TestINIConfiguration
@Test
public void testWriteValueWithCommentChar() throws Exception
{
- INIConfiguration config = new INIConfiguration();
+ final INIConfiguration config = new INIConfiguration();
config.setProperty("section.key1", "1;2;3");
- StringWriter writer = new StringWriter();
+ final StringWriter writer = new StringWriter();
config.write(writer);
- INIConfiguration config2 = new INIConfiguration();
+ final INIConfiguration config2 = new INIConfiguration();
config2.read(new StringReader(writer.toString()));
assertEquals("value", "1;2;3", config2.getString("section.key1"));
@@ -483,7 +483,7 @@ public class TestINIConfiguration
public void testQuotedValueWithWhitespace() throws Exception
{
final String content = "CmdPrompt = \" [test@cmd ~]$ \"";
- INIConfiguration config = setUpConfig(content);
+ final INIConfiguration config = setUpConfig(content);
assertEquals("Wrong propert value", " [test@cmd ~]$ ", config
.getString("CmdPrompt"));
}
@@ -495,7 +495,7 @@ public class TestINIConfiguration
public void testQuotedValueWithWhitespaceAndComment() throws Exception
{
final String content = "CmdPrompt = \" [test@cmd ~]$ \" ; a comment";
- INIConfiguration config = setUpConfig(content);
+ final INIConfiguration config = setUpConfig(content);
assertEquals("Wrong propert value", " [test@cmd ~]$ ", config
.getString("CmdPrompt"));
}
@@ -506,7 +506,7 @@ public class TestINIConfiguration
@Test
public void testQuotedValueEmpty() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA2);
+ final INIConfiguration config = setUpConfig(INI_DATA2);
assertEquals("Wrong value for empty property", "", config
.getString("section4.var6"));
}
@@ -519,7 +519,7 @@ public class TestINIConfiguration
{
final String data = INI_DATA2 + LINE_SEPARATOR + "noValue ="
+ LINE_SEPARATOR;
- INIConfiguration config = setUpConfig(data);
+ final INIConfiguration config = setUpConfig(data);
assertEquals("Wrong value of key", "", config
.getString("section4.noValue"));
}
@@ -532,7 +532,7 @@ public class TestINIConfiguration
{
final String data = INI_DATA2 + LINE_SEPARATOR + "= noKey"
+ LINE_SEPARATOR;
- INIConfiguration config = setUpConfig(data);
+ final INIConfiguration config = setUpConfig(data);
assertEquals("Cannot find property with no key", "noKey", config
.getString("section4. "));
}
@@ -543,7 +543,7 @@ public class TestINIConfiguration
@Test
public void testGlobalProperty() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
+ final INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
assertEquals("Wrong value of global property", "testGlobal", config
.getString("globalVar"));
}
@@ -555,8 +555,8 @@ public class TestINIConfiguration
@Test
public void testGlobalSectionConnected() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
- HierarchicalConfiguration<ImmutableNode> sub = config.getSection(null);
+ final INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
+ final HierarchicalConfiguration<ImmutableNode> sub = config.getSection(null);
config.setProperty("globalVar", "changed");
assertEquals("Wrong value in sub", "changed",
sub.getString("globalVar"));
@@ -569,11 +569,11 @@ public class TestINIConfiguration
* @param config the configuration to check
* @param expected an array with the expected sections
*/
- private void checkSectionNames(INIConfiguration config,
- String[] expected)
+ private void checkSectionNames(final INIConfiguration config,
+ final String[] expected)
{
- Set<String> sectionNames = config.getSections();
- Iterator<String> it = sectionNames.iterator();
+ final Set<String> sectionNames = config.getSections();
+ final Iterator<String> it = sectionNames.iterator();
for (int idx = 0; idx < expected.length; idx++)
{
assertEquals("Wrong section at " + idx, expected[idx], it.next());
@@ -588,10 +588,10 @@ public class TestINIConfiguration
* @param expected the expected section names
* @return the configuration instance
*/
- private INIConfiguration checkSectionNames(String data,
- String[] expected) throws ConfigurationException
+ private INIConfiguration checkSectionNames(final String data,
+ final String[] expected) throws ConfigurationException
{
- INIConfiguration config = setUpConfig(data);
+ final INIConfiguration config = setUpConfig(data);
checkSectionNames(config, expected);
return config;
}
@@ -638,7 +638,7 @@ public class TestINIConfiguration
public void testGetSectionsDottedVar() throws ConfigurationException
{
final String data = "dotted.var = 1" + LINE_SEPARATOR + INI_DATA_GLOBAL;
- INIConfiguration config = checkSectionNames(data,
+ final INIConfiguration config = checkSectionNames(data,
new String[] {
null, "section1", "section2", "section3"
});
@@ -652,7 +652,7 @@ public class TestINIConfiguration
@Test
public void testGetSectionsAdded() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA2);
+ final INIConfiguration config = setUpConfig(INI_DATA2);
config.addProperty("section5.test", Boolean.TRUE);
checkSectionNames(config, new String[]{
"section4", "section5"
@@ -665,8 +665,8 @@ public class TestINIConfiguration
@Test
public void testGetSectionExisting() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA);
- HierarchicalConfiguration<ImmutableNode> section =
+ final INIConfiguration config = setUpConfig(INI_DATA);
+ final HierarchicalConfiguration<ImmutableNode> section =
config.getSection("section1");
assertEquals("Wrong value of var1", "foo", section.getString("var1"));
assertEquals("Wrong value of var2", "451", section.getString("var2"));
@@ -679,8 +679,8 @@ public class TestINIConfiguration
@Test
public void testGetSectionConnected() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA);
- HierarchicalConfiguration<ImmutableNode> section =
+ final INIConfiguration config = setUpConfig(INI_DATA);
+ final HierarchicalConfiguration<ImmutableNode> section =
config.getSection("section1");
section.setProperty("var1", "foo2");
assertEquals("Not connected to parent", "foo2",
@@ -696,8 +696,8 @@ public class TestINIConfiguration
{
final String data = INI_DATA + "[section1]" + LINE_SEPARATOR
+ "var3 = merged" + LINE_SEPARATOR;
- INIConfiguration config = setUpConfig(data);
- HierarchicalConfiguration<ImmutableNode> section = config.getSection("section1");
+ final INIConfiguration config = setUpConfig(data);
+ final HierarchicalConfiguration<ImmutableNode> section = config.getSection("section1");
assertEquals("Wrong value of var1", "foo", section.getString("var1"));
assertEquals("Wrong value of var2", "451", section.getString("var2"));
assertEquals("Wrong value of var3", "merged", section.getString("var3"));
@@ -709,8 +709,8 @@ public class TestINIConfiguration
@Test
public void testGetSectionGlobal() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
- HierarchicalConfiguration<ImmutableNode> section = config.getSection(null);
+ final INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
+ final HierarchicalConfiguration<ImmutableNode> section = config.getSection(null);
assertEquals("Wrong value of global variable", "testGlobal", section
.getString("globalVar"));
}
@@ -722,10 +722,10 @@ public class TestINIConfiguration
public void testGetSectionGloabalMultiThreaded()
throws ConfigurationException, InterruptedException
{
- INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
+ final INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
config.setSynchronizer(new ReadWriteSynchronizer());
final int threadCount = 10;
- GlobalSectionTestThread[] threads = new GlobalSectionTestThread[threadCount];
+ final GlobalSectionTestThread[] threads = new GlobalSectionTestThread[threadCount];
for (int i = 0; i < threadCount; i++)
{
threads[i] = new GlobalSectionTestThread(config);
@@ -744,8 +744,8 @@ public class TestINIConfiguration
@Test
public void testGetSectionGlobalNonExisting() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA);
- HierarchicalConfiguration<ImmutableNode> section = config.getSection(null);
+ final INIConfiguration config = setUpConfig(INI_DATA);
+ final HierarchicalConfiguration<ImmutableNode> section = config.getSection(null);
assertTrue("Sub config not empty", section.isEmpty());
}
@@ -755,8 +755,8 @@ public class TestINIConfiguration
@Test
public void testGetSectionNonExisting() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA);
- HierarchicalConfiguration<ImmutableNode> section = config
+ final INIConfiguration config = setUpConfig(INI_DATA);
+ final HierarchicalConfiguration<ImmutableNode> section = config
.getSection("Non existing section");
assertTrue("Sub config not empty", section.isEmpty());
}
@@ -767,7 +767,7 @@ public class TestINIConfiguration
@Test
public void testLineContinuation() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA3);
+ final INIConfiguration config = setUpConfig(INI_DATA3);
assertEquals("Wrong value", "one" + LINE_SEPARATOR + "two"
+ LINE_SEPARATOR + "three", config
.getString("section5.multiLine"));
@@ -780,7 +780,7 @@ public class TestINIConfiguration
@Test
public void testLineContinuationNone() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA3);
+ final INIConfiguration config = setUpConfig(INI_DATA3);
assertEquals("Wrong value", "C:\\Temp\\", config
.getString("section5.singleLine"));
}
@@ -792,7 +792,7 @@ public class TestINIConfiguration
@Test
public void testLineContinuationQuoted() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA3);
+ final INIConfiguration config = setUpConfig(INI_DATA3);
assertEquals("Wrong value", "one" + LINE_SEPARATOR + " two "
+ LINE_SEPARATOR + "three", config
.getString("section5.multiQuoted"));
@@ -804,7 +804,7 @@ public class TestINIConfiguration
@Test
public void testLineContinuationComment() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA3);
+ final INIConfiguration config = setUpConfig(INI_DATA3);
assertEquals("Wrong value", "one" + LINE_SEPARATOR + "two", config
.getString("section5.multiComment"));
}
@@ -817,7 +817,7 @@ public class TestINIConfiguration
public void testLineContinuationQuotedComment()
throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA3);
+ final INIConfiguration config = setUpConfig(INI_DATA3);
assertEquals("Wrong value", " one " + LINE_SEPARATOR + "two", config
.getString("section5.multiQuotedComment"));
}
@@ -828,7 +828,7 @@ public class TestINIConfiguration
@Test
public void testLineContinuationEmptyLine() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA3);
+ final INIConfiguration config = setUpConfig(INI_DATA3);
assertEquals("Wrong value", LINE_SEPARATOR + "line 2", config
.getString("section5.noFirstLine"));
}
@@ -839,7 +839,7 @@ public class TestINIConfiguration
@Test
public void testLineContinuationAtEnd() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA3);
+ final INIConfiguration config = setUpConfig(INI_DATA3);
assertEquals("Wrong value", "one" + LINE_SEPARATOR, config
.getString("section5.continueNoLine"));
}
@@ -855,7 +855,7 @@ public class TestINIConfiguration
final String section = "Section..with..dots";
conf.addProperty(section + ".test1", "test1");
conf.addProperty(section + ".test2", "test2");
- StringWriter writer = new StringWriter();
+ final StringWriter writer = new StringWriter();
conf.write(writer);
conf = new INIConfiguration();
conf.read(new StringReader(writer.toString()));
@@ -871,12 +871,12 @@ public class TestINIConfiguration
@Test
public void testPropertyWithDelimiter() throws ConfigurationException
{
- String data = INI_DATA + "key.dot = dotValue";
- INIConfiguration conf = new INIConfiguration();
+ final String data = INI_DATA + "key.dot = dotValue";
+ final INIConfiguration conf = new INIConfiguration();
load(conf, data);
assertEquals("Wrong property value", "dotValue",
conf.getString("section3.key..dot"));
- String output = saveToString(conf);
+ final String output = saveToString(conf);
assertThat(output, containsString("key.dot = dotValue"));
}
@@ -895,7 +895,7 @@ public class TestINIConfiguration
+ LINE_SEPARATOR + "Class Path=" + path + " ;comment"
+ LINE_SEPARATOR + "Path=" + path
+ "\t; another comment";
- INIConfiguration config = setUpConfig(content);
+ final INIConfiguration config = setUpConfig(content);
assertEquals("Wrong class path", path,
config.getString("Environment.Class Path"));
assertEquals("Wrong path", path, config.getString("Environment.Path"));
@@ -908,7 +908,7 @@ public class TestINIConfiguration
@Test
public void testSeparators() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA_SEPARATORS);
+ final INIConfiguration config = setUpConfig(INI_DATA_SEPARATORS);
for (int i = 1; i <= 4; i++)
{
assertEquals("Wrong value", "value" + i,
@@ -922,7 +922,7 @@ public class TestINIConfiguration
@Test
public void testMultipleSeparators() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA_SEPARATORS);
+ final INIConfiguration config = setUpConfig(INI_DATA_SEPARATORS);
assertEquals("Wrong value for var5", "value=5",
config.getString("section.var5"));
assertEquals("Wrong value for var6", "6=value",
@@ -936,7 +936,7 @@ public class TestINIConfiguration
@Test
public void testMultipleSeparatorsQuoted() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA_SEPARATORS);
+ final INIConfiguration config = setUpConfig(INI_DATA_SEPARATORS);
assertEquals("Wrong value for var7", "value7",
config.getString("section.var:7"));
assertEquals("Wrong value for var8", "value8",
@@ -951,16 +951,16 @@ public class TestINIConfiguration
public void testSaveClearedSection() throws ConfigurationException, IOException
{
final String data = "[section]\ntest = failed\n";
- INIConfiguration config = setUpConfig(data);
+ final INIConfiguration config = setUpConfig(data);
SubnodeConfiguration sub = config.getSection("section");
assertFalse("No content", sub.isEmpty());
sub.clear();
sub.close();
sub = config.getSection("section");
sub.setProperty("test", "success");
- StringWriter writer = new StringWriter();
+ final StringWriter writer = new StringWriter();
config.write(writer);
- HierarchicalConfiguration<?> config2 = setUpConfig(writer.toString());
+ final HierarchicalConfiguration<?> config2 = setUpConfig(writer.toString());
assertEquals("Wrong value", "success",
config2.getString("section.test"));
}
@@ -973,16 +973,16 @@ public class TestINIConfiguration
{
final String data =
"[section]\nvar1 = sec1\n\n" + "[section]\nvar2 = sec2\n";
- INIConfiguration config = setUpConfig(data);
+ final INIConfiguration config = setUpConfig(data);
assertEquals("Wrong value 1", "sec1", config.getString("section.var1"));
assertEquals("Wrong value 2", "sec2", config.getString("section.var2"));
- HierarchicalConfiguration<ImmutableNode> sub = config.getSection("section");
+ final HierarchicalConfiguration<ImmutableNode> sub = config.getSection("section");
assertEquals("Wrong sub value 1", "sec1", sub.getString("var1"));
assertEquals("Wrong sub value 2", "sec2", sub.getString("var2"));
- StringWriter writer = new StringWriter();
+ final StringWriter writer = new StringWriter();
config.write(writer);
- String content = writer.toString();
- int pos = content.indexOf("[section]");
+ final String content = writer.toString();
+ final int pos = content.indexOf("[section]");
assertTrue("Section not found: " + content, pos >= 0);
assertTrue("Section found multiple times: " + content,
content.indexOf("[section]", pos + 1) < 0);
@@ -996,14 +996,14 @@ public class TestINIConfiguration
public void testGetSectionNonExistingManipulate()
throws ConfigurationException, IOException
{
- INIConfiguration config = setUpConfig(INI_DATA);
+ final INIConfiguration config = setUpConfig(INI_DATA);
HierarchicalConfiguration<ImmutableNode> section = config.getSection("newSection");
section.addProperty("test", "success");
assertEquals("Main config not updated", "success",
config.getString("newSection.test"));
- StringWriter writer = new StringWriter();
+ final StringWriter writer = new StringWriter();
config.write(writer);
- INIConfiguration config2 = setUpConfig(writer.toString());
+ final INIConfiguration config2 = setUpConfig(writer.toString());
section = config2.getSection("newSection");
assertEquals("Wrong value", "success", section.getString("test"));
}
@@ -1014,12 +1014,12 @@ public class TestINIConfiguration
@Test
public void testGetSectionDuplicate()
{
- INIConfiguration config =
+ final INIConfiguration config =
new INIConfiguration();
config.addProperty("section.var1", "value1");
config.addProperty("section(-1).var2", "value2");
- HierarchicalConfiguration<ImmutableNode> section = config.getSection("section");
- Iterator<String> keys = section.getKeys();
+ final HierarchicalConfiguration<ImmutableNode> section = config.getSection("section");
+ final Iterator<String> keys = section.getKeys();
assertEquals("Wrong key", "var1", keys.next());
assertFalse("Too many keys", keys.hasNext());
}
@@ -1030,10 +1030,10 @@ public class TestINIConfiguration
@Test
public void testValueWithDelimiters() throws ConfigurationException
{
- INIConfiguration config =
+ final INIConfiguration config =
setUpConfig("[test]" + LINE_SEPARATOR + "list=1,2,3"
+ LINE_SEPARATOR);
- List<Object> list = config.getList("test.list");
+ final List<Object> list = config.getList("test.list");
assertEquals("Wrong number of elements", 3, list.size());
assertEquals("Wrong element at 1", "1", list.get(0));
assertEquals("Wrong element at 2", "2", list.get(1));
@@ -1046,7 +1046,7 @@ public class TestINIConfiguration
@Test
public void testListParsingDisabled() throws ConfigurationException
{
- INIConfiguration config =
+ final INIConfiguration config =
new INIConfiguration();
load(config, "[test]" + LINE_SEPARATOR + "nolist=1,2,3");
assertEquals("Wrong value", "1,2,3", config.getString("test.nolist"));
@@ -1059,8 +1059,8 @@ public class TestINIConfiguration
@Test
public void testGetSectionsSynchronized() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA);
- SynchronizerTestImpl sync = new SynchronizerTestImpl();
+ final INIConfiguration config = setUpConfig(INI_DATA);
+ final SynchronizerTestImpl sync = new SynchronizerTestImpl();
config.setSynchronizer(sync);
assertFalse("No sections", config.getSections().isEmpty());
sync.verify(Methods.BEGIN_READ, Methods.END_READ);
@@ -1072,12 +1072,12 @@ public class TestINIConfiguration
@Test
public void testListDelimiterHandling() throws ConfigurationException
{
- INIConfiguration config = new INIConfiguration();
+ final INIConfiguration config = new INIConfiguration();
config.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
config.addProperty("list", "a,b,c");
config.addProperty("listesc", "3\\,1415");
- String output = saveToString(config);
- INIConfiguration config2 = setUpConfig(output);
+ final String output = saveToString(config);
+ final INIConfiguration config2 = setUpConfig(output);
assertEquals("Wrong list size", 3, config2.getList("list").size());
assertEquals("Wrong list element", "b", config2.getList("list").get(1));
assertEquals("Wrong escaped list element", "3,1415",
@@ -1091,12 +1091,12 @@ public class TestINIConfiguration
@Test
public void testListDelimiterHandlingInList() throws ConfigurationException
{
- String data =
+ final String data =
INI_DATA + "[sectest]" + LINE_SEPARATOR
+ "list = 3\\,1415,pi,\\\\Test\\,5" + LINE_SEPARATOR;
- INIConfiguration config = setUpConfig(data);
- INIConfiguration config2 = setUpConfig(saveToString(config));
- List<Object> list = config2.getList("sectest.list");
+ final INIConfiguration config = setUpConfig(data);
+ final INIConfiguration config2 = setUpConfig(saveToString(config));
+ final List<Object> list = config2.getList("sectest.list");
assertEquals("Wrong number of values", 3, list.size());
assertEquals("Wrong element 1", "3,1415", list.get(0));
assertEquals("Wrong element 3", "\\Test,5", list.get(2));
@@ -1109,13 +1109,13 @@ public class TestINIConfiguration
@Test
public void testKeysOfGlobalSection() throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
- HierarchicalConfiguration<ImmutableNode> sub = config.getSection(null);
- Iterator<String> keys = sub.getKeys();
+ final INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
+ final HierarchicalConfiguration<ImmutableNode> sub = config.getSection(null);
+ final Iterator<String> keys = sub.getKeys();
assertEquals("Wrong key", "globalVar", keys.next());
if (keys.hasNext())
{
- StringBuilder buf = new StringBuilder();
+ final StringBuilder buf = new StringBuilder();
do
{
buf.append(keys.next()).append(' ');
@@ -1132,9 +1132,9 @@ public class TestINIConfiguration
public void testGlobalSectionNodeHandlerGetChildrenByName()
throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
- SubnodeConfiguration sub = config.getSection(null);
- NodeHandler<ImmutableNode> handler = sub.getModel().getNodeHandler();
+ final INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
+ final SubnodeConfiguration sub = config.getSection(null);
+ final NodeHandler<ImmutableNode> handler = sub.getModel().getNodeHandler();
assertTrue(
"Sections not filtered",
handler.getChildren(
@@ -1150,9 +1150,9 @@ public class TestINIConfiguration
public void testGlobalSectionNodeHandlerGetChildrenCount()
throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
- SubnodeConfiguration sub = config.getSection(null);
- NodeHandler<ImmutableNode> handler = sub.getModel().getNodeHandler();
+ final INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
+ final SubnodeConfiguration sub = config.getSection(null);
+ final NodeHandler<ImmutableNode> handler = sub.getModel().getNodeHandler();
assertEquals("Wrong number of children", 1,
handler.getChildrenCount(handler.getRootNode(), null));
}
@@ -1165,17 +1165,17 @@ public class TestINIConfiguration
public void testGlobalSectionNodeHandlerGetChildByIndex()
throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
- SubnodeConfiguration sub = config.getSection(null);
- NodeHandler<ImmutableNode> handler = sub.getModel().getNodeHandler();
- ImmutableNode child = handler.getChild(handler.getRootNode(), 0);
+ final INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
+ final SubnodeConfiguration sub = config.getSection(null);
+ final NodeHandler<ImmutableNode> handler = sub.getModel().getNodeHandler();
+ final ImmutableNode child = handler.getChild(handler.getRootNode(), 0);
assertEquals("Wrong child", "globalVar", child.getNodeName());
try
{
handler.getChild(handler.getRootNode(), 1);
fail("Could obtain child with invalid index!");
}
- catch (IndexOutOfBoundsException iex)
+ catch (final IndexOutOfBoundsException iex)
{
// ok
}
@@ -1189,10 +1189,10 @@ public class TestINIConfiguration
public void testGlobalSectionNodeHandlerIndexOfChild()
throws ConfigurationException
{
- INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
- SubnodeConfiguration sub = config.getSection(null);
- NodeHandler<ImmutableNode> handler = sub.getModel().getNodeHandler();
- List<ImmutableNode> children = handler.getRootNode().getChildren();
+ final INIConfiguration config = setUpConfig(INI_DATA_GLOBAL);
+ final SubnodeConfiguration sub = config.getSection(null);
+ final NodeHandler<ImmutableNode> handler = sub.getModel().getNodeHandler();
+ final List<ImmutableNode> children = handler.getRootNode().getChildren();
assertEquals("Wrong index", 0,
handler.indexOfChild(handler.getRootNode(), children.get(0)));
assertEquals("Wrong index of section child", -1,
@@ -1206,11 +1206,11 @@ public class TestINIConfiguration
public void testExpressionEngineIgnoringCase()
throws ConfigurationException
{
- DefaultExpressionEngine engine =
+ final DefaultExpressionEngine engine =
new DefaultExpressionEngine(
DefaultExpressionEngineSymbols.DEFAULT_SYMBOLS,
NodeNameMatchers.EQUALS_IGNORE_CASE);
- INIConfiguration config = new INIConfiguration();
+ final INIConfiguration config = new INIConfiguration();
config.setExpressionEngine(engine);
load(config, INI_DATA);
@@ -1232,13 +1232,13 @@ public class TestINIConfiguration
throws ConfigurationException, IOException
{
final String section = "[EmptySection]";
- INIConfiguration config = setUpConfig(section);
+ final INIConfiguration config = setUpConfig(section);
assertEquals("Wrong number of sections", 1,
config.getSections().size());
assertTrue("Section not found",
config.getSections().contains("EmptySection"));
- StringWriter writer = new StringWriter();
+ final StringWriter writer = new StringWriter();
config.write(writer);
assertEquals("Wrong saved configuration",
section + LINE_SEPARATOR + LINE_SEPARATOR, writer.toString());
@@ -1261,7 +1261,7 @@ public class TestINIConfiguration
*
* @param conf the configuration object
*/
- public GlobalSectionTestThread(INIConfiguration conf)
+ public GlobalSectionTestThread(final INIConfiguration conf)
{
config = conf;
}
@@ -1281,7 +1281,7 @@ public class TestINIConfiguration
{
config.getSection(null);
}
- catch (IllegalStateException istex)
+ catch (final IllegalStateException istex)
{
error = true;
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestImmutableConfiguration.java Thu Sep 27 22:24:23 2018
@@ -74,13 +74,13 @@ public class TestImmutableConfiguration
public void testUnmodifiableConfigurationAccess()
throws ConfigurationException
{
- Configuration confOrg = createTestConfig();
- ImmutableConfiguration conf =
+ final Configuration confOrg = createTestConfig();
+ final ImmutableConfiguration conf =
ConfigurationUtils.unmodifiableConfiguration(confOrg);
assertFalse("Empty", conf.isEmpty());
- for (Iterator<String> it = confOrg.getKeys(); it.hasNext();)
+ for (final Iterator<String> it = confOrg.getKeys(); it.hasNext();)
{
- String key = it.next();
+ final String key = it.next();
assertTrue("Key not contained: " + key, conf.containsKey(key));
assertEquals("Wrong value for " + key, confOrg.getProperty(key),
conf.getProperty(key));
@@ -94,7 +94,7 @@ public class TestImmutableConfiguration
public void testUnmodifiableConfigurationOtherTypes()
throws ConfigurationException
{
- ImmutableConfiguration conf =
+ final ImmutableConfiguration conf =
ConfigurationUtils
.unmodifiableConfiguration(createTestConfig());
assertEquals("Wrong byte", (byte) 10, conf.getByte("test.byte"));
@@ -112,9 +112,9 @@ public class TestImmutableConfiguration
* @param it the iterator
* @return a set with all keys
*/
- private static Set<String> fetchKeys(Iterator<String> it)
+ private static Set<String> fetchKeys(final Iterator<String> it)
{
- Set<String> keys = new HashSet<>();
+ final Set<String> keys = new HashSet<>();
while (it.hasNext())
{
keys.add(it.next());
@@ -129,8 +129,8 @@ public class TestImmutableConfiguration
public void testUnmodifiableConfigurationIterate()
throws ConfigurationException
{
- Configuration confOrg = createTestConfig();
- ImmutableConfiguration conf =
+ final Configuration confOrg = createTestConfig();
+ final ImmutableConfiguration conf =
ConfigurationUtils.unmodifiableConfiguration(confOrg);
assertEquals("Different keys", fetchKeys(confOrg.getKeys()),
fetchKeys(conf.getKeys()));
@@ -143,10 +143,10 @@ public class TestImmutableConfiguration
public void testUnmodifiableConfigurationIteratorRemove()
throws ConfigurationException
{
- ImmutableConfiguration conf =
+ final ImmutableConfiguration conf =
ConfigurationUtils
.unmodifiableConfiguration(createTestConfig());
- Iterator<String> it = conf.getKeys();
+ final Iterator<String> it = conf.getKeys();
it.next();
it.remove();
}
@@ -159,11 +159,11 @@ public class TestImmutableConfiguration
public void testUnmodifiableConfigurationLiveUpdate()
throws ConfigurationException
{
- Configuration confOrg = createTestConfig();
- ImmutableConfiguration conf =
+ final Configuration confOrg = createTestConfig();
+ final ImmutableConfiguration conf =
ConfigurationUtils.unmodifiableConfiguration(confOrg);
final String key = "new.property";
- String value = "new value";
+ final String value = "new value";
confOrg.addProperty(key, value);
assertEquals("Value not set", value, conf.getString(key));
}
@@ -175,10 +175,10 @@ public class TestImmutableConfiguration
public void testUnmodifiableConfigurationCast()
throws ConfigurationException
{
- ImmutableConfiguration conf =
+ final ImmutableConfiguration conf =
ConfigurationUtils
.unmodifiableConfiguration(createTestConfig());
- Configuration mutableConf = (Configuration) conf;
+ final Configuration mutableConf = (Configuration) conf;
mutableConf.clear();
}
@@ -188,10 +188,10 @@ public class TestImmutableConfiguration
@Test
public void testImmutableSubset() throws ConfigurationException
{
- ImmutableConfiguration conf =
+ final ImmutableConfiguration conf =
ConfigurationUtils
.unmodifiableConfiguration(createTestConfig());
- ImmutableConfiguration subset = conf.immutableSubset("test");
+ final ImmutableConfiguration subset = conf.immutableSubset("test");
assertFalse("No content", subset.isEmpty());
assertEquals("Wrong value", 1000000, subset.getLong("long"));
}
@@ -202,10 +202,10 @@ public class TestImmutableConfiguration
@Test
public void testUnmodifiableHierarchicalConfiguration()
{
- HierarchicalConfiguration<?> conf = new BaseHierarchicalConfiguration();
- String key = "test";
+ final HierarchicalConfiguration<?> conf = new BaseHierarchicalConfiguration();
+ final String key = "test";
conf.addProperty(key, Boolean.TRUE);
- ImmutableHierarchicalConfiguration ihc =
+ final ImmutableHierarchicalConfiguration ihc =
ConfigurationUtils.unmodifiableConfiguration(conf);
assertTrue("Property not found", ihc.getBoolean(key));
assertEquals("Wrong max index", 0, ihc.getMaxIndex(key));
@@ -218,17 +218,17 @@ public class TestImmutableConfiguration
@Test
public void testExceptionHandling()
{
- PropertiesConfiguration config = new PropertiesConfiguration();
+ final PropertiesConfiguration config = new PropertiesConfiguration();
final String property = "nonExistingProperty";
config.setThrowExceptionOnMissing(true);
- ImmutableConfiguration ic =
+ final ImmutableConfiguration ic =
ConfigurationUtils.unmodifiableConfiguration(config);
try
{
ic.getString(property);
fail("Exception for missing property not thrown!");
}
- catch (NoSuchElementException e)
+ catch (final NoSuchElementException e)
{
assertThat("Wrong message", e.getMessage(),
containsString(property));
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJNDIConfiguration.java Thu Sep 27 22:24:23 2018
@@ -59,9 +59,9 @@ public class TestJNDIConfiguration {
System.setProperty("java.naming.factory.initial", CONTEXT_FACTORY);
- Properties props = new Properties();
+ final Properties props = new Properties();
props.put("java.naming.factory.initial", CONTEXT_FACTORY);
- Context ctx = new InitialContext(props);
+ final Context ctx = new InitialContext(props);
conf = new PotentialErrorJNDIConfiguration(ctx);
nonStringTestHolder = new NonStringTestHolder();
@@ -161,7 +161,7 @@ public class TestJNDIConfiguration {
@Test
public void testProperties() throws Exception {
- Object o = conf.getProperty("test.boolean");
+ final Object o = conf.getProperty("test.boolean");
assertNotNull(o);
assertEquals("true", o.toString());
}
@@ -169,7 +169,7 @@ public class TestJNDIConfiguration {
@Test
public void testContainsKey()
{
- String key = "test.boolean";
+ final String key = "test.boolean";
assertTrue("'" + key + "' not found", conf.containsKey(key));
conf.clearProperty(key);
@@ -225,7 +225,7 @@ public class TestJNDIConfiguration {
{
conf.installException();
// remove log error listener to avoid output in tests
- Iterator<EventListener<? super ConfigurationErrorEvent>> iterator =
+ final Iterator<EventListener<? super ConfigurationErrorEvent>> iterator =
conf.getEventListeners(ConfigurationErrorEvent.ANY).iterator();
conf.removeEventListener(ConfigurationErrorEvent.ANY, iterator.next());
return conf;
@@ -240,10 +240,10 @@ public class TestJNDIConfiguration {
* @param propValue the property value
*/
private void checkErrorListener(
- EventType<? extends ConfigurationErrorEvent> type,
- EventType<?> opEventType, String propName, Object propValue)
+ final EventType<? extends ConfigurationErrorEvent> type,
+ final EventType<?> opEventType, final String propName, final Object propValue)
{
- Throwable exception =
+ final Throwable exception =
listener.checkEvent(type, opEventType, propName, propValue);
assertTrue("Wrong exception class",
exception instanceof NamingException);
@@ -256,7 +256,7 @@ public class TestJNDIConfiguration {
@Test
public void testLogListener() throws NamingException
{
- JNDIConfiguration c = new JNDIConfiguration();
+ final JNDIConfiguration c = new JNDIConfiguration();
assertEquals("No error log listener registered", 1, c
.getEventListeners(ConfigurationErrorEvent.ANY).size());
}
@@ -314,10 +314,10 @@ public class TestJNDIConfiguration {
@Test
public void testGetKeysWithCycles() throws NamingException
{
- Hashtable<Object, Object> env = new Hashtable<>();
+ final Hashtable<Object, Object> env = new Hashtable<>();
env.put(MockInitialContextFactory.PROP_CYCLES, Boolean.TRUE);
- InitialContext initCtx = new InitialContext(env);
- JNDIConfiguration c = new JNDIConfiguration(initCtx);
+ final InitialContext initCtx = new InitialContext(env);
+ final JNDIConfiguration c = new JNDIConfiguration(initCtx);
c.getKeys("cycle");
}
@@ -344,7 +344,7 @@ public class TestJNDIConfiguration {
/** An exception to be thrown by getBaseContext(). */
private NamingException exception;
- public PotentialErrorJNDIConfiguration(Context ctx)
+ public PotentialErrorJNDIConfiguration(final Context ctx)
{
super(ctx);
}
@@ -355,7 +355,7 @@ public class TestJNDIConfiguration {
*
* @param nex the exception to be thrown
*/
- public void installException(NamingException nex)
+ public void installException(final NamingException nex)
{
exception = nex;
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJNDIEnvironmentValues.java Thu Sep 27 22:24:23 2018
@@ -51,14 +51,14 @@ public class TestJNDIEnvironmentValues
@Test
public void testSimpleGet() throws Exception
{
- String s = conf.getString("test.key");
+ final String s = conf.getString("test.key");
assertEquals("jndivalue", s);
}
@Test
public void testMoreGets() throws Exception
{
- String s = conf.getString("test.key");
+ final String s = conf.getString("test.key");
assertEquals("jndivalue", s);
assertEquals("jndivalue2", conf.getString("test.key2"));
assertEquals(1, conf.getShort("test.short"));
@@ -73,7 +73,7 @@ public class TestJNDIEnvironmentValues
@Test
public void testGetMissingKeyWithDefault() throws Exception
{
- String result = conf.getString("test.imaginarykey", "bob");
+ final String result = conf.getString("test.imaginarykey", "bob");
assertEquals("bob", result);
}
@@ -102,7 +102,7 @@ public class TestJNDIEnvironmentValues
public void testGetKeys() throws Exception
{
boolean found = false;
- Iterator<String> it = conf.getKeys();
+ final Iterator<String> it = conf.getKeys();
assertTrue("no key found", it.hasNext());
@@ -118,7 +118,7 @@ public class TestJNDIEnvironmentValues
public void testGetKeysWithUnknownPrefix()
{
// test for a unknown prefix
- Iterator<String> it = conf.getKeys("foo.bar");
+ final Iterator<String> it = conf.getKeys("foo.bar");
assertFalse("no key should be found", it.hasNext());
}
@@ -126,7 +126,7 @@ public class TestJNDIEnvironmentValues
public void testGetKeysWithExistingPrefix()
{
// test for an existing prefix
- Iterator<String> it = conf.getKeys("test");
+ final Iterator<String> it = conf.getKeys("test");
boolean found = false;
while (it.hasNext() && !found)
{
@@ -140,7 +140,7 @@ public class TestJNDIEnvironmentValues
public void testGetKeysWithKeyAsPrefix()
{
// test for a prefix matching exactly the key of a property
- Iterator<String> it = conf.getKeys("test.boolean");
+ final Iterator<String> it = conf.getKeys("test.boolean");
boolean found = false;
while (it.hasNext() && !found)
{
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestJSONConfiguration.java Thu Sep 27 22:24:23 2018
@@ -40,7 +40,7 @@ import static org.junit.Assert.assertTru
public class TestJSONConfiguration
{
/** The files that we test with. */
- private String testJson =
+ private final String testJson =
ConfigurationAssert.getTestFile("test.json").getAbsolutePath();
private JSONConfiguration jsonConfiguration;
@@ -74,14 +74,14 @@ public class TestJSONConfiguration
@Test
public void testGetProperty_subset()
{
- Configuration subset = jsonConfiguration.subset("key4");
+ final Configuration subset = jsonConfiguration.subset("key4");
assertEquals(Arrays.asList("col1", "col2"), subset.getProperty("key5"));
}
@Test
public void testGetProperty_very_nested_properties()
{
- Object property =
+ final Object property =
jsonConfiguration.getProperty("very.nested.properties");
assertEquals(Arrays.asList("nested1", "nested2", "nested3"), property);
}
@@ -89,7 +89,7 @@ public class TestJSONConfiguration
@Test
public void testGetProperty_integer()
{
- Object property = jsonConfiguration.getProperty("int1");
+ final Object property = jsonConfiguration.getProperty("int1");
assertTrue("property should be an Integer",
property instanceof Integer);
assertEquals(37, property);
@@ -99,29 +99,29 @@ public class TestJSONConfiguration
public void testSave() throws IOException, ConfigurationException
{
// save the Configuration as a String...
- StringWriter sw = new StringWriter();
+ final StringWriter sw = new StringWriter();
jsonConfiguration.write(sw);
- String output = sw.toString();
+ final String output = sw.toString();
// ..and then try parsing it back
- ObjectMapper mapper = new ObjectMapper();
- MapType type = mapper.getTypeFactory().constructMapType(Map.class,
+ final ObjectMapper mapper = new ObjectMapper();
+ final MapType type = mapper.getTypeFactory().constructMapType(Map.class,
String.class, Object.class);
- Map<String, Object> parsed = mapper.readValue(output, type);
+ final Map<String, Object> parsed = mapper.readValue(output, type);
assertEquals(7, parsed.entrySet().size());
assertEquals("value1", parsed.get("key1"));
- Map key2 = (Map) parsed.get("key2");
+ final Map key2 = (Map) parsed.get("key2");
assertEquals("value23", key2.get("key3"));
- List<String> key5 =
+ final List<String> key5 =
(List<String>) ((Map) parsed.get("key4")).get("key5");
assertEquals(2, key5.size());
assertEquals("col1", key5.get(0));
assertEquals("col2", key5.get(1));
- List<?> capitals = (List<?>) parsed.get("capitals");
- Map<?, ?> capUk = (Map<?, ?>) capitals.get(1);
+ final List<?> capitals = (List<?>) parsed.get("capitals");
+ final Map<?, ?> capUk = (Map<?, ?>) capitals.get(1);
assertEquals("London", capUk.get("capital"));
}
@@ -144,7 +144,7 @@ public class TestJSONConfiguration
@Test
public void testCopyConstructor()
{
- BaseHierarchicalConfiguration c = new BaseHierarchicalConfiguration();
+ final BaseHierarchicalConfiguration c = new BaseHierarchicalConfiguration();
c.addProperty("foo", "bar");
jsonConfiguration = new JSONConfiguration(c);
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestMapConfiguration.java Thu Sep 27 22:24:23 2018
@@ -51,13 +51,13 @@ public class TestMapConfiguration extend
@Override
protected AbstractConfiguration getConfiguration()
{
- Map<String, Object> map = new HashMap<>();
+ final Map<String, Object> map = new HashMap<>();
map.put(KEY, "value1");
map.put("key2", "value2");
map.put("list", "value1, value2");
map.put("listesc", "value1\\,value2");
- MapConfiguration config = new MapConfiguration(map);
+ final MapConfiguration config = new MapConfiguration(map);
config.setListDelimiterHandler(new DefaultListDelimiterHandler(','));
return config;
}
@@ -71,18 +71,18 @@ public class TestMapConfiguration extend
@Test
public void testGetMap()
{
- Map<String, Object> map = new HashMap<>();
+ final Map<String, Object> map = new HashMap<>();
- MapConfiguration conf = new MapConfiguration(map);
+ final MapConfiguration conf = new MapConfiguration(map);
assertEquals(map, conf.getMap());
}
@Test
public void testClone()
{
- MapConfiguration config = (MapConfiguration) getConfiguration();
- MapConfiguration copy = (MapConfiguration) config.clone();
- StrictConfigurationComparator comp = new StrictConfigurationComparator();
+ final MapConfiguration config = (MapConfiguration) getConfiguration();
+ final MapConfiguration copy = (MapConfiguration) config.clone();
+ final StrictConfigurationComparator comp = new StrictConfigurationComparator();
assertTrue("Configurations are not equal", comp.compare(config, copy));
}
@@ -92,9 +92,9 @@ public class TestMapConfiguration extend
@Test
public void testCloneModify()
{
- MapConfiguration config = (MapConfiguration) getConfiguration();
+ final MapConfiguration config = (MapConfiguration) getConfiguration();
config.addEventListener(ConfigurationEvent.ANY, new EventListenerTestImpl(config));
- MapConfiguration copy = (MapConfiguration) config.clone();
+ final MapConfiguration copy = (MapConfiguration) config.clone();
assertTrue("Event listeners were copied", copy
.getEventListeners(ConfigurationEvent.ANY).isEmpty());
@@ -113,10 +113,10 @@ public class TestMapConfiguration extend
{
final String keyAnswer = "answer";
final String keyValue = "value";
- MapConfiguration config = (MapConfiguration) getConfiguration();
+ final MapConfiguration config = (MapConfiguration) getConfiguration();
config.addProperty(keyAnswer, "The answer is ${" + keyValue + "}.");
config.addProperty(keyValue, 42);
- MapConfiguration clone = (MapConfiguration) config.clone();
+ final MapConfiguration clone = (MapConfiguration) config.clone();
clone.setProperty(keyValue, 43);
assertEquals("Wrong interpolation in original", "The answer is 42.",
config.getString(keyAnswer));
@@ -130,10 +130,10 @@ public class TestMapConfiguration extend
@Test
public void testAddProperty()
{
- MapConfiguration config = (MapConfiguration) getConfiguration();
+ final MapConfiguration config = (MapConfiguration) getConfiguration();
config.addProperty(KEY, TRIM_VALUE);
config.addProperty(KEY, "anotherValue");
- List<Object> values = config.getList(KEY);
+ final List<Object> values = config.getList(KEY);
assertEquals("Wrong number of values", 3, values.size());
}
@@ -143,7 +143,7 @@ public class TestMapConfiguration extend
@Test
public void testGetPropertyTrim()
{
- MapConfiguration config = (MapConfiguration) getConfiguration();
+ final MapConfiguration config = (MapConfiguration) getConfiguration();
config.getMap().put(KEY, SPACE_VALUE);
assertEquals("Wrong trimmed value", TRIM_VALUE, config.getProperty(KEY));
}
@@ -154,7 +154,7 @@ public class TestMapConfiguration extend
@Test
public void testGetPropertyTrimDisabled()
{
- MapConfiguration config = (MapConfiguration) getConfiguration();
+ final MapConfiguration config = (MapConfiguration) getConfiguration();
config.getMap().put(KEY, SPACE_VALUE);
config.setTrimmingDisabled(true);
assertEquals("Wrong trimmed value", SPACE_VALUE, config.getProperty(KEY));
@@ -168,7 +168,7 @@ public class TestMapConfiguration extend
@Test
public void testGetPropertyTrimNoSplit()
{
- MapConfiguration config = (MapConfiguration) getConfiguration();
+ final MapConfiguration config = (MapConfiguration) getConfiguration();
config.getMap().put(KEY, SPACE_VALUE);
config.setListDelimiterHandler(new DisabledListDelimiterHandler());
assertEquals("Wrong trimmed value", SPACE_VALUE, config.getProperty(KEY));
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestNonStringProperties.java Thu Sep 27 22:24:23 2018
@@ -33,8 +33,8 @@ public class TestNonStringProperties ext
@Before
public void setUp() throws Exception
{
- PropertiesConfiguration c = new PropertiesConfiguration();
- FileHandler handler = new FileHandler(c);
+ final PropertiesConfiguration c = new PropertiesConfiguration();
+ final FileHandler handler = new FileHandler(c);
handler.setFileName(testProperties);
handler.load();
conf = c;
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestNullCompositeConfiguration.java Thu Sep 27 22:24:23 2018
@@ -55,19 +55,19 @@ public class TestNullCompositeConfigurat
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(false);
@@ -99,7 +99,7 @@ public class TestNullCompositeConfigurat
{
cc.addConfiguration(conf1);
cc.addConfiguration(conf2);
- List<Object> l = cc.getList("packages");
+ final List<Object> l = cc.getList("packages");
assertTrue(l.contains("packagea"));
}
@@ -122,7 +122,7 @@ public class TestNullCompositeConfigurat
cc.clear();
assertEquals(1, cc.getNumberOfConfigurations());
- Configuration internal = cc.getConfiguration(0);
+ final Configuration internal = cc.getConfiguration(0);
cc.removeConfiguration(internal);
assertEquals(1, cc.getNumberOfConfigurations());
@@ -263,7 +263,7 @@ public class TestNullCompositeConfigurat
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"));
}
@@ -280,7 +280,7 @@ public class TestNullCompositeConfigurat
// 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");
@@ -310,11 +310,11 @@ public class TestNullCompositeConfigurat
@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");
@@ -343,11 +343,11 @@ public class TestNullCompositeConfigurat
@Test
public void testGetVector()
{
- 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");
@@ -357,7 +357,7 @@ public class TestNullCompositeConfigurat
// add an element to the vector in the composite configuration
cc.addProperty("array", "value5");
- List<Object> list = cc.getList("array");
+ final List<Object> list = cc.getList("array");
assertEquals("Wrong number of elements", 3, list.size());
assertEquals("Wrong element 1", "value1", list.get(0));
assertEquals("Wrong element 2", "value2", list.get(1));
@@ -371,13 +371,13 @@ public class TestNullCompositeConfigurat
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());
}
@@ -395,13 +395,13 @@ public class TestNullCompositeConfigurat
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());
}
@@ -415,10 +415,10 @@ public class TestNullCompositeConfigurat
@Test
public void testGetStringWithDefaults()
{
- BaseConfiguration defaults = new BaseConfiguration();
+ final BaseConfiguration defaults = new BaseConfiguration();
defaults.addProperty("default", "default string");
- Configuration c = new CompositeConfiguration(defaults);
+ final Configuration c = new CompositeConfiguration(defaults);
c.addProperty("string", "test string");
@@ -442,17 +442,17 @@ public class TestNullCompositeConfigurat
@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();
for (; i.hasNext();)
{
- String key = i.next();
+ final String key = i.next();
if (key.equals(TEST_KEY))
{
foundTestKey = true;
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestNullJNDIEnvironmentValues.java Thu Sep 27 22:24:23 2018
@@ -50,14 +50,14 @@ public class TestNullJNDIEnvironmentValu
@Test
public void testSimpleGet() throws Exception
{
- String s = conf.getString("test.key");
+ final String s = conf.getString("test.key");
assertEquals("jndivalue", s);
}
@Test
public void testMoreGets() throws Exception
{
- String s = conf.getString("test.key");
+ final String s = conf.getString("test.key");
assertEquals("jndivalue", s);
assertEquals("jndivalue2", conf.getString("test.key2"));
assertEquals(1, conf.getShort("test.short"));
@@ -72,7 +72,7 @@ public class TestNullJNDIEnvironmentValu
@Test
public void testGetMissingKeyWithDefault() throws Exception
{
- String result = conf.getString("test.imaginarykey", "bob");
+ final String result = conf.getString("test.imaginarykey", "bob");
assertEquals("bob", result);
}
@@ -101,7 +101,7 @@ public class TestNullJNDIEnvironmentValu
public void testGetKeys() throws Exception
{
boolean found = false;
- Iterator<String> it = conf.getKeys();
+ final Iterator<String> it = conf.getKeys();
assertTrue("no key found", it.hasNext());
@@ -117,7 +117,7 @@ public class TestNullJNDIEnvironmentValu
public void testGetKeysWithUnknownPrefix()
{
// test for a unknown prefix
- Iterator<String> it = conf.getKeys("foo.bar");
+ final Iterator<String> it = conf.getKeys("foo.bar");
assertFalse("no key should be found", it.hasNext());
}
@@ -125,7 +125,7 @@ public class TestNullJNDIEnvironmentValu
public void testGetKeysWithExistingPrefix()
{
// test for an existing prefix
- Iterator<String> it = conf.getKeys("test");
+ final Iterator<String> it = conf.getKeys("test");
boolean found = false;
while (it.hasNext() && !found)
{
@@ -139,7 +139,7 @@ public class TestNullJNDIEnvironmentValu
public void testGetKeysWithKeyAsPrefix()
{
// test for a prefix matching exactly the key of a property
- Iterator<String> it = conf.getKeys("test.boolean");
+ final Iterator<String> it = conf.getKeys("test.boolean");
boolean found = false;
while (it.hasNext() && !found)
{
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestPatternSubtreeConfiguration.java Thu Sep 27 22:24:23 2018
@@ -53,7 +53,7 @@ public class TestPatternSubtreeConfigura
@Test
public void testMultiConfiguration()
{
- PatternSubtreeConfigurationWrapper config = new PatternSubtreeConfigurationWrapper(this.conf, PATTERN);
+ final PatternSubtreeConfigurationWrapper config = new PatternSubtreeConfigurationWrapper(this.conf, PATTERN);
config.setExpressionEngine(new XPathExpressionEngine());
System.setProperty("Id", "1001");
@@ -73,8 +73,8 @@ public class TestPatternSubtreeConfigura
@Test(expected = ConfigurationException.class)
public void testReadNotFileBased() throws ConfigurationException
{
- HierarchicalConfiguration<ImmutableNode> hc = new BaseHierarchicalConfiguration();
- PatternSubtreeConfigurationWrapper config =
+ final HierarchicalConfiguration<ImmutableNode> hc = new BaseHierarchicalConfiguration();
+ final PatternSubtreeConfigurationWrapper config =
new PatternSubtreeConfigurationWrapper(hc, PATTERN);
new FileHandler(config).load(CONFIG_FILE);
}
@@ -86,8 +86,8 @@ public class TestPatternSubtreeConfigura
@Test(expected = ConfigurationException.class)
public void testSaveNotFileBased() throws ConfigurationException
{
- HierarchicalConfiguration<ImmutableNode> hc = new BaseHierarchicalConfiguration();
- PatternSubtreeConfigurationWrapper config =
+ final HierarchicalConfiguration<ImmutableNode> hc = new BaseHierarchicalConfiguration();
+ final PatternSubtreeConfigurationWrapper config =
new PatternSubtreeConfigurationWrapper(hc, PATTERN);
new FileHandler(config).save(new StringWriter());
}