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 [25/34] - in /commons/proper/configuration/trunk/src:
main/java/org/apache/commons/configuration2/
main/java/org/apache/commons/configuration2/beanutils/
main/java/org/apache/commons/configuration2/builder/
main/java/org/apache/com...
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedBuilderParameters.java Thu Sep 27 22:24:23 2018
@@ -51,7 +51,7 @@ public class TestFileBasedBuilderParamet
@Test
public void testInitDefaults()
{
- FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
+ final FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
assertFalse("Got a location", params.getFileHandler()
.isLocationDefined());
assertNull("Got a refresh delay", params.getReloadingRefreshDelay());
@@ -63,8 +63,8 @@ public class TestFileBasedBuilderParamet
@Test
public void testInitFileHandler()
{
- FileHandler handler = new FileHandler();
- FileBasedBuilderParametersImpl params =
+ final FileHandler handler = new FileHandler();
+ final FileBasedBuilderParametersImpl params =
new FileBasedBuilderParametersImpl(handler);
assertSame("Wrong handler", handler, params.getFileHandler());
}
@@ -75,7 +75,7 @@ public class TestFileBasedBuilderParamet
@Test
public void testSetReloadingRefreshDelay()
{
- FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
+ final FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
final Long delay = 10000L;
assertSame("Wrong result", params,
params.setReloadingRefreshDelay(delay));
@@ -88,10 +88,10 @@ public class TestFileBasedBuilderParamet
@Test
public void testSetReloadingDetectorFactory()
{
- ReloadingDetectorFactory factory =
+ final ReloadingDetectorFactory factory =
EasyMock.createMock(ReloadingDetectorFactory.class);
EasyMock.replay(factory);
- FileBasedBuilderParametersImpl params =
+ final FileBasedBuilderParametersImpl params =
new FileBasedBuilderParametersImpl();
assertNull("Got a factory", params.getReloadingDetectorFactory());
assertSame("Wrong result", params,
@@ -106,10 +106,10 @@ public class TestFileBasedBuilderParamet
@Test
public void testSetFile()
{
- File file =
+ final File file =
ConfigurationAssert.getTestFile("test.properties")
.getAbsoluteFile();
- FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
+ final FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
assertSame("Wrong result", params, params.setFile(file));
assertEquals("Wrong file", file, params.getFileHandler().getFile());
}
@@ -120,8 +120,8 @@ public class TestFileBasedBuilderParamet
@Test
public void testSetURL()
{
- URL url = ConfigurationAssert.getTestURL("test.properties");
- FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
+ final URL url = ConfigurationAssert.getTestURL("test.properties");
+ final FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
assertSame("Wrong result", params, params.setURL(url));
assertEquals("Wrong URL", url.toExternalForm(), params.getFileHandler()
.getURL().toExternalForm());
@@ -133,10 +133,10 @@ public class TestFileBasedBuilderParamet
@Test
public void testSetPath()
{
- String path =
+ final String path =
ConfigurationAssert.getTestFile("test.properties")
.getAbsolutePath();
- FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
+ final FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
assertSame("Wrong result", params, params.setPath(path));
assertEquals("Wrong path", path, params.getFileHandler().getPath());
}
@@ -147,8 +147,8 @@ public class TestFileBasedBuilderParamet
@Test
public void testSetFileName()
{
- String name = "testConfig.xml";
- FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
+ final String name = "testConfig.xml";
+ final FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
assertSame("Wrong result", params, params.setFileName(name));
assertEquals("Wrong name", name, params.getFileHandler().getFileName());
}
@@ -159,10 +159,10 @@ public class TestFileBasedBuilderParamet
@Test
public void testSetBasePath()
{
- String path =
+ final String path =
ConfigurationAssert.getTestFile("test.properties").getParentFile()
.getAbsolutePath();
- FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
+ final FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
assertSame("Wrong result", params, params.setBasePath(path));
assertEquals("Wrong path", path, params.getFileHandler().getBasePath());
}
@@ -173,9 +173,9 @@ public class TestFileBasedBuilderParamet
@Test
public void testSetFileSystem()
{
- FileSystem fs = EasyMock.createMock(FileSystem.class);
+ final FileSystem fs = EasyMock.createMock(FileSystem.class);
EasyMock.replay(fs);
- FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
+ final FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
assertSame("Wrong result", params, params.setFileSystem(fs));
assertSame("Wrong file system", fs, params.getFileHandler()
.getFileSystem());
@@ -187,10 +187,10 @@ public class TestFileBasedBuilderParamet
@Test
public void testSetLocationStrategy()
{
- FileLocationStrategy strat =
+ final FileLocationStrategy strat =
EasyMock.createMock(FileLocationStrategy.class);
EasyMock.replay(strat);
- FileBasedBuilderParametersImpl params =
+ final FileBasedBuilderParametersImpl params =
new FileBasedBuilderParametersImpl();
assertSame("Wrong result", params, params.setLocationStrategy(strat));
assertSame("Wrong location strategy", strat, params.getFileHandler()
@@ -203,8 +203,8 @@ public class TestFileBasedBuilderParamet
@Test
public void testSetEncoding()
{
- String enc = "ISO-8859-1";
- FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
+ final String enc = "ISO-8859-1";
+ final FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
assertSame("Wrong result", params, params.setEncoding(enc));
assertSame("Wrong encoding", enc, params.getFileHandler().getEncoding());
}
@@ -215,11 +215,11 @@ public class TestFileBasedBuilderParamet
@Test
public void testGetParameters()
{
- FileBasedBuilderParametersImpl params =
+ final FileBasedBuilderParametersImpl params =
new FileBasedBuilderParametersImpl()
.setReloadingRefreshDelay(1000L);
params.setThrowExceptionOnMissing(true);
- Map<String, Object> map = params.getParameters();
+ final Map<String, Object> map = params.getParameters();
assertTrue("Object not stored", map.values().contains(params));
assertEquals("Wrong exception flag", Boolean.TRUE, params
.getParameters().get("throwExceptionOnMissing"));
@@ -243,7 +243,7 @@ public class TestFileBasedBuilderParamet
@Test
public void testFromParametersDefaultInstance()
{
- FileBasedBuilderParametersImpl params =
+ final FileBasedBuilderParametersImpl params =
FileBasedBuilderParametersImpl.fromParameters(
new HashMap<String, Object>(), true);
assertFalse("Got a location", params.getFileHandler()
@@ -256,8 +256,8 @@ public class TestFileBasedBuilderParamet
@Test
public void testFromParametersExtract()
{
- FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
- Map<String, Object> map = params.getParameters();
+ final FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
+ final Map<String, Object> map = params.getParameters();
assertSame("Wrong parameters", params,
FileBasedBuilderParametersImpl.fromParameters(map));
}
@@ -278,14 +278,14 @@ public class TestFileBasedBuilderParamet
@Test
public void testBeanPropertiesAccess() throws Exception
{
- FileBasedBuilderParametersImpl params =
+ final FileBasedBuilderParametersImpl params =
new FileBasedBuilderParametersImpl();
BeanHelper.setProperty(params, "throwExceptionOnMissing",
Boolean.TRUE);
BeanHelper.setProperty(params, "fileName", "test.xml");
assertEquals("File name not set", "test.xml", params.getFileHandler()
.getFileName());
- Map<String, Object> map = params.getParameters();
+ final Map<String, Object> map = params.getParameters();
assertEquals("Property not stored", Boolean.TRUE,
map.get("throwExceptionOnMissing"));
}
@@ -296,14 +296,14 @@ public class TestFileBasedBuilderParamet
@Test
public void testClone()
{
- FileBased content = EasyMock.createMock(FileBased.class);
+ final FileBased content = EasyMock.createMock(FileBased.class);
EasyMock.replay(content);
- FileHandler fh = new FileHandler(content);
- FileBasedBuilderParametersImpl params =
+ final FileHandler fh = new FileHandler(content);
+ final FileBasedBuilderParametersImpl params =
new FileBasedBuilderParametersImpl(fh);
params.setThrowExceptionOnMissing(true);
params.setFileName("test.xml");
- FileBasedBuilderParametersImpl clone = params.clone();
+ final FileBasedBuilderParametersImpl clone = params.clone();
assertEquals("Wrong exception flag", Boolean.TRUE, clone
.getParameters().get("throwExceptionOnMissing"));
assertEquals("File name not copied", "test.xml", clone.getFileHandler()
@@ -320,10 +320,10 @@ public class TestFileBasedBuilderParamet
@Test
public void testFromMap()
{
- ReloadingDetectorFactory factory =
+ final ReloadingDetectorFactory factory =
EasyMock.createMock(ReloadingDetectorFactory.class);
EasyMock.replay(factory);
- Map<String, Object> map = new HashMap<>();
+ final Map<String, Object> map = new HashMap<>();
final String fileName = "someFileName";
final String basePath = "someBasePath";
final Long refreshDelay = 20140628222302L;
@@ -332,7 +332,7 @@ public class TestFileBasedBuilderParamet
map.put("reloadingDetectorFactory", factory);
map.put("reloadingRefreshDelay", refreshDelay);
- FileBasedBuilderParametersImpl params =
+ final FileBasedBuilderParametersImpl params =
FileBasedBuilderParametersImpl.fromMap(map);
assertEquals("Wrong base path", basePath, params.getFileHandler()
.getBasePath());
@@ -350,7 +350,7 @@ public class TestFileBasedBuilderParamet
@Test
public void testFromMapNull()
{
- FileBasedBuilderParametersImpl params =
+ final FileBasedBuilderParametersImpl params =
FileBasedBuilderParametersImpl.fromMap(null);
assertNull("Got refresh delay", params.getReloadingRefreshDelay());
assertNull("Got a file name", params.getFileHandler().getFileName());
@@ -362,7 +362,7 @@ public class TestFileBasedBuilderParamet
@Test
public void testInheritFrom()
{
- FileBasedBuilderParametersImpl params =
+ final FileBasedBuilderParametersImpl params =
new FileBasedBuilderParametersImpl();
params.setEncoding("ISO-8856-1");
params.setPath("A path");
@@ -372,7 +372,7 @@ public class TestFileBasedBuilderParamet
params.setLocationStrategy(EasyMock.createMock(FileLocationStrategy.class));
params.setReloadingRefreshDelay(20160213171737L);
params.setThrowExceptionOnMissing(true);
- FileBasedBuilderParametersImpl params2 =
+ final FileBasedBuilderParametersImpl params2 =
new FileBasedBuilderParametersImpl();
params2.inheritFrom(params.getParameters());
@@ -401,11 +401,11 @@ public class TestFileBasedBuilderParamet
@Test
public void testInheritFromSkipMissingProperties()
{
- String encoding = "UTF-16";
- ReloadingDetectorFactory factory =
+ final String encoding = "UTF-16";
+ final ReloadingDetectorFactory factory =
EasyMock.createMock(ReloadingDetectorFactory.class);
- Long refreshDelay = 20160213172611L;
- FileBasedBuilderParametersImpl params =
+ final Long refreshDelay = 20160213172611L;
+ final FileBasedBuilderParametersImpl params =
new FileBasedBuilderParametersImpl().setEncoding(encoding)
.setReloadingDetectorFactory(factory)
.setReloadingRefreshDelay(refreshDelay);
@@ -426,7 +426,7 @@ public class TestFileBasedBuilderParamet
@Test
public void testInheritFromNoParametersObject()
{
- FileBasedBuilderParametersImpl params =
+ final FileBasedBuilderParametersImpl params =
new FileBasedBuilderParametersImpl()
.setReloadingRefreshDelay(20160213211429L);
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestFileBasedConfigurationBuilder.java Thu Sep 27 22:24:23 2018
@@ -69,7 +69,7 @@ public class TestFileBasedConfigurationB
* @param value the value for the test property
* @return the File object pointing to the test file
*/
- private File createTestFile(int value)
+ private File createTestFile(final int value)
{
Writer out = null;
File file;
@@ -79,7 +79,7 @@ public class TestFileBasedConfigurationB
out = new FileWriter(file);
out.write(String.format("%s=%d", PROP, value));
}
- catch (IOException ioex)
+ catch (final IOException ioex)
{
fail("Could not create test file: " + ioex);
return null; // cannot happen
@@ -92,7 +92,7 @@ public class TestFileBasedConfigurationB
{
out.close();
}
- catch (IOException ioex)
+ catch (final IOException ioex)
{
// ignore
}
@@ -107,12 +107,12 @@ public class TestFileBasedConfigurationB
@Test
public void testGetConfigurationNoLocation() throws ConfigurationException
{
- Map<String, Object> params = new HashMap<>();
+ final Map<String, Object> params = new HashMap<>();
params.put("throwExceptionOnMissing", Boolean.TRUE);
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class, params);
- PropertiesConfiguration conf = builder.getConfiguration();
+ final PropertiesConfiguration conf = builder.getConfiguration();
assertTrue("Property not set", conf.isThrowExceptionOnMissing());
assertTrue("Not empty", conf.isEmpty());
}
@@ -125,13 +125,13 @@ public class TestFileBasedConfigurationB
public void testGetConfigurationLoadFromFile()
throws ConfigurationException
{
- File file = createTestFile(1);
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final File file = createTestFile(1);
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class)
.configure(new FileBasedBuilderParametersImpl()
.setFile(file));
- PropertiesConfiguration config = builder.getConfiguration();
+ final PropertiesConfiguration config = builder.getConfiguration();
assertEquals("Not read from file", 1, config.getInt(PROP));
assertSame("FileHandler not initialized", config, builder
.getFileHandler().getContent());
@@ -144,15 +144,15 @@ public class TestFileBasedConfigurationB
@Test
public void testLocationSurvivesResetResult() throws ConfigurationException
{
- File file = createTestFile(1);
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final File file = createTestFile(1);
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class)
.configure(new FileBasedBuilderParametersImpl()
.setFile(file));
- PropertiesConfiguration config = builder.getConfiguration();
+ final PropertiesConfiguration config = builder.getConfiguration();
builder.resetResult();
- PropertiesConfiguration config2 = builder.getConfiguration();
+ final PropertiesConfiguration config2 = builder.getConfiguration();
assertNotSame("Same configuration", config, config2);
assertEquals("Not read from file", 1, config2.getInt(PROP));
}
@@ -164,14 +164,14 @@ public class TestFileBasedConfigurationB
@Test
public void testLocationIsFullyDefined() throws ConfigurationException
{
- File file = createTestFile(1);
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final File file = createTestFile(1);
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class)
.configure(new FileBasedBuilderParametersImpl()
.setFile(file));
builder.getConfiguration();
- FileLocator locator = builder.getFileHandler().getFileLocator();
+ final FileLocator locator = builder.getFileHandler().getFileLocator();
assertTrue("Not fully defined: " + locator,
FileLocatorUtils.isFullyInitialized(locator));
}
@@ -183,9 +183,9 @@ public class TestFileBasedConfigurationB
@Test
public void testChangeLocationAfterCreation() throws ConfigurationException
{
- File file1 = createTestFile(1);
- File file2 = createTestFile(2);
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final File file1 = createTestFile(1);
+ final File file2 = createTestFile(2);
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class)
.configure(new FileBasedBuilderParametersImpl()
@@ -193,7 +193,7 @@ public class TestFileBasedConfigurationB
builder.getConfiguration();
builder.getFileHandler().setFile(file2);
builder.resetResult();
- PropertiesConfiguration config = builder.getConfiguration();
+ final PropertiesConfiguration config = builder.getConfiguration();
assertEquals("Not read from file 2", 2, config.getInt(PROP));
}
@@ -204,15 +204,15 @@ public class TestFileBasedConfigurationB
@Test
public void testResetLocation() throws ConfigurationException
{
- File file = createTestFile(1);
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final File file = createTestFile(1);
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class)
.configure(new FileBasedBuilderParametersImpl()
.setFile(file));
builder.getConfiguration();
builder.reset();
- PropertiesConfiguration config = builder.getConfiguration();
+ final PropertiesConfiguration config = builder.getConfiguration();
assertTrue("Configuration was read from file", config.isEmpty());
assertFalse("FileHandler has location", builder.getFileHandler()
.isLocationDefined());
@@ -225,9 +225,9 @@ public class TestFileBasedConfigurationB
@Test
public void testChangeLocationAfterReset() throws ConfigurationException
{
- File file1 = createTestFile(1);
- File file2 = createTestFile(2);
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final File file1 = createTestFile(1);
+ final File file2 = createTestFile(2);
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class)
.configure(new FileBasedBuilderParametersImpl()
@@ -250,7 +250,7 @@ public class TestFileBasedConfigurationB
@Test
public void testInitAllowFailOnInitFlag()
{
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class, null, true);
assertTrue("Flag not set", builder.isAllowFailOnInit());
@@ -263,12 +263,12 @@ public class TestFileBasedConfigurationB
@Test
public void testSetLocationNoFileHandler() throws ConfigurationException
{
- File file = createTestFile(1);
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final File file = createTestFile(1);
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class);
builder.getFileHandler().setFile(file);
- PropertiesConfiguration config = builder.getConfiguration();
+ final PropertiesConfiguration config = builder.getConfiguration();
assertFalse("No data was loaded", config.isEmpty());
}
@@ -279,11 +279,11 @@ public class TestFileBasedConfigurationB
* @param expValue the expected value of the test property
* @throws ConfigurationException if an error occurs
*/
- private static void checkSavedConfig(File file, int expValue)
+ private static void checkSavedConfig(final File file, final int expValue)
throws ConfigurationException
{
- PropertiesConfiguration config = new PropertiesConfiguration();
- FileHandler handler = new FileHandler(config);
+ final PropertiesConfiguration config = new PropertiesConfiguration();
+ final FileHandler handler = new FileHandler(config);
handler.load(file);
assertEquals("Configuration was not saved", expValue,
config.getInt(PROP));
@@ -295,13 +295,13 @@ public class TestFileBasedConfigurationB
@Test
public void testSave() throws ConfigurationException
{
- File file = createTestFile(1);
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final File file = createTestFile(1);
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class)
.configure(new FileBasedBuilderParametersImpl()
.setFile(file));
- PropertiesConfiguration config = builder.getConfiguration();
+ final PropertiesConfiguration config = builder.getConfiguration();
config.setProperty(PROP, 5);
builder.save();
checkSavedConfig(file, 5);
@@ -313,12 +313,12 @@ public class TestFileBasedConfigurationB
@Test
public void testSaveNewFile() throws ConfigurationException, IOException
{
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class);
- PropertiesConfiguration config = builder.getConfiguration();
+ final PropertiesConfiguration config = builder.getConfiguration();
config.setProperty(PROP, 2);
- File file = folder.newFile();
+ final File file = folder.newFile();
builder.getFileHandler().setFile(file);
builder.save();
checkSavedConfig(file, 2);
@@ -331,12 +331,12 @@ public class TestFileBasedConfigurationB
@Test
public void testCreateConfigurationNonExistingFileAndThenSave()
throws ConfigurationException {
- File outFile = ConfigurationAssert.getOutFile("save.properties");
- Parameters parameters = new Parameters();
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder = new FileBasedConfigurationBuilder<>(
+ final File outFile = ConfigurationAssert.getOutFile("save.properties");
+ final Parameters parameters = new Parameters();
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder = new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class, null, true).configure(parameters
.properties().setFile(outFile));
- Configuration config = builder.getConfiguration();
+ final Configuration config = builder.getConfiguration();
config.setProperty(PROP, 1);
builder.save();
checkSavedConfig(outFile, 1);
@@ -349,8 +349,8 @@ public class TestFileBasedConfigurationB
@Test
public void testAutoSave() throws ConfigurationException
{
- File file = createTestFile(0);
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final File file = createTestFile(0);
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class)
.configure(new FileBasedBuilderParametersImpl()
@@ -359,7 +359,7 @@ public class TestFileBasedConfigurationB
builder.setAutoSave(true);
assertTrue("Auto save not enabled", builder.isAutoSave());
builder.setAutoSave(true); // should have no effect
- PropertiesConfiguration config = builder.getConfiguration();
+ final PropertiesConfiguration config = builder.getConfiguration();
config.setProperty(PROP, 1);
checkSavedConfig(file, 1);
}
@@ -371,16 +371,16 @@ public class TestFileBasedConfigurationB
@Test
public void testAutoSaveWithReset() throws ConfigurationException
{
- File file = createTestFile(0);
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final File file = createTestFile(0);
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class)
.configure(new FileBasedBuilderParametersImpl()
.setFile(file));
- PropertiesConfiguration config1 = builder.getConfiguration();
+ final PropertiesConfiguration config1 = builder.getConfiguration();
builder.setAutoSave(true);
builder.resetResult();
- PropertiesConfiguration config2 = builder.getConfiguration();
+ final PropertiesConfiguration config2 = builder.getConfiguration();
assertNotSame("No new configuration created", config1, config2);
config2.setProperty(PROP, 1);
config1.setProperty(PROP, 2);
@@ -393,13 +393,13 @@ public class TestFileBasedConfigurationB
@Test
public void testDisableAutoSave() throws ConfigurationException
{
- File file = createTestFile(0);
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final File file = createTestFile(0);
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class)
.configure(new FileBasedBuilderParametersImpl()
.setFile(file));
- PropertiesConfiguration config = builder.getConfiguration();
+ final PropertiesConfiguration config = builder.getConfiguration();
builder.setAutoSave(true);
config.setProperty(PROP, 1);
builder.setAutoSave(false);
@@ -416,14 +416,14 @@ public class TestFileBasedConfigurationB
public void testAutoSaveWithPropertiesConfiguration() throws ConfigurationException,
IOException
{
- File file = folder.newFile();
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final File file = folder.newFile();
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class)
.configure(new FileBasedBuilderParametersImpl()
.setFile(file));
builder.setAutoSave(true);
- PropertiesConfiguration config = builder.getConfiguration();
+ final PropertiesConfiguration config = builder.getConfiguration();
config.setProperty(PROP, 1);
checkSavedConfig(file, 1);
}
@@ -469,7 +469,7 @@ public class TestFileBasedConfigurationB
@Test
public void testGetDefaultEncodingSubClass()
{
- PropertiesConfiguration conf = new PropertiesConfiguration()
+ final PropertiesConfiguration conf = new PropertiesConfiguration()
{
};
assertEquals("Wrong default encodng",
@@ -485,7 +485,7 @@ public class TestFileBasedConfigurationB
@Test
public void testGetDefaultEncodingInterface()
{
- String encoding = "testEncoding";
+ final String encoding = "testEncoding";
FileBasedConfigurationBuilder.setDefaultEncoding(Configuration.class,
encoding);
assertEquals("Wrong default encoding", encoding,
@@ -506,10 +506,10 @@ public class TestFileBasedConfigurationB
public void testInitFileHandlerSetDefaultEncoding()
throws ConfigurationException
{
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class);
- FileHandler handler = new FileHandler();
+ final FileHandler handler = new FileHandler();
builder.initFileHandler(handler);
assertEquals("Wrong encoding",
PropertiesConfiguration.DEFAULT_ENCODING, handler.getEncoding());
@@ -523,11 +523,11 @@ public class TestFileBasedConfigurationB
public void testInitFileHandlerOverrideDefaultEncoding()
throws ConfigurationException
{
- FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class);
- FileHandler handler = new FileHandler();
- String encoding = "testEncoding";
+ final FileHandler handler = new FileHandler();
+ final String encoding = "testEncoding";
handler.setEncoding(encoding);
builder.initFileHandler(handler);
assertEquals("Encoding was changed", encoding, handler.getEncoding());
@@ -546,19 +546,19 @@ public class TestFileBasedConfigurationB
public void testFileBasedConfigurationBuilderWithHomeDirectoryLocationStrategy()
throws IOException, ConfigurationException
{
- String folderName = "test";
- String fileName = "sample.properties";
+ final String folderName = "test";
+ final String fileName = "sample.properties";
folder.newFolder(folderName);
folder.newFile(folderName + File.separatorChar + fileName);
- FileBasedConfigurationBuilder<FileBasedConfiguration> homeDirConfigurationBuilder =
+ final FileBasedConfigurationBuilder<FileBasedConfiguration> homeDirConfigurationBuilder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class);
- PropertiesBuilderParameters homeDirProperties =
+ final PropertiesBuilderParameters homeDirProperties =
new Parameters().properties();
- HomeDirectoryLocationStrategy strategy =
+ final HomeDirectoryLocationStrategy strategy =
new HomeDirectoryLocationStrategy(
folder.getRoot().getAbsolutePath(), true);
- FileBasedConfigurationBuilder<FileBasedConfiguration> builder =
+ final FileBasedConfigurationBuilder<FileBasedConfiguration> builder =
homeDirConfigurationBuilder.configure(homeDirProperties
.setLocationStrategy(strategy).setBasePath(folderName)
.setListDelimiterHandler(
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestHierarchicalBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestHierarchicalBuilderParametersImpl.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestHierarchicalBuilderParametersImpl.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestHierarchicalBuilderParametersImpl.java Thu Sep 27 22:24:23 2018
@@ -49,7 +49,7 @@ public class TestHierarchicalBuilderPara
@Test
public void testSetExpressionEngine()
{
- ExpressionEngine engine = EasyMock.createMock(ExpressionEngine.class);
+ final ExpressionEngine engine = EasyMock.createMock(ExpressionEngine.class);
EasyMock.replay(engine);
assertSame("Wrong result", params, params.setExpressionEngine(engine));
assertSame("Wrong expression engine", engine, params.getParameters()
@@ -62,11 +62,11 @@ public class TestHierarchicalBuilderPara
@Test
public void testBeanPropertiesAccess() throws Exception
{
- ExpressionEngine engine = EasyMock.createMock(ExpressionEngine.class);
+ final ExpressionEngine engine = EasyMock.createMock(ExpressionEngine.class);
BeanHelper.setProperty(params, "expressionEngine", engine);
BeanHelper.setProperty(params, "throwExceptionOnMissing",
Boolean.TRUE);
- Map<String, Object> map = params.getParameters();
+ final Map<String, Object> map = params.getParameters();
assertSame("Wrong expression engine", engine,
map.get("expressionEngine"));
assertEquals("Wrong exception flag", Boolean.TRUE,
@@ -79,16 +79,16 @@ public class TestHierarchicalBuilderPara
@Test
public void testInheritFrom()
{
- ExpressionEngine engine = EasyMock.createMock(ExpressionEngine.class);
- HierarchicalBuilderParametersImpl params =
+ final ExpressionEngine engine = EasyMock.createMock(ExpressionEngine.class);
+ final HierarchicalBuilderParametersImpl params =
new HierarchicalBuilderParametersImpl();
params.setExpressionEngine(engine);
params.setThrowExceptionOnMissing(true);
- HierarchicalBuilderParametersImpl params2 =
+ final HierarchicalBuilderParametersImpl params2 =
new HierarchicalBuilderParametersImpl();
params2.inheritFrom(params.getParameters());
- Map<String, Object> parameters = params2.getParameters();
+ final Map<String, Object> parameters = params2.getParameters();
assertEquals("Exception flag not set", Boolean.TRUE,
parameters.get("throwExceptionOnMissing"));
assertEquals("Expression engine not set", engine,
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestJndiBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestJndiBuilderParametersImpl.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestJndiBuilderParametersImpl.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestJndiBuilderParametersImpl.java Thu Sep 27 22:24:23 2018
@@ -50,10 +50,10 @@ public class TestJndiBuilderParametersIm
@Test
public void testSetContext()
{
- Context ctx = EasyMock.createMock(Context.class);
+ final Context ctx = EasyMock.createMock(Context.class);
EasyMock.replay(ctx);
assertSame("Wrong result", params, params.setContext(ctx));
- Map<String, Object> paramsMap = params.getParameters();
+ final Map<String, Object> paramsMap = params.getParameters();
assertSame("Context not in map", ctx, paramsMap.get("context"));
}
@@ -63,9 +63,9 @@ public class TestJndiBuilderParametersIm
@Test
public void testSetPrefix()
{
- String prefix = "testJndiPrefix";
+ final String prefix = "testJndiPrefix";
assertSame("Wrong result", params, params.setPrefix(prefix));
- Map<String, Object> paramsMap = params.getParameters();
+ final Map<String, Object> paramsMap = params.getParameters();
assertEquals("Prefix not in map", prefix, paramsMap.get("prefix"));
}
@@ -77,7 +77,7 @@ public class TestJndiBuilderParametersIm
{
params.setPrefix("somePrefix");
params.setThrowExceptionOnMissing(true);
- Map<String, Object> paramsMap = params.getParameters();
+ final Map<String, Object> paramsMap = params.getParameters();
assertEquals("Wrong exception flag", Boolean.TRUE,
paramsMap.get("throwExceptionOnMissing"));
}
@@ -88,12 +88,12 @@ public class TestJndiBuilderParametersIm
@Test
public void testSetBeanProperties() throws Exception
{
- Context ctx = EasyMock.createMock(Context.class);
+ final Context ctx = EasyMock.createMock(Context.class);
EasyMock.replay(ctx);
- String prefix = "testJndiPrefix";
+ final String prefix = "testJndiPrefix";
BeanHelper.setProperty(params, "context", ctx);
BeanHelper.setProperty(params, "prefix", prefix);
- Map<String, Object> paramsMap = params.getParameters();
+ final Map<String, Object> paramsMap = params.getParameters();
assertSame("Context not in map", ctx, paramsMap.get("context"));
assertEquals("Prefix not in map", prefix, paramsMap.get("prefix"));
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestPropertiesBuilderParametersImpl.java Thu Sep 27 22:24:23 2018
@@ -63,7 +63,7 @@ public class TestPropertiesBuilderParame
@Test
public void testSetLayout()
{
- PropertiesConfigurationLayout layout =
+ final PropertiesConfigurationLayout layout =
new PropertiesConfigurationLayout();
assertSame("Wrong result", params, params.setLayout(layout));
assertSame("Layout not set", layout,
@@ -76,7 +76,7 @@ public class TestPropertiesBuilderParame
@Test
public void testSetIOFactory()
{
- PropertiesConfiguration.IOFactory factory =
+ final PropertiesConfiguration.IOFactory factory =
EasyMock.createMock(PropertiesConfiguration.IOFactory.class);
EasyMock.replay(factory);
assertSame("Wrong result", params, params.setIOFactory(factory));
@@ -90,7 +90,7 @@ public class TestPropertiesBuilderParame
@Test
public void testBeanPropertiesAccess() throws Exception
{
- PropertiesConfiguration.IOFactory factory =
+ final PropertiesConfiguration.IOFactory factory =
EasyMock.createMock(PropertiesConfiguration.IOFactory.class);
EasyMock.replay(factory);
BeanHelper.setProperty(params, "IOFactory", factory);
@@ -99,7 +99,7 @@ public class TestPropertiesBuilderParame
BeanHelper.setProperty(params, "fileName", "test.properties");
assertEquals("Wrong file name", "test.properties", params
.getFileHandler().getFileName());
- Map<String, Object> paramsMap = params.getParameters();
+ final Map<String, Object> paramsMap = params.getParameters();
assertEquals("Wrong exception flag", Boolean.TRUE,
paramsMap.get("throwExceptionOnMissing"));
assertSame("Factory not set", factory,
@@ -112,16 +112,16 @@ public class TestPropertiesBuilderParame
@Test
public void testInheritFrom()
{
- PropertiesConfiguration.IOFactory factory =
+ final PropertiesConfiguration.IOFactory factory =
EasyMock.createMock(PropertiesConfiguration.IOFactory.class);
params.setIOFactory(factory).setIncludesAllowed(false)
.setLayout(new PropertiesConfigurationLayout());
params.setThrowExceptionOnMissing(true);
- PropertiesBuilderParametersImpl params2 =
+ final PropertiesBuilderParametersImpl params2 =
new PropertiesBuilderParametersImpl();
params2.inheritFrom(params.getParameters());
- Map<String, Object> parameters = params2.getParameters();
+ final Map<String, Object> parameters = params2.getParameters();
assertEquals("Exception flag not set", Boolean.TRUE,
parameters.get("throwExceptionOnMissing"));
assertEquals("IOFactory not set", factory, parameters.get("IOFactory"));
@@ -137,14 +137,14 @@ public class TestPropertiesBuilderParame
@Test
public void testSetIOFactoryProperty() throws ConfigurationException
{
- PropertiesConfiguration.IOFactory factory =
+ final PropertiesConfiguration.IOFactory factory =
new PropertiesConfiguration.DefaultIOFactory();
- ConfigurationBuilder<PropertiesConfiguration> builder =
+ final ConfigurationBuilder<PropertiesConfiguration> builder =
new FileBasedConfigurationBuilder<>(
PropertiesConfiguration.class)
.configure(params.setIOFactory(factory));
- PropertiesConfiguration config = builder.getConfiguration();
+ final PropertiesConfiguration config = builder.getConfiguration();
assertEquals("Wrong IO factory", factory, config.getIOFactory());
}
}
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingBuilderSupportListener.java Thu Sep 27 22:24:23 2018
@@ -40,19 +40,19 @@ public class TestReloadingBuilderSupport
@Test
public void testResetBuilderOnReloadingEvent()
{
- ReloadingDetector detector =
+ final ReloadingDetector detector =
EasyMock.createMock(ReloadingDetector.class);
EasyMock.expect(detector.isReloadingRequired()).andReturn(Boolean.TRUE);
EasyMock.replay(detector);
- ReloadingController controller = new ReloadingController(detector);
- BasicConfigurationBuilder<Configuration> builder =
+ final ReloadingController controller = new ReloadingController(detector);
+ final BasicConfigurationBuilder<Configuration> builder =
new BasicConfigurationBuilder<>(
PropertiesConfiguration.class);
- BuilderEventListenerImpl builderListener =
+ final BuilderEventListenerImpl builderListener =
new BuilderEventListenerImpl();
builder.addEventListener(ConfigurationBuilderEvent.ANY, builderListener);
- ReloadingBuilderSupportListener listener =
+ final ReloadingBuilderSupportListener listener =
ReloadingBuilderSupportListener.connect(builder, controller);
assertNotNull("No listener returned", listener);
controller.checkForReloading(null);
@@ -69,17 +69,17 @@ public class TestReloadingBuilderSupport
public void testResetReloadingStateOnResultCreation()
throws ConfigurationException
{
- ReloadingController controller =
+ final ReloadingController controller =
EasyMock.createMock(ReloadingController.class);
controller.addEventListener(EasyMock.eq(ReloadingEvent.ANY),
EasyMock.anyObject(EventListener.class));
controller.resetReloadingState();
EasyMock.replay(controller);
- BasicConfigurationBuilder<Configuration> builder =
+ final BasicConfigurationBuilder<Configuration> builder =
new BasicConfigurationBuilder<>(
PropertiesConfiguration.class);
- ReloadingBuilderSupportListener listener =
+ final ReloadingBuilderSupportListener listener =
ReloadingBuilderSupportListener.connect(builder, controller);
assertNotNull("No listener returned", listener);
builder.getConfiguration();
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestReloadingFileBasedConfigurationBuilder.java Thu Sep 27 22:24:23 2018
@@ -47,12 +47,12 @@ public class TestReloadingFileBasedConfi
@Test
public void testGetConfigurationNoLocation() throws ConfigurationException
{
- Map<String, Object> params = new HashMap<>();
+ final Map<String, Object> params = new HashMap<>();
params.put("throwExceptionOnMissing", Boolean.TRUE);
- ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new ReloadingFileBasedConfigurationBuilder<>(
PropertiesConfiguration.class, params);
- PropertiesConfiguration conf = builder.getConfiguration();
+ final PropertiesConfiguration conf = builder.getConfiguration();
assertTrue("Property not set", conf.isThrowExceptionOnMissing());
assertTrue("Not empty", conf.isEmpty());
}
@@ -64,14 +64,14 @@ public class TestReloadingFileBasedConfi
@Test
public void testCreateReloadingDetectorDefaultFactory() throws ConfigurationException
{
- ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new ReloadingFileBasedConfigurationBuilder<>(
PropertiesConfiguration.class);
- FileHandler handler = new FileHandler();
- FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
- long refreshDelay = 60000L;
+ final FileHandler handler = new FileHandler();
+ final FileBasedBuilderParametersImpl params = new FileBasedBuilderParametersImpl();
+ final long refreshDelay = 60000L;
params.setReloadingRefreshDelay(refreshDelay);
- FileHandlerReloadingDetector detector =
+ final FileHandlerReloadingDetector detector =
(FileHandlerReloadingDetector) builder.createReloadingDetector(
handler, params);
assertSame("Wrong file handler", handler, detector.getFileHandler());
@@ -86,18 +86,18 @@ public class TestReloadingFileBasedConfi
public void testCreateReloadingDetectoryCustomFactory()
throws ConfigurationException
{
- ReloadingDetector detector =
+ final ReloadingDetector detector =
EasyMock.createMock(ReloadingDetector.class);
- ReloadingDetectorFactory factory =
+ final ReloadingDetectorFactory factory =
EasyMock.createMock(ReloadingDetectorFactory.class);
- FileHandler handler = new FileHandler();
- FileBasedBuilderParametersImpl params =
+ final FileHandler handler = new FileHandler();
+ final FileBasedBuilderParametersImpl params =
new FileBasedBuilderParametersImpl();
EasyMock.expect(factory.createReloadingDetector(handler, params))
.andReturn(detector);
EasyMock.replay(detector, factory);
params.setReloadingDetectorFactory(factory);
- ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new ReloadingFileBasedConfigurationBuilder<>(
PropertiesConfiguration.class);
assertSame("Wrong detector", detector,
@@ -113,16 +113,16 @@ public class TestReloadingFileBasedConfi
public void testReloadingDetectorIsReloadingRequired()
throws ConfigurationException
{
- ReloadingDetector detector =
+ final ReloadingDetector detector =
EasyMock.createMock(ReloadingDetector.class);
EasyMock.expect(detector.isReloadingRequired()).andReturn(Boolean.TRUE);
EasyMock.expect(detector.isReloadingRequired())
.andReturn(Boolean.FALSE);
EasyMock.replay(detector);
- ReloadingFileBasedConfigurationBuilderTestImpl builder =
+ final ReloadingFileBasedConfigurationBuilderTestImpl builder =
new ReloadingFileBasedConfigurationBuilderTestImpl(detector);
builder.getConfiguration();
- ReloadingDetector ctrlDetector =
+ final ReloadingDetector ctrlDetector =
builder.getReloadingController().getDetector();
assertTrue("Wrong result (1)", ctrlDetector.isReloadingRequired());
assertFalse("Wrong result (2)", ctrlDetector.isReloadingRequired());
@@ -139,14 +139,14 @@ public class TestReloadingFileBasedConfi
public void testReloadingDetectorReloadingPerformed()
throws ConfigurationException
{
- ReloadingDetector detector =
+ final ReloadingDetector detector =
EasyMock.createMock(ReloadingDetector.class);
detector.reloadingPerformed();
EasyMock.replay(detector);
- ReloadingFileBasedConfigurationBuilderTestImpl builder =
+ final ReloadingFileBasedConfigurationBuilderTestImpl builder =
new ReloadingFileBasedConfigurationBuilderTestImpl(detector);
builder.getConfiguration();
- ReloadingDetector ctrlDetector =
+ final ReloadingDetector ctrlDetector =
builder.getReloadingController().getDetector();
ctrlDetector.reloadingPerformed();
EasyMock.verify(detector);
@@ -159,10 +159,10 @@ public class TestReloadingFileBasedConfi
@Test
public void testReloadingDetectorNoFileHandler()
{
- ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new ReloadingFileBasedConfigurationBuilder<>(
PropertiesConfiguration.class);
- ReloadingDetector ctrlDetector =
+ final ReloadingDetector ctrlDetector =
builder.getReloadingController().getDetector();
ctrlDetector.reloadingPerformed();
assertFalse("Wrong result", ctrlDetector.isReloadingRequired());
@@ -176,16 +176,16 @@ public class TestReloadingFileBasedConfi
public void testResetReloadingStateInGetConfiguration()
throws ConfigurationException
{
- ReloadingDetector detector =
+ final ReloadingDetector detector =
EasyMock.createMock(ReloadingDetector.class);
EasyMock.expect(detector.isReloadingRequired()).andReturn(Boolean.TRUE);
detector.reloadingPerformed();
EasyMock.replay(detector);
- ReloadingFileBasedConfigurationBuilderTestImpl builder =
+ final ReloadingFileBasedConfigurationBuilderTestImpl builder =
new ReloadingFileBasedConfigurationBuilderTestImpl(detector);
- PropertiesConfiguration config1 = builder.getConfiguration();
+ final PropertiesConfiguration config1 = builder.getConfiguration();
builder.getReloadingController().checkForReloading(null);
- PropertiesConfiguration config2 = builder.getConfiguration();
+ final PropertiesConfiguration config2 = builder.getConfiguration();
assertNotSame("No new configuration instance", config1, config2);
assertFalse("Still in reloading state", builder
.getReloadingController().isInReloadingState());
@@ -199,13 +199,13 @@ public class TestReloadingFileBasedConfi
@Test
public void testReloadingControllerEvents() throws ConfigurationException
{
- ReloadingDetector detector =
+ final ReloadingDetector detector =
EasyMock.createMock(ReloadingDetector.class);
EasyMock.expect(detector.isReloadingRequired()).andReturn(Boolean.TRUE);
- ReloadingFileBasedConfigurationBuilderTestImpl builder =
+ final ReloadingFileBasedConfigurationBuilderTestImpl builder =
new ReloadingFileBasedConfigurationBuilderTestImpl(detector);
EasyMock.replay(detector);
- BuilderEventListenerImpl listener = new BuilderEventListenerImpl();
+ final BuilderEventListenerImpl listener = new BuilderEventListenerImpl();
builder.addEventListener(ConfigurationBuilderEvent.RESET, listener);
builder.getConfiguration();
builder.getReloadingController().checkForReloading(null);
@@ -220,7 +220,7 @@ public class TestReloadingFileBasedConfi
@Test
public void testInitAllowFailOnInitFlag()
{
- ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+ final ReloadingFileBasedConfigurationBuilder<PropertiesConfiguration> builder =
new ReloadingFileBasedConfigurationBuilder<>(
PropertiesConfiguration.class, null, true);
assertTrue("Flag not set", builder.isAllowFailOnInit());
@@ -247,7 +247,7 @@ public class TestReloadingFileBasedConfi
* @param detector the mock detector
*/
public ReloadingFileBasedConfigurationBuilderTestImpl(
- ReloadingDetector detector)
+ final ReloadingDetector detector)
{
super(PropertiesConfiguration.class);
mockDetector = detector;
@@ -269,7 +269,7 @@ public class TestReloadingFileBasedConfi
*/
@Override
protected ReloadingDetector createReloadingDetector(
- FileHandler handler, FileBasedBuilderParametersImpl fbparams)
+ final FileHandler handler, final FileBasedBuilderParametersImpl fbparams)
{
handlerForDetector = handler;
return mockDetector;
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestXMLBuilderParametersImpl.java Thu Sep 27 22:24:23 2018
@@ -50,7 +50,7 @@ public class TestXMLBuilderParametersImp
@Test
public void testSetEntityResolver()
{
- EntityResolver resolver = EasyMock.createMock(EntityResolver.class);
+ final EntityResolver resolver = EasyMock.createMock(EntityResolver.class);
EasyMock.replay(resolver);
assertSame("Wrong result", params, params.setEntityResolver(resolver));
assertSame("Resolver not set", resolver, params.getEntityResolver());
@@ -64,7 +64,7 @@ public class TestXMLBuilderParametersImp
@Test
public void testSetDocumentBuilder()
{
- DocumentBuilder builder = EasyMock.createMock(DocumentBuilder.class);
+ final DocumentBuilder builder = EasyMock.createMock(DocumentBuilder.class);
EasyMock.replay(builder);
assertSame("Wrong result", params, params.setDocumentBuilder(builder));
assertSame("Builder not in parameters", builder, params.getParameters()
@@ -77,7 +77,7 @@ public class TestXMLBuilderParametersImp
@Test
public void testSetPublicID()
{
- String pubID = "testPublicID";
+ final String pubID = "testPublicID";
assertSame("Wrong result", params, params.setPublicID(pubID));
assertEquals("ID not in parameters", pubID,
params.getParameters().get("publicID"));
@@ -89,7 +89,7 @@ public class TestXMLBuilderParametersImp
@Test
public void testSetSystemID()
{
- String sysID = "testSystemID";
+ final String sysID = "testSystemID";
assertSame("Wrong result", params, params.setSystemID(sysID));
assertEquals("ID not in parameters", sysID,
params.getParameters().get("systemID"));
@@ -123,8 +123,8 @@ public class TestXMLBuilderParametersImp
@Test
public void testBeanPropertiesAccess() throws Exception
{
- EntityResolver resolver = EasyMock.createMock(EntityResolver.class);
- DocumentBuilder builder = EasyMock.createMock(DocumentBuilder.class);
+ final EntityResolver resolver = EasyMock.createMock(EntityResolver.class);
+ final DocumentBuilder builder = EasyMock.createMock(DocumentBuilder.class);
EasyMock.replay(resolver, builder);
BeanHelper.setProperty(params, "throwExceptionOnMissing",
Boolean.TRUE);
@@ -133,7 +133,7 @@ public class TestXMLBuilderParametersImp
BeanHelper.setProperty(params, "documentBuilder", builder);
assertEquals("Wrong file name", "test.xml", params.getFileHandler()
.getFileName());
- Map<String, Object> paramsMap = params.getParameters();
+ final Map<String, Object> paramsMap = params.getParameters();
assertEquals("Wrong exception flag", Boolean.TRUE,
paramsMap.get("throwExceptionOnMissing"));
assertSame("Wrong resolver", resolver, paramsMap.get("entityResolver"));
@@ -146,15 +146,15 @@ public class TestXMLBuilderParametersImp
@Test
public void testInheritFrom()
{
- EntityResolver resolver = EasyMock.createMock(EntityResolver.class);
- DocumentBuilder builder = EasyMock.createMock(DocumentBuilder.class);
+ final EntityResolver resolver = EasyMock.createMock(EntityResolver.class);
+ final DocumentBuilder builder = EasyMock.createMock(DocumentBuilder.class);
params.setDocumentBuilder(builder).setEntityResolver(resolver)
.setSchemaValidation(true).setValidating(true);
params.setThrowExceptionOnMissing(true);
- XMLBuilderParametersImpl params2 = new XMLBuilderParametersImpl();
+ final XMLBuilderParametersImpl params2 = new XMLBuilderParametersImpl();
params2.inheritFrom(params.getParameters());
- Map<String, Object> parameters = params2.getParameters();
+ final Map<String, Object> parameters = params2.getParameters();
assertEquals("Exception flag not set", Boolean.TRUE,
parameters.get("throwExceptionOnMissing"));
assertEquals("Entity resolver not set", resolver,
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/AbstractMultiFileConfigurationBuilderTest.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/AbstractMultiFileConfigurationBuilderTest.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/AbstractMultiFileConfigurationBuilderTest.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/AbstractMultiFileConfigurationBuilderTest.java Thu Sep 27 22:24:23 2018
@@ -49,7 +49,7 @@ public class AbstractMultiFileConfigurat
*
* @param id the ID of the managed configuration to load
*/
- protected static void switchToConfig(String id)
+ protected static void switchToConfig(final String id)
{
if (id != null)
{
@@ -73,7 +73,7 @@ public class AbstractMultiFileConfigurat
* @param index the index of the configuration to be accessed (valid indices
* are 1-3)
*/
- protected static void switchToConfig(int index)
+ protected static void switchToConfig(final int index)
{
switchToConfig("100" + index);
}
@@ -86,7 +86,7 @@ public class AbstractMultiFileConfigurat
*/
protected static ConfigurationInterpolator createInterpolator()
{
- ConfigurationInterpolator ci = new ConfigurationInterpolator();
+ final ConfigurationInterpolator ci = new ConfigurationInterpolator();
ci.registerLookup(DefaultLookups.SYSTEM_PROPERTIES.getPrefix(),
DefaultLookups.SYSTEM_PROPERTIES.getLookup());
return ci;
@@ -100,7 +100,7 @@ public class AbstractMultiFileConfigurat
* @return the test parameters
*/
protected static BasicBuilderParameters createTestBuilderParameters(
- BuilderParameters managedParams)
+ final BuilderParameters managedParams)
{
return new MultiFileBuilderParametersImpl().setFilePattern(PATTERN)
.setManagedBuilderParameters(managedParams)
Modified: commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java?rev=1842194&r1=1842193&r2=1842194&view=diff
==============================================================================
--- commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java (original)
+++ commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/combined/TestBaseConfigurationBuilderProvider.java Thu Sep 27 22:24:23 2018
@@ -51,9 +51,9 @@ public class TestBaseConfigurationBuilde
* @param reload a flag whether reload operations are supported
* @return the configuration object
*/
- private HierarchicalConfiguration<?> setUpConfig(boolean reload)
+ private HierarchicalConfiguration<?> setUpConfig(final boolean reload)
{
- HierarchicalConfiguration<?> config = new BaseHierarchicalConfiguration();
+ final HierarchicalConfiguration<?> config = new BaseHierarchicalConfiguration();
config.addProperty(CombinedConfigurationBuilder.ATTR_RELOAD,
Boolean.valueOf(reload));
config.addProperty("[@throwExceptionOnMissing]", Boolean.TRUE);
@@ -74,14 +74,14 @@ public class TestBaseConfigurationBuilde
* @return the declaration
*/
private ConfigurationDeclaration createDeclaration(
- HierarchicalConfiguration<?> declConfig)
+ final HierarchicalConfiguration<?> declConfig)
{
- CombinedConfigurationBuilder parentBuilder =
+ final CombinedConfigurationBuilder parentBuilder =
new CombinedConfigurationBuilder()
{
@Override
protected void initChildBuilderParameters(
- BuilderParameters params)
+ final BuilderParameters params)
{
// set a property value; this should be overridden by
// child builders
@@ -92,11 +92,11 @@ public class TestBaseConfigurationBuilde
}
}
};
- ConfigurationDeclaration decl =
+ final ConfigurationDeclaration decl =
new ConfigurationDeclaration(parentBuilder, declConfig)
{
@Override
- protected Object interpolate(Object value)
+ protected Object interpolate(final Object value)
{
return value;
}
@@ -127,19 +127,19 @@ public class TestBaseConfigurationBuilde
* @throws ConfigurationException if an error occurs
*/
private ConfigurationBuilder<? extends Configuration> checkBuilder(
- boolean reload) throws ConfigurationException
+ final boolean reload) throws ConfigurationException
{
- HierarchicalConfiguration<?> declConfig = setUpConfig(reload);
- ConfigurationDeclaration decl = createDeclaration(declConfig);
- ConfigurationBuilder<? extends Configuration> builder =
+ final HierarchicalConfiguration<?> declConfig = setUpConfig(reload);
+ final ConfigurationDeclaration decl = createDeclaration(declConfig);
+ final ConfigurationBuilder<? extends Configuration> builder =
createProvider().getConfigurationBuilder(decl);
- Configuration config = builder.getConfiguration();
+ final Configuration config = builder.getConfiguration();
assertEquals("Wrong configuration class",
PropertiesConfiguration.class, config.getClass());
- PropertiesConfiguration pconfig = (PropertiesConfiguration) config;
+ final PropertiesConfiguration pconfig = (PropertiesConfiguration) config;
assertTrue("Wrong exception flag",
pconfig.isThrowExceptionOnMissing());
- DefaultListDelimiterHandler listHandler =
+ final DefaultListDelimiterHandler listHandler =
(DefaultListDelimiterHandler) pconfig.getListDelimiterHandler();
assertEquals("Wrong list delimiter", ';', listHandler.getDelimiter());
assertTrue("Configuration not loaded",
@@ -173,7 +173,7 @@ public class TestBaseConfigurationBuilde
@Test
public void testGetBuilderNotReloading() throws ConfigurationException
{
- ConfigurationBuilder<? extends Configuration> builder =
+ final ConfigurationBuilder<? extends Configuration> builder =
checkBuilder(false);
assertEquals("Wrong builder class",
FileBasedConfigurationBuilder.class, builder.getClass());
@@ -185,7 +185,7 @@ public class TestBaseConfigurationBuilde
@Test
public void testGetBuilderReloading() throws ConfigurationException
{
- ConfigurationBuilder<? extends Configuration> builder =
+ final ConfigurationBuilder<? extends Configuration> builder =
checkBuilder(true);
assertEquals("Wrong builder class",
ReloadingFileBasedConfigurationBuilder.class,
@@ -200,14 +200,14 @@ public class TestBaseConfigurationBuilde
public void testGetReloadingBuilderNotSupported()
throws ConfigurationException
{
- BaseConfigurationBuilderProvider provider =
+ final BaseConfigurationBuilderProvider provider =
new BaseConfigurationBuilderProvider(
FileBasedConfigurationBuilder.class.getName(), null,
PropertiesConfiguration.class.getName(),
Arrays.asList(FileBasedBuilderParametersImpl.class
.getName()));
- HierarchicalConfiguration<?> declConfig = setUpConfig(true);
- ConfigurationDeclaration decl = createDeclaration(declConfig);
+ final HierarchicalConfiguration<?> declConfig = setUpConfig(true);
+ final ConfigurationDeclaration decl = createDeclaration(declConfig);
provider.getConfigurationBuilder(decl);
}
@@ -220,16 +220,16 @@ public class TestBaseConfigurationBuilde
* declaration
* @throws ConfigurationException if an error occurs
*/
- private void checkAllowFailOnInit(boolean expFlag, String... props)
+ private void checkAllowFailOnInit(final boolean expFlag, final String... props)
throws ConfigurationException
{
- HierarchicalConfiguration<?> declConfig = setUpConfig(false);
- for (String key : props)
+ final HierarchicalConfiguration<?> declConfig = setUpConfig(false);
+ for (final String key : props)
{
declConfig.addProperty(key, Boolean.TRUE);
}
- ConfigurationDeclaration decl = createDeclaration(declConfig);
- BasicConfigurationBuilder<? extends Configuration> builder =
+ final ConfigurationDeclaration decl = createDeclaration(declConfig);
+ final BasicConfigurationBuilder<? extends Configuration> builder =
(BasicConfigurationBuilder<? extends Configuration>) createProvider()
.getConfigurationBuilder(decl);
assertEquals("Wrong flag value", expFlag, builder.isAllowFailOnInit());
@@ -274,7 +274,7 @@ public class TestBaseConfigurationBuilde
@Test
public void testInitNoParameterClasses()
{
- BaseConfigurationBuilderProvider provider =
+ final BaseConfigurationBuilderProvider provider =
new BaseConfigurationBuilderProvider(
BasicConfigurationBuilder.class.getName(), null,
PropertiesConfiguration.class.getName(), null);
@@ -288,7 +288,7 @@ public class TestBaseConfigurationBuilde
@Test(expected = UnsupportedOperationException.class)
public void testGetParameterClassesModify()
{
- BaseConfigurationBuilderProvider provider =
+ final BaseConfigurationBuilderProvider provider =
new BaseConfigurationBuilderProvider(
BasicConfigurationBuilder.class.getName(), null,
PropertiesConfiguration.class.getName(),