Author: ebourg Date: Fri Jun 19 09:30:44 2009 New Revision: 786427 URL: http://svn.apache.org/viewvc?rev=786427&view=rev Log: Removed the unnecessary constructors and suite() methods from the tests
Modified: commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestCatalogResolver.java commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestConfigurationMap.java commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestConfigurationSet.java commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestMultiFileHierarchicalConfiguration.java commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestPatternSubtreeConfiguration.java Modified: commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestCatalogResolver.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestCatalogResolver.java?rev=786427&r1=786426&r2=786427&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestCatalogResolver.java (original) +++ commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestCatalogResolver.java Fri Jun 19 09:30:44 2009 @@ -14,14 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.commons.configuration; import junit.framework.TestCase; -import junit.framework.Test; -import junit.framework.TestSuite; import org.apache.commons.configuration.resolver.CatalogResolver; -import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * @@ -36,24 +35,6 @@ private CatalogResolver resolver; private XMLConfiguration config; - /** - * Create the test case - * - * @param testName name of the test case - */ - public TestCatalogResolver(String testName) - { - super(testName); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite(TestCatalogResolver.class); - } - protected void setUp() throws Exception { resolver = new CatalogResolver(); Modified: commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestConfigurationMap.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestConfigurationMap.java?rev=786427&r1=786426&r2=786427&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestConfigurationMap.java (original) +++ commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestConfigurationMap.java Fri Jun 19 09:30:44 2009 @@ -17,9 +17,7 @@ package org.apache.commons.configuration; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * @author <a href="mailto:ricardo.gladw...@btinternet.com">Ricardo Gladwell</a> @@ -70,14 +68,6 @@ } /** - * Return the tests included in this test suite. - */ - public static Test suite() - { - return (new TestSuite(TestConfigurationMap.class)); - } - - /** * Tear down instance variables required by this test case. */ public void tearDown() Modified: commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestConfigurationSet.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestConfigurationSet.java?rev=786427&r1=786426&r2=786427&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestConfigurationSet.java (original) +++ commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestConfigurationSet.java Fri Jun 19 09:30:44 2009 @@ -14,14 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.commons.configuration; import java.util.Iterator; import java.util.Map; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * @author rgladwel @@ -71,14 +70,6 @@ } /** - * Return the tests included in this test suite. - */ - public static Test suite() - { - return (new TestSuite(TestConfigurationSet.class)); - } - - /** * Tear down instance variables required by this test case. */ public void tearDown() Modified: commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java?rev=786427&r1=786426&r2=786427&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java (original) +++ commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestDynamicCombinedConfiguration.java Fri Jun 19 09:30:44 2009 @@ -14,42 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.commons.configuration; -import junit.framework.Test; +import java.io.File; + import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine; -import java.io.File; - -/** - * - */ public class TestDynamicCombinedConfiguration extends TestCase { private static String PATTERN ="${sys:Id}"; private static String PATTERN1 = "target/test-classes/testMultiConfiguration_${sys:Id}.xml"; private static String DEFAULT_FILE = "target/test-classes/testMultiConfiguration_default.xml"; - /** - * Create the test case - * - * @param testName name of the test case - */ - public TestDynamicCombinedConfiguration( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( TestDynamicCombinedConfiguration.class ); - } - public void testConfiguration() throws Exception { DynamicCombinedConfiguration config = new DynamicCombinedConfiguration(); Modified: commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestMultiFileHierarchicalConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestMultiFileHierarchicalConfiguration.java?rev=786427&r1=786426&r2=786427&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestMultiFileHierarchicalConfiguration.java (original) +++ commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestMultiFileHierarchicalConfiguration.java Fri Jun 19 09:30:44 2009 @@ -14,41 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.commons.configuration; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.configuration.reloading.FileChangedReloadingStrategy; /** * Unit test for simple MultiConfigurationTest. */ -public class TestMultiFileHierarchicalConfiguration - extends TestCase +public class TestMultiFileHierarchicalConfiguration extends TestCase { private static String PATTERN1 = "target/test-classes/testMultiConfiguration_${sys:Id}.xml"; /** - * Create the test case - * - * @param testName name of the test case - */ - public TestMultiFileHierarchicalConfiguration( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( TestMultiFileHierarchicalConfiguration.class ); - } - - /** * Rigourous Test :-) */ public void testMultiConfiguration() Modified: commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestPatternSubtreeConfiguration.java URL: http://svn.apache.org/viewvc/commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestPatternSubtreeConfiguration.java?rev=786427&r1=786426&r2=786427&view=diff ============================================================================== --- commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestPatternSubtreeConfiguration.java (original) +++ commons/proper/configuration/trunk/src/test/org/apache/commons/configuration/TestPatternSubtreeConfiguration.java Fri Jun 19 09:30:44 2009 @@ -14,14 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.apache.commons.configuration; import java.io.File; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.configuration.reloading.FileChangedReloadingStrategy; import org.apache.commons.configuration.tree.xpath.XPathExpressionEngine; @@ -34,24 +32,6 @@ private static String PATTERN = "businessclie...@name='${sys:Id}']"; private XMLConfiguration conf; - /** - * Create the test case - * - * @param testName name of the test case - */ - public TestPatternSubtreeConfiguration( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() throws Exception - { - return new TestSuite(TestPatternSubtreeConfiguration.class ); - } - protected void setUp() throws Exception { conf = new XMLConfiguration();