This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-configuration.git
commit de43676862e6436064492c0bc923ec092d536095
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Tue May 7 09:53:48 2024 -0400
Better test method and ivar names
---
.../DatabaseConfigurationTestHelper.java | 23 +++++++++++-----------
.../configuration2/TestDatabaseConfiguration.java | 4 ++--
.../apache/commons/configuration2/test/HsqlDB.java | 1 -
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java
b/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java
index 1110dcee..9ac3c285 100644
---
a/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java
+++
b/src/test/java/org/apache/commons/configuration2/DatabaseConfigurationTestHelper.java
@@ -76,7 +76,7 @@ public class DatabaseConfigurationTestHelper {
private HsqlDB hsqlDB;
/** The data source. */
- private DataSource datasource;
+ private DataSource dataSource;
/**
* The auto-commit mode for the configuration instances created by this
helper.
@@ -92,7 +92,8 @@ public class DatabaseConfigurationTestHelper {
* @return the newly created configuration instance
* @throws ConfigurationException if an error occurs
*/
- public <T extends DatabaseConfiguration> T createConfig(final Class<T>
configCls, final DatabaseBuilderParameters params) throws
ConfigurationException {
+ public <T extends DatabaseConfiguration> T createConfiguration(final
Class<T> configCls, final DatabaseBuilderParameters params)
+ throws ConfigurationException {
return new
BasicConfigurationBuilder<>(configCls).configure(params).getConfiguration();
}
@@ -101,15 +102,15 @@ public class DatabaseConfigurationTestHelper {
*
* @return the {@code DataSource}
*/
- public DataSource getDatasource() {
- if (datasource == null) {
+ public DataSource getDataSource() {
+ if (dataSource == null) {
try {
- datasource = setUpDataSource();
+ dataSource = setUpDataSource();
} catch (final Exception ex) {
throw new ConfigurationRuntimeException("Could not create data
source", ex);
}
}
- return datasource;
+ return dataSource;
}
/**
@@ -160,7 +161,7 @@ public class DatabaseConfigurationTestHelper {
* @throws ConfigurationException if an error occurs
*/
public <T extends DatabaseConfiguration> T setUpConfig(final Class<T>
configCls) throws ConfigurationException {
- return createConfig(configCls, setUpDefaultParameters());
+ return createConfiguration(configCls, setUpDefaultParameters());
}
/**
@@ -200,7 +201,7 @@ public class DatabaseConfigurationTestHelper {
* @return the parameters object
*/
public DatabaseBuilderParameters setUpDefaultParameters() {
- return new
Parameters().database().setDataSource(getDatasource()).setTable(TABLE).setKeyColumn(COL_KEY).setValueColumn(COL_VALUE)
+ return new
Parameters().database().setDataSource(getDataSource()).setTable(TABLE).setKeyColumn(COL_KEY).setValueColumn(COL_VALUE)
.setAutoCommit(isAutoCommit());
}
@@ -224,7 +225,7 @@ public class DatabaseConfigurationTestHelper {
* @throws ConfigurationException if an error occurs
*/
public <T extends DatabaseConfiguration> T setUpMultiConfig(final Class<T>
configCls, final String configName) throws ConfigurationException {
- return createConfig(configCls, setUpMultiParameters(configName));
+ return createConfiguration(configCls,
setUpMultiParameters(configName));
}
/**
@@ -245,8 +246,8 @@ public class DatabaseConfigurationTestHelper {
* @throws Exception if an error occurs
*/
public void tearDown() throws Exception {
- if (datasource != null) {
- datasource.getConnection().close();
+ if (dataSource != null) {
+ dataSource.getConnection().close();
}
hsqlDB.close();
}
diff --git
a/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java
b/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java
index 845e1024..e2a6df2d 100644
---
a/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java
+++
b/src/test/java/org/apache/commons/configuration2/TestDatabaseConfiguration.java
@@ -385,7 +385,7 @@ public class TestDatabaseConfiguration {
@Test
public void testGetKeys() throws ConfigurationException {
final DatabaseBuilderParameters params =
helper.setUpDefaultParameters().setTable("configurationList");
- final Configuration config1 =
helper.createConfig(DatabaseConfiguration.class, params);
+ final Configuration config1 =
helper.createConfiguration(DatabaseConfiguration.class, params);
final Iterator<String> i = config1.getKeys();
assertTrue(i.hasNext());
final Object key = i.next();
@@ -429,7 +429,7 @@ public class TestDatabaseConfiguration {
@Test
public void testGetList() throws ConfigurationException {
final DatabaseBuilderParameters params =
helper.setUpDefaultParameters().setTable("configurationList");
- final Configuration config1 =
helper.createConfig(DatabaseConfiguration.class, params);
+ final Configuration config1 =
helper.createConfiguration(DatabaseConfiguration.class, params);
final List<Object> list = config1.getList("key3");
assertEquals(3, list.size());
}
diff --git a/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java
b/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java
index c6004446..8f3cf21e 100644
--- a/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java
+++ b/src/test/java/org/apache/commons/configuration2/test/HsqlDB.java
@@ -30,7 +30,6 @@ import org.apache.commons.logging.LogFactory;
/**
* Stolen from Turbine
*/
-
public class HsqlDB {
private static final Log LOG = LogFactory.getLog(HsqlDB.class);
