Emmanuel Bourg
Index: src/test/org/apache/commons/configuration/BaseNonStringProperties.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/BaseNonStringProperties.java,v retrieving revision 1.2 diff -u -r1.2 BaseNonStringProperties.java --- src/test/org/apache/commons/configuration/BaseNonStringProperties.java 24 Dec 2003 14:28:21 -0000 1.2 +++ src/test/org/apache/commons/configuration/BaseNonStringProperties.java 12 Jan 2004 18:04:03 -0000 @@ -57,7 +57,7 @@ import junit.framework.TestCase; /** - * test if non-string properties are handled correctly + * Test if non-string properties are handled correctly. * * @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a> * @version $Id: BaseNonStringProperties.java,v 1.2 2003/12/24 14:28:21 epugh Exp $ @@ -65,17 +65,10 @@ public abstract class BaseNonStringProperties extends TestCase { - protected NonStringTestHolder nonStringTestHolder = - new NonStringTestHolder(); + protected NonStringTestHolder nonStringTestHolder = new NonStringTestHolder(); public abstract void setUp() throws Exception; public Configuration conf = null; - - public BaseNonStringProperties(String s) throws Exception - { - super(s); - - } public void testBoolean() throws Exception { Index: src/test/org/apache/commons/configuration/TestBaseConfiguration.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestBaseConfiguration.java,v retrieving revision 1.2 diff -u -r1.2 TestBaseConfiguration.java --- src/test/org/apache/commons/configuration/TestBaseConfiguration.java 24 Dec 2003 14:28:21 -0000 1.2 +++ src/test/org/apache/commons/configuration/TestBaseConfiguration.java 12 Jan 2004 18:04:03 -0000 @@ -57,9 +57,7 @@ import java.util.NoSuchElementException; import java.util.Properties; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * Tests some basic functions of the BaseConfiguration class @@ -73,22 +71,6 @@ { protected BaseConfiguration eprop = new BaseConfiguration(); - public TestBaseConfiguration(String testName) - { - super(testName); - } - - public static Test suite() - { - return new TestSuite( TestBaseConfiguration.class ); - } - - public static void main(String args[]) - { - String[] testCaseName = { TestBaseConfiguration.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - public void testRetrieve() { /* @@ -296,7 +278,7 @@ fail( "IllegalStateException should have been thrown for looped property references" ); } - public void testGetString() + public void testGetString() { BaseConfiguration defaults = new BaseConfiguration(); defaults.addProperty("default", "default string"); @@ -306,7 +288,7 @@ eprop.addProperty("string", "test string"); assertEquals("test string", eprop.getString("string")); - try + try { eprop.getString("XXX"); fail("Should throw NoSuchElementException exception"); @@ -317,9 +299,9 @@ } //test defaults - assertEquals("test string", eprop.getString("string", "some default value")); + assertEquals("test string", eprop.getString("string", "some default value")); assertEquals("default string", eprop.getString("default")); assertEquals("default string", eprop.getString("default", "some default value")); - assertEquals("some default value", eprop.getString("XXX", "some default value")); + assertEquals("some default value", eprop.getString("XXX", "some default value")); } } Index: src/test/org/apache/commons/configuration/TestBaseConfigurationXMLReader.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestBaseConfigurationXMLReader.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 TestBaseConfigurationXMLReader.java --- src/test/org/apache/commons/configuration/TestBaseConfigurationXMLReader.java 23 Dec 2003 15:09:05 -0000 1.1.1.1 +++ src/test/org/apache/commons/configuration/TestBaseConfigurationXMLReader.java 12 Jan 2004 18:04:03 -0000 @@ -83,11 +83,6 @@ private BaseConfiguration config; private BaseConfigurationXMLReader configReader; - public TestBaseConfigurationXMLReader(String arg0) - { - super(arg0); - } - protected void setUp() throws Exception { config = new BaseConfiguration(); Index: src/test/org/apache/commons/configuration/TestBasePropertiesConfiguration.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestBasePropertiesConfiguration.java,v retrieving revision 1.2 diff -u -r1.2 TestBasePropertiesConfiguration.java --- src/test/org/apache/commons/configuration/TestBasePropertiesConfiguration.java 24 Dec 2003 14:28:21 -0000 1.2 +++ src/test/org/apache/commons/configuration/TestBasePropertiesConfiguration.java 12 Jan 2004 18:04:03 -0000 @@ -68,26 +68,18 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a> * @version $Id: TestBasePropertiesConfiguration.java,v 1.2 2003/12/24 14:28:21 epugh Exp $ */ -public abstract class TestBasePropertiesConfiguration - extends TestCase +public abstract class TestBasePropertiesConfiguration extends TestCase { protected BasePropertiesConfiguration conf; - public TestBasePropertiesConfiguration(String s) - { - super(s); - } - /** * Assigns the [EMAIL PROTECTED] #conf} field to a [EMAIL PROTECTED] * org.apache.commons.configuration.BasePropertiesConfiguration} * sub-class. */ - protected abstract void setUp() - throws Exception; + protected abstract void setUp() throws Exception; - public void testLoad() - throws Exception + public void testLoad() throws Exception { String loaded = conf.getString("configuration.loaded"); assertEquals("true", loaded); @@ -97,8 +89,7 @@ * Tests that empty properties are treated as the empty string * (rather than as null). */ - public void testEmpty() - throws Exception + public void testEmpty() throws Exception { String empty = conf.getString("test.empty"); assertNotNull(empty); @@ -108,8 +99,7 @@ /** * Tests that references to other properties work */ - public void testReference() - throws Exception + public void testReference() throws Exception { assertEquals("baseextra", conf.getString("base.reference")); } @@ -117,8 +107,7 @@ /** * test if includes properties get loaded too */ - public void testLoadInclude() - throws Exception + public void testLoadInclude() throws Exception { String loaded = conf.getString("include.loaded"); assertEquals("true", loaded); Index: src/test/org/apache/commons/configuration/TestClassPropertiesConfiguration.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestClassPropertiesConfiguration.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 TestClassPropertiesConfiguration.java --- src/test/org/apache/commons/configuration/TestClassPropertiesConfiguration.java 23 Dec 2003 15:09:05 -0000 1.1.1.1 +++ src/test/org/apache/commons/configuration/TestClassPropertiesConfiguration.java 12 Jan 2004 18:04:03 -0000 @@ -64,8 +64,7 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Daniel Rall</a> * @version $Id: TestClassPropertiesConfiguration.java,v 1.1.1.1 2003/12/23 15:09:05 epugh Exp $ */ -public class TestClassPropertiesConfiguration - extends TestBasePropertiesConfiguration +public class TestClassPropertiesConfiguration extends TestBasePropertiesConfiguration { /** The File that we test with */ private static final String[] TEST_FILE_NAMES = @@ -74,13 +73,7 @@ "/org/apache/commons/configuration/test.properties" }; - public TestClassPropertiesConfiguration(String s) - { - super(s); - } - - protected void setUp() - throws Exception + protected void setUp() throws Exception { conf = new ClassPropertiesConfiguration(getClass(), TEST_FILE_NAMES[0]); } @@ -88,7 +81,7 @@ /** Test that loading from the classpath in various path formats works */ public void testClasspathLoading() throws Exception { - for (int i=0; i<TEST_FILE_NAMES.length; i++) + for (int i = 0; i< TEST_FILE_NAMES.length; i++) { conf = new ClassPropertiesConfiguration(getClass(), TEST_FILE_NAMES[i]); testLoad(); Index: src/test/org/apache/commons/configuration/TestCompositeConfiguration.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestCompositeConfiguration.java,v retrieving revision 1.2 diff -u -r1.2 TestCompositeConfiguration.java --- src/test/org/apache/commons/configuration/TestCompositeConfiguration.java 24 Dec 2003 14:28:21 -0000 1.2 +++ src/test/org/apache/commons/configuration/TestCompositeConfiguration.java 12 Jan 2004 18:04:04 -0000 @@ -62,9 +62,8 @@ import junit.framework.TestCase; /** - * test loading multiple configurations + * Test loading multiple configurations. * - * @author <a href="mailto:[EMAIL PROTECTED]">Eric Pugh</a> * @version $Id: TestCompositeConfiguration.java,v 1.2 2003/12/24 14:28:21 epugh Exp $ */ @@ -79,11 +78,6 @@ private String testProperties2 = new File("conf/test2.properties").getAbsolutePath(); private String testPropertiesXML = new File("conf/test.xml").getAbsolutePath(); - public TestCompositeConfiguration(String s) - { - super(s); - } - protected void setUp() throws Exception { cc = new CompositeConfiguration(); @@ -238,7 +232,6 @@ cc.addConfiguration(dom4jConf); cc.setProperty("my.new.property", "supernew"); assertEquals("supernew", cc.getString("my.new.property")); - } /** @@ -258,7 +251,6 @@ cc.setProperty("test.short", "43"); subset = cc.subset("test.short"); assertEquals("Make sure the initial loaded configs subset overrides" + "any later add configs subset", "43", subset.getString("test.short")); - } /** @@ -298,7 +290,7 @@ // we should get 0 packages here assertEquals(0, packages.length); } - + /** * Tests <code>getKeys</code> preserves the order */ @@ -316,8 +308,8 @@ assertEquals(orderedList.size(),iteratedList.size()); for (int i =0;i<orderedList.size();i++){ assertEquals(orderedList.get(i),iteratedList.get(i)); - } - } + } + } /** * Tests <code>getKeys(String key)</code> preserves the order @@ -336,6 +328,6 @@ assertEquals(orderedList.size(),iteratedList.size()); for (int i =0;i<orderedList.size();i++){ assertEquals(orderedList.get(i),iteratedList.get(i)); - } - } + } + } } Index: src/test/org/apache/commons/configuration/TestCompositeConfigurationNonStringProperties.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestCompositeConfigurationNonStringProperties.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 TestCompositeConfigurationNonStringProperties.java --- src/test/org/apache/commons/configuration/TestCompositeConfigurationNonStringProperties.java 23 Dec 2003 15:09:05 -0000 1.1.1.1 +++ src/test/org/apache/commons/configuration/TestCompositeConfigurationNonStringProperties.java 12 Jan 2004 18:04:04 -0000 @@ -57,7 +57,7 @@ import java.io.File; /** - * test if non-string properties are handled correctly + * Test if non-string properties are handled correctly. * * @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a> * @version $Id: TestCompositeConfigurationNonStringProperties.java,v 1.1.1.1 2003/12/23 15:09:05 epugh Exp $ @@ -65,17 +65,7 @@ public class TestCompositeConfigurationNonStringProperties extends BaseNonStringProperties { /** The File that we test with */ - private String testProperties = - new File("conf/test.properties").getAbsolutePath(); - - - - public TestCompositeConfigurationNonStringProperties(String s) - throws Exception - { - super(s); - - } + private String testProperties = new File("conf/test.properties").getAbsolutePath(); public void setUp() throws Exception { Index: src/test/org/apache/commons/configuration/TestConfigurationConverter.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestConfigurationConverter.java,v retrieving revision 1.2 diff -u -r1.2 TestConfigurationConverter.java --- src/test/org/apache/commons/configuration/TestConfigurationConverter.java 24 Dec 2003 14:28:21 -0000 1.2 +++ src/test/org/apache/commons/configuration/TestConfigurationConverter.java 12 Jan 2004 18:04:04 -0000 @@ -57,9 +57,7 @@ import java.util.ArrayList; import java.util.List; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.commons.collections.ExtendedProperties; @@ -71,23 +69,7 @@ */ public class TestConfigurationConverter extends TestCase { - protected Configuration config = (Configuration) new BaseConfiguration(); - - public TestConfigurationConverter(String testName) - { - super(testName); - } - - public static Test suite() - { - return new TestSuite( TestConfigurationConverter.class ); - } - - public static void main(String args[]) - { - String[] testCaseName = { TestConfigurationConverter.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } + protected Configuration config = new BaseConfiguration(); public void testConverter() { @@ -98,8 +80,7 @@ list.add("item 2"); config.setProperty("list", list); - ExtendedProperties ep = ConfigurationConverter - .getExtendedProperties(config); + ExtendedProperties ep = ConfigurationConverter.getExtendedProperties(config); assertEquals("This returns 'teststring'", ep.getString("string"), Index: src/test/org/apache/commons/configuration/TestConfigurationFactory.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestConfigurationFactory.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 TestConfigurationFactory.java --- src/test/org/apache/commons/configuration/TestConfigurationFactory.java 23 Dec 2003 15:09:05 -0000 1.1.1.1 +++ src/test/org/apache/commons/configuration/TestConfigurationFactory.java 12 Jan 2004 18:04:04 -0000 @@ -59,7 +59,7 @@ import junit.framework.TestCase; /** - * Test the ConfigurationFactory + * Test the ConfigurationFactory. * * @author <a href="mailto:[EMAIL PROTECTED]">Eric Pugh</a> * @version $Id: TestConfigurationFactory.java,v 1.1.1.1 2003/12/23 15:09:05 epugh Exp $ @@ -79,11 +79,6 @@ private Configuration configuration; private CompositeConfiguration compositeConfiguration; private ConfigurationFactory configurationFactory; - - public TestConfigurationFactory(String s) throws Exception - { - super(s); - } public void setUp() throws Exception { Index: src/test/org/apache/commons/configuration/TestConfigurationKey.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestConfigurationKey.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 TestConfigurationKey.java --- src/test/org/apache/commons/configuration/TestConfigurationKey.java 23 Dec 2003 15:09:05 -0000 1.1.1.1 +++ src/test/org/apache/commons/configuration/TestConfigurationKey.java 12 Jan 2004 18:04:04 -0000 @@ -70,15 +70,6 @@ private static final String TESTKEY = TESTPROPS + TESTATTR; - /** - * Constructor for TestConfigurationKey. - * @param arg0 - */ - public TestConfigurationKey(String arg0) - { - super(arg0); - } - public void testAppend() { ConfigurationKey key = new ConfigurationKey(); Index: src/test/org/apache/commons/configuration/TestConfigurationUtils.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestConfigurationUtils.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 TestConfigurationUtils.java --- src/test/org/apache/commons/configuration/TestConfigurationUtils.java 23 Dec 2003 15:09:05 -0000 1.1.1.1 +++ src/test/org/apache/commons/configuration/TestConfigurationUtils.java 12 Jan 2004 18:04:04 -0000 @@ -57,9 +57,7 @@ import java.io.File; import java.net.URL; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * Tests the ConfigurationUtils class @@ -70,22 +68,6 @@ public class TestConfigurationUtils extends TestCase { protected Configuration configuration = new BaseConfiguration(); - - public TestConfigurationUtils(String testName) - { - super(testName); - } - - public static Test suite() - { - return new TestSuite(TestConfigurationUtils.class); - } - - public static void main(String args[]) - { - String[] testCaseName = { TestConfigurationUtils.class.getName()}; - junit.textui.TestRunner.main(testCaseName); - } public void testCompare() { Index: src/test/org/apache/commons/configuration/TestConfigurationXMLDocument.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestConfigurationXMLDocument.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 TestConfigurationXMLDocument.java --- src/test/org/apache/commons/configuration/TestConfigurationXMLDocument.java 23 Dec 2003 15:09:05 -0000 1.1.1.1 +++ src/test/org/apache/commons/configuration/TestConfigurationXMLDocument.java 12 Jan 2004 18:04:04 -0000 @@ -83,13 +83,8 @@ private ConfigurationFactory configFactory; private ConfigurationXMLDocument configDoc; - private ArrayList tables; + private List tables; private int counter; - - public TestConfigurationXMLDocument(String arg0) - { - super(arg0); - } protected void setUp() throws Exception { @@ -428,7 +423,7 @@ public static class Table { /** Stores the list of fields.*/ - private ArrayList fields; + private List fields; /** Stores the table name.*/ private String name; Index: src/test/org/apache/commons/configuration/TestDOM4JConfiguration.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestDOM4JConfiguration.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 TestDOM4JConfiguration.java --- src/test/org/apache/commons/configuration/TestDOM4JConfiguration.java 23 Dec 2003 15:09:05 -0000 1.1.1.1 +++ src/test/org/apache/commons/configuration/TestDOM4JConfiguration.java 12 Jan 2004 18:04:05 -0000 @@ -71,11 +71,6 @@ private String testBasePath = new File("conf").getAbsolutePath(); private DOM4JConfiguration conf; - public TestDOM4JConfiguration(String s) - { - super(s); - } - protected void setUp() throws Exception { conf = new DOM4JConfiguration(new File(testProperties)); @@ -83,16 +78,12 @@ public void testGetProperty() throws Exception { - assertEquals("value", conf.getProperty("element")); - } public void testGetComplexProperty() throws Exception { - assertEquals("I'm complex!", conf.getProperty("element2.subelement.subsubelement")); - } public void testSettingFileNames() throws Exception @@ -112,7 +103,6 @@ assertEquals("/subdir/hello.xml", conf.getFileName()); assertEquals(testBasePath.toString(), conf.getBasePath()); assertEquals(new File(testBasePath, "/subdir/hello.xml"), conf.getFile()); - } public void testLoad() throws Exception Index: src/test/org/apache/commons/configuration/TestEqualBehaviour.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestEqualBehaviour.java,v retrieving revision 1.2 diff -u -r1.2 TestEqualBehaviour.java --- src/test/org/apache/commons/configuration/TestEqualBehaviour.java 24 Dec 2003 14:28:21 -0000 1.2 +++ src/test/org/apache/commons/configuration/TestEqualBehaviour.java 12 Jan 2004 18:04:05 -0000 @@ -59,30 +59,17 @@ import java.util.Iterator; import java.util.List; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * Compare the behaviour of various methods between CompositeConfiguration * and normal (Properties) Configuration - * + * * @author <a href0"mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a> * @version $Id: TestEqualBehaviour.java,v 1.2 2003/12/24 14:28:21 epugh Exp $ */ -public class TestEqualBehaviour - extends TestCase +public class TestEqualBehaviour extends TestCase { - public TestEqualBehaviour(String name) throws Exception - { - super(name); - } - - public static Test suite() - { - return new TestSuite(TestEqualBehaviour.class); - } - private Configuration setupSimpleConfiguration() throws Exception { @@ -101,7 +88,7 @@ } /** - * Checks whether two configurations have the same size, + * Checks whether two configurations have the same size, * the same key sequence and contain the same key -> value mappings */ private void checkEquality(String msg, Configuration c1, Configuration c2) @@ -154,8 +141,7 @@ /** * Are both configurations equal after loading? */ - public void testLoading() - throws Exception + public void testLoading() throws Exception { Configuration simple = setupSimpleConfiguration(); Configuration composite = setupCompositeConfiguration(); @@ -167,8 +153,7 @@ * If we delete a key, does it vanish? Does it leave all * the other keys unchanged? How about an unset key? */ - public void testDeletingExisting() - throws Exception + public void testDeletingExisting() throws Exception { Configuration simple = setupSimpleConfiguration(); Configuration composite = setupCompositeConfiguration(); @@ -187,8 +172,7 @@ checkEquality("testDeletingExisting", simple, composite); } - public void testDeletingNonExisting() - throws Exception + public void testDeletingNonExisting() throws Exception { Configuration simple = setupSimpleConfiguration(); Configuration composite = setupCompositeConfiguration(); @@ -211,8 +195,7 @@ * If we set a key, does it work? How about an existing * key? Can we change it? */ - public void testSettingNonExisting() - throws Exception + public void testSettingNonExisting() throws Exception { Configuration simple = setupSimpleConfiguration(); Configuration composite = setupCompositeConfiguration(); @@ -233,8 +216,7 @@ checkEquality("testSettingNonExisting", simple, composite); } - public void testSettingExisting() - throws Exception + public void testSettingExisting() throws Exception { Configuration simple = setupSimpleConfiguration(); Configuration composite = setupCompositeConfiguration(); @@ -260,8 +242,7 @@ /** * If we add a key, does it work? */ - public void testAddingUnset() - throws Exception + public void testAddingUnset() throws Exception { Configuration simple = setupSimpleConfiguration(); Configuration composite = setupCompositeConfiguration(); @@ -282,8 +263,7 @@ /** * If we add a to an existing key, does it work? */ - public void testAddingSet() - throws Exception + public void testAddingSet() throws Exception { Configuration simple = setupSimpleConfiguration(); Configuration composite = setupCompositeConfiguration(); Index: src/test/org/apache/commons/configuration/TestEqualsProperty.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestEqualsProperty.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 TestEqualsProperty.java --- src/test/org/apache/commons/configuration/TestEqualsProperty.java 23 Dec 2003 15:09:05 -0000 1.1.1.1 +++ src/test/org/apache/commons/configuration/TestEqualsProperty.java 12 Jan 2004 18:04:06 -0000 @@ -64,23 +64,14 @@ * @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a> * @version $Id: TestEqualsProperty.java,v 1.1.1.1 2003/12/23 15:09:05 epugh Exp $ */ -public class TestEqualsProperty - extends TestCase +public class TestEqualsProperty extends TestCase { /** The File that we test with */ - private String testProperties = - new File("conf/test.properties").getAbsolutePath(); + private String testProperties = new File("conf/test.properties").getAbsolutePath(); - public TestEqualsProperty(String s) + public void testEquals() throws Exception { - super(s); - } - - public void testEquals() - throws Exception - { - PropertiesConfiguration conf = - new PropertiesConfiguration(testProperties); + PropertiesConfiguration conf = new PropertiesConfiguration(testProperties); String equals = conf.getString("test.equals"); assertEquals("value=one", equals); Index: src/test/org/apache/commons/configuration/TestHierarchicalConfiguration.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestHierarchicalConfiguration.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 TestHierarchicalConfiguration.java --- src/test/org/apache/commons/configuration/TestHierarchicalConfiguration.java 23 Dec 2003 15:09:05 -0000 1.1.1.1 +++ src/test/org/apache/commons/configuration/TestHierarchicalConfiguration.java 12 Jan 2004 18:04:06 -0000 @@ -78,11 +78,6 @@ }; private HierarchicalConfiguration config; - - public TestHierarchicalConfiguration(String arg0) - { - super(arg0); - } protected void setUp() throws Exception { Index: src/test/org/apache/commons/configuration/TestHierarchicalConfigurationXMLReader.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestHierarchicalConfigurationXMLReader.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 TestHierarchicalConfigurationXMLReader.java --- src/test/org/apache/commons/configuration/TestHierarchicalConfigurationXMLReader.java 23 Dec 2003 15:09:05 -0000 1.1.1.1 +++ src/test/org/apache/commons/configuration/TestHierarchicalConfigurationXMLReader.java 12 Jan 2004 18:04:06 -0000 @@ -77,11 +77,6 @@ private HierarchicalConfigurationXMLReader parser; - public TestHierarchicalConfigurationXMLReader(String arg0) - { - super(arg0); - } - protected void setUp() throws Exception { HierarchicalDOM4JConfiguration config = Index: src/test/org/apache/commons/configuration/TestHierarchicalDOM4JConfiguration.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestHierarchicalDOM4JConfiguration.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 TestHierarchicalDOM4JConfiguration.java --- src/test/org/apache/commons/configuration/TestHierarchicalDOM4JConfiguration.java 23 Dec 2003 15:09:05 -0000 1.1.1.1 +++ src/test/org/apache/commons/configuration/TestHierarchicalDOM4JConfiguration.java 12 Jan 2004 18:04:06 -0000 @@ -69,19 +69,12 @@ { private static final String TEST_DIR = "conf"; - private static final String TEST_FILENAME = - "testHierarchicalDOM4JConfiguration.xml"; + private static final String TEST_FILENAME = "testHierarchicalDOM4JConfiguration.xml"; - private static final String TEST_FILE = TEST_DIR - + File.separator + TEST_FILENAME; + private static final String TEST_FILE = TEST_DIR + File.separator + TEST_FILENAME; private HierarchicalDOM4JConfiguration config; - public TestHierarchicalDOM4JConfiguration(String arg0) - { - super(arg0); - } - protected void setUp() throws Exception { config = new HierarchicalDOM4JConfiguration(); Index: src/test/org/apache/commons/configuration/TestNonStringProperties.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestNonStringProperties.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 TestNonStringProperties.java --- src/test/org/apache/commons/configuration/TestNonStringProperties.java 23 Dec 2003 15:09:05 -0000 1.1.1.1 +++ src/test/org/apache/commons/configuration/TestNonStringProperties.java 12 Jan 2004 18:04:06 -0000 @@ -57,28 +57,17 @@ import java.io.File; /** - * test if non-string properties are handled correctly + * Test if non-string properties are handled correctly. * * @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a> * @version $Id: TestNonStringProperties.java,v 1.1.1.1 2003/12/23 15:09:05 epugh Exp $ */ -public class TestNonStringProperties - extends BaseNonStringProperties +public class TestNonStringProperties extends BaseNonStringProperties { /** The File that we test with */ - private String testProperties = - new File("conf/test.properties").getAbsolutePath(); + private String testProperties = new File("conf/test.properties").getAbsolutePath(); - - - public TestNonStringProperties(String s) - throws Exception - { - super(s); - - } - - public void setUp() throws Exception{ + public void setUp() throws Exception { conf = new PropertiesConfiguration(testProperties); nonStringTestHolder.setConfiguration(conf); } Index: src/test/org/apache/commons/configuration/TestPropertiesConfiguration.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestPropertiesConfiguration.java,v retrieving revision 1.2 diff -u -r1.2 TestPropertiesConfiguration.java --- src/test/org/apache/commons/configuration/TestPropertiesConfiguration.java 24 Dec 2003 14:28:21 -0000 1.2 +++ src/test/org/apache/commons/configuration/TestPropertiesConfiguration.java 12 Jan 2004 18:04:07 -0000 @@ -59,7 +59,7 @@ import java.util.List; /** - * test for loading and saving properties files + * Test for loading and saving properties files. * * @author <a href="mailto:[EMAIL PROTECTED]">Martin Poeschl</a> * @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a> @@ -73,11 +73,6 @@ private String testBasePath = new File("conf").getAbsolutePath(); private String testBasePath2 = new File("conf").getAbsoluteFile().getParentFile().getAbsolutePath(); - - public TestPropertiesConfiguration(String s) - { - super(s); - } protected void setUp() throws Exception { Index: src/test/org/apache/commons/configuration/TestPropertiesSequence.java =================================================================== RCS file: /home/cvspublic/jakarta-commons/configuration/src/test/org/apache/commons/configuration/TestPropertiesSequence.java,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 TestPropertiesSequence.java --- src/test/org/apache/commons/configuration/TestPropertiesSequence.java 23 Dec 2003 15:09:05 -0000 1.1.1.1 +++ src/test/org/apache/commons/configuration/TestPropertiesSequence.java 12 Jan 2004 18:04:07 -0000 @@ -59,9 +59,7 @@ import java.util.Iterator; import java.util.List; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.commons.collections.IteratorUtils; import org.apache.commons.lang.StringUtils; @@ -75,18 +73,8 @@ * @author <a href0"mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a> * @version $Id: TestPropertiesSequence.java,v 1.1.1.1 2003/12/23 15:09:05 epugh Exp $ */ -public class TestPropertiesSequence - extends TestCase +public class TestPropertiesSequence extends TestCase { - public TestPropertiesSequence(String name) throws Exception - { - super(name); - } - - public static Test suite() - { - return new TestSuite(TestPropertiesSequence.class); - } public void testConfigurationValuesInSameOrderFromFile() throws Exception { @@ -112,7 +100,6 @@ { assertEquals(keysSimpleConfiguration.get(i), keysCompositeConfiguration.get(i)); } - } public void testConfigurationValuesInSameOrderWithManualAdd() throws Exception @@ -145,7 +132,6 @@ { assertEquals(keysSimpleConfiguration.get(i), keysCompositeConfiguration.get(i)); } - } public void testMappingInSameOrder() throws Exception
smime.p7s
Description: S/MIME Cryptographic Signature
