Emmanuel Bourg
Emmanuel Bourg wrote:
Hi, here is a patch removing useless constructors, suite() and main() methods from the JUnit tests. It does a bit of code reformatting as well. Any committer around to apply it please ? :)
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 -b -w -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 13 Jan 2004 11:43:13 -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 -b -w -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 13 Jan 2004 11:43:13 -0000 @@ -56,10 +56,9 @@ import java.util.NoSuchElementException; import java.util.Properties; +import java.util.List; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * Tests some basic functions of the BaseConfiguration class @@ -73,36 +72,18 @@ { 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() - { - /* - * should be empty and return null - */ + public void testGetProperty() { + /* should be empty and return null */ assertEquals("This returns null", eprop.getProperty("foo"), null); - /* - * add a real value, and get it two different ways - */ + /* add a real value, and get it two different ways */ eprop.setProperty("number", "1"); assertEquals("This returns '1'", eprop.getProperty("number"), "1"); assertEquals("This returns '1'", eprop.getString("number"), "1"); + } + public void testGetByte() { + eprop.setProperty("number", "1"); byte oneB = 1, twoB = 2; assertEquals("This returns 1(byte)",eprop.getByte("number"),oneB); assertEquals("This returns 1(byte)",eprop.getByte("number",twoB),oneB); @@ -112,7 +93,9 @@ assertEquals("This returns 1(Byte)", eprop.getByte("number",new Byte("2")), new Byte(oneB)); + } + public void testGetShort() { eprop.setProperty("numberS", "1"); short oneS = 1, twoS = 2; assertEquals("This returns 1(short)",eprop.getShort("numberS"),oneS); @@ -125,7 +108,9 @@ assertEquals("This returns 1(Short)", eprop.getShort("numberS",new Short("2")), new Short(oneS)); + } + public void testGetLong() { eprop.setProperty("numberL", "1"); long oneL = 1, twoL = 2; assertEquals("This returns 1(long)",eprop.getLong("numberL"),oneL); @@ -138,7 +123,9 @@ assertEquals("This returns 1(Long)", eprop.getLong("numberL",new Long("2")), new Long(oneL)); + } + public void testGetFloat() { eprop.setProperty("numberF", "1.0"); float oneF = 1, twoF = 2; assertEquals("This returns 1(float)",eprop.getFloat("numberF"),oneF,0); @@ -153,7 +140,9 @@ assertEquals("This returns 1(Float)", eprop.getFloat("numberF",new Float("2")), new Float(oneF)); + } + public void testGetDouble() { eprop.setProperty("numberD", "1.0"); double oneD = 1, twoD = 2; assertEquals("This returns 1(double)", @@ -171,7 +160,9 @@ assertEquals("This returns 1(Double)", eprop.getDouble("numberD",new Double("2")), new Double(oneD)); + } + public void testGetBoolean() { eprop.setProperty("boolA", Boolean.TRUE); boolean boolT = true, boolF = false; assertEquals("This returns true",eprop.getBoolean("boolA"),boolT); @@ -184,13 +175,16 @@ assertEquals("This returns true(Boolean)", eprop.getBoolean("boolA",new Boolean(boolF)), new Boolean(boolT)); + } - /* - * now add another and get a List - */ + public void testGetList() { + eprop.addProperty("number", "1"); eprop.addProperty("number", "2"); - assertTrue("This returns array", ( eprop.getList("number") - instanceof java.util.List ) ); + List list = eprop.getList("number"); + assertNotNull("The list is null", list); + assertEquals("List size", 2, list.size()); + assertTrue("The number 1 is missing from the list", list.contains("1")); + assertTrue("The number 2 is missing from the list", list.contains("2")); /* * now test dan's new fix where we get the first scalar @@ -198,10 +192,9 @@ */ assertTrue("This returns scalar", ( eprop.getString("number") instanceof String ) ); + } - /* - * test comma separated string properties - */ + public void testCommaSeparatedString() { String prop = "hey, that's a test"; eprop.setProperty("prop.string", prop); assertTrue("This returns list", ( eprop.getList("prop.string") @@ -212,8 +205,9 @@ eprop.setProperty("prop.string", prop2); assertTrue("This returns string", ( eprop.getString("prop.string") instanceof java.lang.String) ); + } - // Test Properties access. + public void testPropertyAccess() { eprop.clearProperty("prop.properties"); eprop.setProperty("prop.properties", ""); assertEquals("This returns an empty Properties object", @@ -221,6 +215,7 @@ new Properties()); eprop.clearProperty("prop.properties"); eprop.setProperty("prop.properties", "foo=bar, baz=moo, seal=clubber"); + Properties p = new Properties(); p.setProperty("foo", "bar"); p.setProperty("baz", "moo"); @@ -228,21 +223,24 @@ assertEquals("This returns a filled in Properties object", eprop.getProperties("prop.properties"), p); + } + public void testSubset() + { /* * test subset : assure we don't reprocess the data elements * when generating the subset */ - Configuration subEprop = eprop.subset("prop"); + String prop = "hey, that's a test"; + String prop2 = "hey\\, that's a test"; + eprop.setProperty("prop.string", prop2); - assertTrue("Returns the full string", subEprop.getString("string") - .equals( prop ) ); - assertTrue("This returns string for subset", ( subEprop - .getString("string") instanceof java.lang.String) ); - assertTrue("This returns array for subset", ( subEprop - .getList("string") instanceof java.util.List) ); + Configuration subEprop = eprop.subset("prop"); + assertEquals("Returns the full string", prop, subEprop.getString("string")); + assertTrue("This returns string for subset", ( subEprop.getString("string") instanceof java.lang.String) ); + assertTrue("This returns array for subset", ( subEprop.getList("string") instanceof java.util.List) ); } public void testInterpolation() throws Exception 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 -b -w -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 13 Jan 2004 11:43:13 -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 -b -w -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 13 Jan 2004 11:43:13 -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 -b -w -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 13 Jan 2004 11:43:13 -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]); } 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 -b -w -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 13 Jan 2004 11:43:13 -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")); - } /** 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 -b -w -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 13 Jan 2004 11:43:14 -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 -b -w -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 13 Jan 2004 11:43:14 -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 -b -w -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 13 Jan 2004 11:43:14 -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 -b -w -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 13 Jan 2004 11:43:14 -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 -b -w -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 13 Jan 2004 11:43:14 -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 -b -w -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 13 Jan 2004 11:43:14 -0000 @@ -83,14 +83,9 @@ 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 { configFactory = new ConfigurationFactory(); @@ -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 -b -w -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 13 Jan 2004 11:43:14 -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 -b -w -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 13 Jan 2004 11:43:15 -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; /** * Compare the behaviour of various methods between CompositeConfiguration @@ -70,19 +68,8 @@ * @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 { @@ -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 -b -w -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 13 Jan 2004 11:43:15 -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 -b -w -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 13 Jan 2004 11:43:15 -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 -b -w -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 13 Jan 2004 11:43:15 -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 -b -w -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 13 Jan 2004 11:43:15 -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 -b -w -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 13 Jan 2004 11:43:15 -0000 @@ -57,26 +57,15 @@ 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(); - - - - public TestNonStringProperties(String s) - throws Exception - { - super(s); - - } + private String testProperties = new File("conf/test.properties").getAbsolutePath(); public void setUp() throws Exception{ conf = new PropertiesConfiguration(testProperties); 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 -b -w -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 13 Jan 2004 11:43:16 -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 -b -w -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 13 Jan 2004 11:43:16 -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