Author: oheger
Date: Sun Mar 20 18:40:47 2016
New Revision: 1735895
URL: http://svn.apache.org/viewvc?rev=1735895&view=rev
Log:
[CONFIGURATION-621] Moved ConfigurationLogger class to io package.
This breaks a number of cyclic dependencies between packages that
were caused by this class.
Added:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/ConfigurationLogger.java
- copied, changed from r1735783,
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationLogger.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestConfigurationLogger.java
- copied, changed from r1735783,
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationLogger.java
Removed:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationLogger.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationLogger.java
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileSystem.java
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestDefaultFileSystem.java
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java?rev=1735895&r1=1735894&r2=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/AbstractConfiguration.java
Sun Mar 20 18:40:47 2016
@@ -42,6 +42,7 @@ import org.apache.commons.configuration2
import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration2.interpol.InterpolatorSpecification;
import org.apache.commons.configuration2.interpol.Lookup;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.sync.LockMode;
import org.apache.commons.configuration2.sync.NoOpSynchronizer;
import org.apache.commons.configuration2.sync.Synchronizer;
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java?rev=1735895&r1=1735894&r2=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DatabaseConfiguration.java
Sun Mar 20 18:40:47 2016
@@ -34,6 +34,7 @@ import org.apache.commons.configuration2
import org.apache.commons.configuration2.event.ConfigurationErrorEvent;
import org.apache.commons.configuration2.event.ConfigurationEvent;
import org.apache.commons.configuration2.event.EventType;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.lang3.StringUtils;
/**
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java?rev=1735895&r1=1735894&r2=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/DynamicCombinedConfiguration.java
Sun Mar 20 18:40:47 2016
@@ -35,6 +35,7 @@ import org.apache.commons.configuration2
import org.apache.commons.configuration2.event.EventType;
import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration2.interpol.Lookup;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.tree.ExpressionEngine;
import org.apache.commons.configuration2.tree.ImmutableNode;
import org.apache.commons.configuration2.tree.NodeCombiner;
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java?rev=1735895&r1=1735894&r2=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/JNDIConfiguration.java
Sun Mar 20 18:40:47 2016
@@ -32,6 +32,7 @@ import java.util.List;
import java.util.Set;
import org.apache.commons.configuration2.event.ConfigurationErrorEvent;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.lang3.StringUtils;
/**
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java?rev=1735895&r1=1735894&r2=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/XMLConfiguration.java
Sun Mar 20 18:40:47 2016
@@ -42,6 +42,7 @@ import java.util.Map;
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.io.FileLocator;
import org.apache.commons.configuration2.io.FileLocatorAware;
import org.apache.commons.configuration2.io.InputStreamSupport;
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java?rev=1735895&r1=1735894&r2=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderParameters.java
Sun Mar 20 18:40:47 2016
@@ -22,7 +22,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.configuration2.ConfigurationDecoder;
-import org.apache.commons.configuration2.ConfigurationLogger;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.beanutils.BeanHelper;
import org.apache.commons.configuration2.convert.ConversionHandler;
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java?rev=1735895&r1=1735894&r2=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/builder/BasicBuilderProperties.java
Sun Mar 20 18:40:47 2016
@@ -20,7 +20,7 @@ import java.util.Collection;
import java.util.Map;
import org.apache.commons.configuration2.ConfigurationDecoder;
-import org.apache.commons.configuration2.ConfigurationLogger;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.beanutils.BeanHelper;
import org.apache.commons.configuration2.convert.ConversionHandler;
import org.apache.commons.configuration2.convert.ListDelimiterHandler;
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java?rev=1735895&r1=1735894&r2=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/interpol/ExprLookup.java
Sun Mar 20 18:40:47 2016
@@ -18,7 +18,7 @@ package org.apache.commons.configuration
import java.util.ArrayList;
-import org.apache.commons.configuration2.ConfigurationLogger;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.ex.ConfigurationRuntimeException;
import org.apache.commons.jexl2.Expression;
import org.apache.commons.jexl2.JexlContext;
Copied:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/ConfigurationLogger.java
(from r1735783,
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationLogger.java)
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/ConfigurationLogger.java?p2=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/ConfigurationLogger.java&p1=commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationLogger.java&r1=1735783&r2=1735895&rev=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/ConfigurationLogger.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/ConfigurationLogger.java
Sun Mar 20 18:40:47 2016
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.configuration2;
+package org.apache.commons.configuration2.io;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -30,7 +30,8 @@ import org.apache.commons.logging.impl.N
* useful for diagnostic purposes. Therefore, <em>Commons Configuration</em>
* produces some logging output. As concrete projects have different
* requirements on the amount and detail of logging, there is a way of
- * configuring logging: All classes derived from {@link AbstractConfiguration}
+ * configuring logging: All classes derived from
+ * {@link org.apache.commons.configuration2.AbstractConfiguration}
* can be assigned a logger which is then used for all log statements
generated.
* </p>
* <p>
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileSystem.java?rev=1735895&r1=1735894&r2=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileSystem.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/io/FileSystem.java
Sun Mar 20 18:40:47 2016
@@ -22,7 +22,6 @@ import java.io.OutputStream;
import java.net.MalformedURLException;
import java.net.URL;
-import org.apache.commons.configuration2.ConfigurationLogger;
import org.apache.commons.configuration2.ex.ConfigurationException;
/**
Modified:
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java?rev=1735895&r1=1735894&r2=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
(original)
+++
commons/proper/configuration/trunk/src/main/java/org/apache/commons/configuration2/resolver/CatalogResolver.java
Sun Mar 20 18:40:47 2016
@@ -23,7 +23,7 @@ import java.net.URL;
import java.net.URLConnection;
import java.util.Vector;
-import org.apache.commons.configuration2.ConfigurationLogger;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration2.io.FileLocator;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java?rev=1735895&r1=1735894&r2=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfiguration.java
Sun Mar 20 18:40:47 2016
@@ -32,6 +32,7 @@ import java.util.List;
import junitx.framework.ListAssert;
import org.apache.commons.configuration2.ex.ConversionException;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.junit.Test;
/**
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java?rev=1735895&r1=1735894&r2=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestAbstractConfigurationBasicFeatures.java
Sun Mar 20 18:40:47 2016
@@ -16,13 +16,10 @@
*/
package org.apache.commons.configuration2;
-import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
@@ -44,7 +41,6 @@ import org.apache.commons.configuration2
import org.apache.commons.configuration2.event.EventType;
import org.apache.commons.configuration2.interpol.ConfigurationInterpolator;
import org.apache.commons.configuration2.interpol.Lookup;
-import org.apache.commons.logging.impl.NoOpLog;
import org.easymock.EasyMock;
import org.junit.Test;
@@ -66,42 +62,6 @@ public class TestAbstractConfigurationBa
private static final int PROP_COUNT = 12;
/**
- * Tests the logger set per default.
- */
- @Test
- public void testDefaultLogger()
- {
- AbstractConfiguration config = new BaseConfiguration();
- assertThat("Wrong default logger", config.getLogger().getLog(),
instanceOf(NoOpLog.class));
- }
-
- /**
- * Tests whether the logger can be set.
- */
- @Test
- public void testSetLogger()
- {
- ConfigurationLogger logger = new ConfigurationLogger(getClass());
- AbstractConfiguration config = new BaseConfiguration();
-
- config.setLogger(logger);
- assertThat("Logger not set", config.getLogger(), sameInstance(logger));
- }
-
- /**
- * Tests that the logger can be disabled by setting it to null.
- */
- @Test
- public void testSetLoggerNull()
- {
- AbstractConfiguration config = new BaseConfiguration();
- config.setLogger(new ConfigurationLogger(getClass()));
-
- config.setLogger(null);
- assertThat("Logger not disabled", config.getLogger().getLog(),
instanceOf(NoOpLog.class));
- }
-
- /**
* Tests the clear() implementation of AbstractConfiguration if the
iterator
* returned by getKeys() does not support the remove() operation.
*/
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java?rev=1735895&r1=1735894&r2=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestCatalogResolver.java
Sun Mar 20 18:40:47 2016
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertSame;
import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.io.FileHandler;
import org.apache.commons.configuration2.resolver.CatalogResolver;
import org.junit.After;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java?rev=1735895&r1=1735894&r2=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/builder/TestBasicBuilderParameters.java
Sun Mar 20 18:40:47 2016
@@ -30,7 +30,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.commons.configuration2.ConfigurationDecoder;
-import org.apache.commons.configuration2.ConfigurationLogger;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.beanutils.BeanHelper;
import org.apache.commons.configuration2.convert.ConversionHandler;
import org.apache.commons.configuration2.convert.DefaultConversionHandler;
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java?rev=1735895&r1=1735894&r2=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/interpol/TestExprLookup.java
Sun Mar 20 18:40:47 2016
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertTru
import java.io.File;
import org.apache.commons.configuration2.ConfigurationAssert;
-import org.apache.commons.configuration2.ConfigurationLogger;
+import org.apache.commons.configuration2.io.ConfigurationLogger;
import org.apache.commons.configuration2.XMLConfiguration;
import org.apache.commons.configuration2.io.FileHandler;
import org.apache.commons.logging.Log;
Copied:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestConfigurationLogger.java
(from r1735783,
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationLogger.java)
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestConfigurationLogger.java?p2=commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestConfigurationLogger.java&p1=commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationLogger.java&r1=1735783&r2=1735895&rev=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/TestConfigurationLogger.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestConfigurationLogger.java
Sun Mar 20 18:40:47 2016
@@ -15,9 +15,10 @@
* limitations under the License.
*/
-package org.apache.commons.configuration2;
+package org.apache.commons.configuration2.io;
import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -25,6 +26,8 @@ import static org.junit.Assert.assertNul
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
+import org.apache.commons.configuration2.AbstractConfiguration;
+import org.apache.commons.configuration2.BaseConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.impl.NoOpLog;
import org.easymock.EasyMock;
@@ -227,4 +230,40 @@ public class TestConfigurationLogger
logger.info(MSG);
assertEquals("Message not logged", MSG, buf.toString());
}
+
+ /**
+ * Tests the logger set per default.
+ */
+ @Test
+ public void testAbstractConfigurationDefaultLogger()
+ {
+ AbstractConfiguration config = new BaseConfiguration();
+ assertThat("Wrong default logger", config.getLogger().getLog(),
instanceOf(NoOpLog.class));
+ }
+
+ /**
+ * Tests whether the logger can be set.
+ */
+ @Test
+ public void testAbstractConfigurationSetLogger()
+ {
+ ConfigurationLogger logger = new ConfigurationLogger(getClass());
+ AbstractConfiguration config = new BaseConfiguration();
+
+ config.setLogger(logger);
+ assertThat("Logger not set", config.getLogger(), sameInstance(logger));
+ }
+
+ /**
+ * Tests that the logger can be disabled by setting it to null.
+ */
+ @Test
+ public void testAbstractConfigurationSetLoggerNull()
+ {
+ AbstractConfiguration config = new BaseConfiguration();
+ config.setLogger(new ConfigurationLogger(getClass()));
+
+ config.setLogger(null);
+ assertThat("Logger not disabled", config.getLogger().getLog(),
instanceOf(NoOpLog.class));
+ }
}
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestDefaultFileSystem.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestDefaultFileSystem.java?rev=1735895&r1=1735894&r2=1735895&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestDefaultFileSystem.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration2/io/TestDefaultFileSystem.java
Sun Mar 20 18:40:47 2016
@@ -21,7 +21,6 @@ import static org.junit.Assert.assertSam
import java.io.File;
-import org.apache.commons.configuration2.ConfigurationLogger;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.junit.Before;
import org.junit.Test;
