Author: oheger
Date: Thu Dec 29 20:55:07 2011
New Revision: 1225648
URL: http://svn.apache.org/viewvc?rev=1225648&view=rev
Log:
Converted tests to JUnit 4, fixed warnings.
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/AbstractTestConfigurationEvents.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/AbstractTestFileConfigurationEvents.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/ConfigurationListenerTestImpl.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestDatabaseConfigurationEvents.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestHierarchicalConfigurationEvents.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestMapConfigurationEvents.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestPropertiesConfigurationEvents.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestSubsetConfigurationEvents.java
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestXMLConfigurationEvents.java
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/AbstractTestConfigurationEvents.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/AbstractTestConfigurationEvents.java?rev=1225648&r1=1225647&r2=1225648&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/AbstractTestConfigurationEvents.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/AbstractTestConfigurationEvents.java
Thu Dec 29 20:55:07 2011
@@ -17,15 +17,15 @@
package org.apache.commons.configuration.event;
-import junit.framework.TestCase;
-
import org.apache.commons.configuration.AbstractConfiguration;
+import org.junit.Before;
+import org.junit.Test;
/**
* Base class for testing events generated by configuration classes derived
from
* AbstractConfiguration. This class implements a couple of tests related to
* event generation. Concrete sub classes only have to implement the
- * <code>createConfiguration()</code> method for creating an instance of a
+ * {@code createConfiguration()} method for creating an instance of a
* specific configuration class. Because tests for detail events depend on a
* concrete implementation an exact sequence of events cannot be checked.
* Instead the corresponding test methods check whether the enclosing events
@@ -33,7 +33,7 @@ import org.apache.commons.configuration.
*
* @version $Id$
*/
-public abstract class AbstractTestConfigurationEvents extends TestCase
+public abstract class AbstractTestConfigurationEvents
{
/** Constant for a test property name. */
static final String TEST_PROPNAME = "event.test";
@@ -50,9 +50,9 @@ public abstract class AbstractTestConfig
/** A test event listener. */
protected ConfigurationListenerTestImpl l;
- protected void setUp() throws Exception
+ @Before
+ public void setUp() throws Exception
{
- super.setUp();
config = createConfiguration();
config.addProperty(EXIST_PROPERTY, "existing value");
l = new ConfigurationListenerTestImpl(config);
@@ -69,6 +69,7 @@ public abstract class AbstractTestConfig
/**
* Tests events generated by addProperty().
*/
+ @Test
public void testAddPropertyEvent()
{
config.addProperty(TEST_PROPNAME, TEST_PROPVALUE);
@@ -82,6 +83,7 @@ public abstract class AbstractTestConfig
/**
* Tests events generated by addProperty() when detail events are enabled.
*/
+ @Test
public void testAddPropertyEventWithDetails()
{
config.setDetailEvents(true);
@@ -98,6 +100,7 @@ public abstract class AbstractTestConfig
/**
* Tests events generated by clearProperty().
*/
+ @Test
public void testClearPropertyEvent()
{
config.clearProperty(EXIST_PROPERTY);
@@ -111,6 +114,7 @@ public abstract class AbstractTestConfig
/**
* Tests events generated by clearProperty() when detail events are
enabled.
*/
+ @Test
public void testClearPropertyEventWithDetails()
{
config.setDetailEvents(true);
@@ -127,6 +131,7 @@ public abstract class AbstractTestConfig
/**
* Tests events generated by setProperty().
*/
+ @Test
public void testSetPropertyEvent()
{
config.setProperty(EXIST_PROPERTY, TEST_PROPVALUE);
@@ -140,6 +145,7 @@ public abstract class AbstractTestConfig
/**
* Tests events generated by setProperty() when detail events are enabled.
*/
+ @Test
public void testSetPropertyEventWithDetails()
{
config.setDetailEvents(true);
@@ -156,6 +162,7 @@ public abstract class AbstractTestConfig
/**
* Tests the events generated by the clear() method.
*/
+ @Test
public void testClearEvent()
{
config.clear();
@@ -168,6 +175,7 @@ public abstract class AbstractTestConfig
* Tests the events generated by the clear method when detail events are
* enabled.
*/
+ @Test
public void testClearEventWithDetails()
{
config.setDetailEvents(true);
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/AbstractTestFileConfigurationEvents.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/AbstractTestFileConfigurationEvents.java?rev=1225648&r1=1225647&r2=1225648&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/AbstractTestFileConfigurationEvents.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/AbstractTestFileConfigurationEvents.java
Thu Dec 29 20:55:07 2011
@@ -23,6 +23,7 @@ import org.apache.commons.configuration.
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.FileConfiguration;
import org.apache.commons.configuration.reloading.ReloadingStrategy;
+import org.junit.Test;
/**
* A base test class that can be used for testing file-based configurations.
@@ -64,6 +65,7 @@ public abstract class AbstractTestFileCo
/**
* Tests events generated by the reload() method.
*/
+ @Test
public void testReloadEvent() throws ConfigurationException, IOException
{
setUpFileConfiguration();
@@ -79,6 +81,7 @@ public abstract class AbstractTestFileCo
* Tests events generated by the reload() method when detail events are
* enabled.
*/
+ @Test
public void testReloadEventWithDetails() throws ConfigurationException,
IOException
{
@@ -98,6 +101,7 @@ public abstract class AbstractTestFileCo
* Tests accessing a property during a reload event to ensure that no
* infinite loops are possible.
*/
+ @Test
public void testAccessPropertiesOnReload() throws ConfigurationException,
IOException
{
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/ConfigurationListenerTestImpl.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/ConfigurationListenerTestImpl.java?rev=1225648&r1=1225647&r2=1225648&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/ConfigurationListenerTestImpl.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/ConfigurationListenerTestImpl.java
Thu Dec 29 20:55:07 2011
@@ -16,6 +16,10 @@
*/
package org.apache.commons.configuration.event;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
import java.util.LinkedList;
import java.util.List;
@@ -34,7 +38,7 @@ public class ConfigurationListenerTestIm
private final Object expectedSource;
/** Stores the received events. */
- private final List events;
+ private final List<ConfigurationEvent> events;
/**
* Creates a new instance of {@code ConfigurationListenerTestImpl} and sets
@@ -46,7 +50,7 @@ public class ConfigurationListenerTestIm
public ConfigurationListenerTestImpl(Object source)
{
expectedSource = source;
- events = new LinkedList();
+ events = new LinkedList<ConfigurationEvent>();
}
public void configurationChanged(ConfigurationEvent event)
@@ -55,14 +59,13 @@ public class ConfigurationListenerTestIm
}
/**
- * Checks if at least <code>minEvents</code> events have been received.
+ * Checks if at least {@code minEvents} events have been received.
*
* @param minEvents the minimum number of expected events
*/
public void checkEventCount(int minEvents)
{
- AbstractTestConfigurationEvents.assertTrue("Too view events received",
- events.size() >= minEvents);
+ assertTrue("Too view events received", events.size() >= minEvents);
}
/**
@@ -77,17 +80,14 @@ public class ConfigurationListenerTestIm
boolean before)
{
ConfigurationEvent e = nextEvent(type);
- AbstractTestConfigurationEvents.assertEquals("Wrong property name",
- propName, e.getPropertyName());
- AbstractTestConfigurationEvents.assertEquals("Wrong property value",
- propValue, e.getPropertyValue());
- AbstractTestConfigurationEvents.assertEquals("Wrong before flag",
- before, e.isBeforeUpdate());
+ assertEquals("Wrong property name", propName, e.getPropertyName());
+ assertEquals("Wrong property value", propValue, e.getPropertyValue());
+ assertEquals("Wrong before flag", before, e.isBeforeUpdate());
}
/**
* Returns the next received event and checks for the expected type. This
- * method can be used instead of <code>checkEvent()</code> for comparing
+ * method can be used instead of {@code checkEvent()} for comparing
* complex event values.
*
* @param expectedType the expected type of the event
@@ -95,16 +95,13 @@ public class ConfigurationListenerTestIm
*/
public ConfigurationEvent nextEvent(int expectedType)
{
- AbstractTestConfigurationEvents.assertFalse("Too few events received",
- events.isEmpty());
- ConfigurationEvent e = (ConfigurationEvent) events.remove(0);
+ assertFalse("Too few events received", events.isEmpty());
+ ConfigurationEvent e = events.remove(0);
if (expectedSource != null)
{
- AbstractTestConfigurationEvents.assertEquals("Wrong event source",
- expectedSource, e.getSource());
+ assertEquals("Wrong event source", expectedSource, e.getSource());
}
- AbstractTestConfigurationEvents.assertEquals("Wrong event type",
- expectedType, e.getType());
+ assertEquals("Wrong event type", expectedType, e.getType());
return e;
}
@@ -119,9 +116,8 @@ public class ConfigurationListenerTestIm
{
while (events.size() > 1)
{
- ConfigurationEvent e = (ConfigurationEvent) events.remove(0);
- AbstractTestConfigurationEvents.assertTrue(
- "Found end event in details", type != e.getType());
+ ConfigurationEvent e = events.remove(0);
+ assertTrue("Found end event in details", type != e.getType());
}
}
@@ -130,7 +126,6 @@ public class ConfigurationListenerTestIm
*/
public void done()
{
- AbstractTestConfigurationEvents.assertTrue("Too many events received",
- events.isEmpty());
+ assertTrue("Too many events received", events.isEmpty());
}
}
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestDatabaseConfigurationEvents.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestDatabaseConfigurationEvents.java?rev=1225648&r1=1225647&r2=1225648&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestDatabaseConfigurationEvents.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestDatabaseConfigurationEvents.java
Thu Dec 29 20:55:07 2011
@@ -18,6 +18,8 @@ package org.apache.commons.configuration
import org.apache.commons.configuration.AbstractConfiguration;
import org.apache.commons.configuration.DatabaseConfigurationTestHelper;
+import org.junit.After;
+import org.junit.Before;
/**
* A test class for the events generated by DatabaseConfiguration.
@@ -30,7 +32,9 @@ public class TestDatabaseConfigurationEv
/** The test helper. */
private DatabaseConfigurationTestHelper helper;
- protected void setUp() throws Exception
+ @Override
+ @Before
+ public void setUp() throws Exception
{
helper = new DatabaseConfigurationTestHelper();
helper.setUp();
@@ -38,12 +42,13 @@ public class TestDatabaseConfigurationEv
super.setUp();
}
- protected void tearDown() throws Exception
+ @After
+ public void tearDown() throws Exception
{
helper.tearDown();
- super.tearDown();
}
+ @Override
protected AbstractConfiguration createConfiguration()
{
return helper.setUpConfig();
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestHierarchicalConfigurationEvents.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestHierarchicalConfigurationEvents.java?rev=1225648&r1=1225647&r2=1225648&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestHierarchicalConfigurationEvents.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestHierarchicalConfigurationEvents.java
Thu Dec 29 20:55:07 2011
@@ -16,13 +16,18 @@
*/
package org.apache.commons.configuration.event;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.Collection;
import org.apache.commons.configuration.AbstractConfiguration;
import org.apache.commons.configuration.HierarchicalConfiguration;
import org.apache.commons.configuration.SubnodeConfiguration;
+import org.apache.commons.configuration.tree.ConfigurationNode;
import org.apache.commons.configuration.tree.DefaultConfigurationNode;
+import org.junit.Test;
/**
* Test class for the events generated by hierarchical configurations.
@@ -32,6 +37,7 @@ import org.apache.commons.configuration.
public class TestHierarchicalConfigurationEvents extends
AbstractTestConfigurationEvents
{
+ @Override
protected AbstractConfiguration createConfiguration()
{
return new HierarchicalConfiguration();
@@ -40,11 +46,12 @@ public class TestHierarchicalConfigurati
/**
* Tests events generated by the clearTree() method.
*/
+ @Test
public void testClearTreeEvent()
{
HierarchicalConfiguration hc = (HierarchicalConfiguration) config;
String key = EXIST_PROPERTY.substring(0, EXIST_PROPERTY.indexOf('.'));
- Collection nodes = hc.getExpressionEngine()
+ Collection<ConfigurationNode> nodes = hc.getExpressionEngine()
.query(hc.getRootNode(), key);
hc.clearTree(key);
l.checkEvent(HierarchicalConfiguration.EVENT_CLEAR_TREE, key, null,
@@ -57,10 +64,11 @@ public class TestHierarchicalConfigurati
/**
* Tests events generated by the addNodes() method.
*/
+ @Test
public void testAddNodesEvent()
{
HierarchicalConfiguration hc = (HierarchicalConfiguration) config;
- Collection nodes = new ArrayList(1);
+ Collection<ConfigurationNode> nodes = new
ArrayList<ConfigurationNode>(1);
nodes.add(new DefaultConfigurationNode("a_key", TEST_PROPVALUE));
hc.addNodes(TEST_PROPNAME, nodes);
l.checkEvent(HierarchicalConfiguration.EVENT_ADD_NODES, TEST_PROPNAME,
@@ -74,10 +82,11 @@ public class TestHierarchicalConfigurati
* Tests events generated by addNodes() when the list of nodes is empty. In
* this case no events should be generated.
*/
+ @Test
public void testAddNodesEmptyEvent()
{
((HierarchicalConfiguration) config).addNodes(TEST_PROPNAME,
- new ArrayList());
+ new ArrayList<ConfigurationNode>());
l.done();
}
@@ -85,6 +94,7 @@ public class TestHierarchicalConfigurati
* Tests whether manipulations of a subnode configuration trigger correct
* events.
*/
+ @Test
public void testSubnodeChangedEvent()
{
SubnodeConfiguration sub = ((HierarchicalConfiguration) config)
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestMapConfigurationEvents.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestMapConfigurationEvents.java?rev=1225648&r1=1225647&r2=1225648&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestMapConfigurationEvents.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestMapConfigurationEvents.java
Thu Dec 29 20:55:07 2011
@@ -28,8 +28,9 @@ import org.apache.commons.configuration.
*/
public class TestMapConfigurationEvents extends AbstractTestConfigurationEvents
{
+ @Override
protected AbstractConfiguration createConfiguration()
{
- return new MapConfiguration(new HashMap());
+ return new MapConfiguration(new HashMap<String, Object>());
}
}
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestPropertiesConfigurationEvents.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestPropertiesConfigurationEvents.java?rev=1225648&r1=1225647&r2=1225648&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestPropertiesConfigurationEvents.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestPropertiesConfigurationEvents.java
Thu Dec 29 20:55:07 2011
@@ -36,11 +36,13 @@ public class TestPropertiesConfiguration
/** The file to be loaded.*/
static final File TEST_FILE =
ConfigurationAssert.getTestFile("test.properties");
+ @Override
protected AbstractConfiguration createConfiguration()
{
return new PropertiesConfiguration();
}
+ @Override
protected URL getSourceURL() throws IOException
{
return TEST_FILE.toURI().toURL();
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestSubsetConfigurationEvents.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestSubsetConfigurationEvents.java?rev=1225648&r1=1225647&r2=1225648&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestSubsetConfigurationEvents.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestSubsetConfigurationEvents.java
Thu Dec 29 20:55:07 2011
@@ -29,8 +29,9 @@ import org.apache.commons.configuration.
*/
public class TestSubsetConfigurationEvents extends
AbstractTestConfigurationEvents
{
+ @Override
protected AbstractConfiguration createConfiguration()
{
- return (SubsetConfiguration)new MapConfiguration(new
HashMap()).subset("test");
+ return (SubsetConfiguration)new MapConfiguration(new HashMap<String,
Object>()).subset("test");
}
}
Modified:
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestXMLConfigurationEvents.java
URL:
http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestXMLConfigurationEvents.java?rev=1225648&r1=1225647&r2=1225648&view=diff
==============================================================================
---
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestXMLConfigurationEvents.java
(original)
+++
commons/proper/configuration/trunk/src/test/java/org/apache/commons/configuration/event/TestXMLConfigurationEvents.java
Thu Dec 29 20:55:07 2011
@@ -34,11 +34,13 @@ public class TestXMLConfigurationEvents
{
static final File TEST_FILE = ConfigurationAssert.getTestFile("test.xml");
+ @Override
protected URL getSourceURL() throws IOException
{
return TEST_FILE.toURI().toURL();
}
+ @Override
protected AbstractConfiguration createConfiguration()
{
return new XMLConfiguration();
