Author: sebb Date: Mon Apr 18 21:17:40 2011 New Revision: 1094751 URL: http://svn.apache.org/viewvc?rev=1094751&view=rev Log: Remove unnecessary main and suite methods
Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ByteTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/DateTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/DoubleTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EmailTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EntityImportTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ExtensionTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/FloatTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/IntegerTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/LocaleTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/LongTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/MultipleTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ParameterTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/RequiredIfTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/RequiredNameTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ShortTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/UrlTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorResourcesTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorResultsTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/VarTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/InetAddressValidatorTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/PercentValidatorTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/TimeValidatorTest.java commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ByteTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ByteTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ByteTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ByteTest.java Mon Apr 18 21:17:40 2011 @@ -34,25 +34,6 @@ public class ByteTest extends AbstractNu } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[]{ByteTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(ByteTest.class); - } - - - /** * Tests the byte validation. */ public void testByte() throws ValidatorException { Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/CustomValidatorResourcesTest.java Mon Apr 18 21:17:40 2011 @@ -17,9 +17,9 @@ package org.apache.commons.validator; import java.io.InputStream; -import junit.framework.Test; + import junit.framework.TestCase; -import junit.framework.TestSuite; + import org.apache.commons.validator.custom.CustomValidatorResources; /** @@ -37,24 +37,6 @@ public class CustomValidatorResourcesTes super(name); } - /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[] {ValidatorResultsTest.class.getName()}); - } - - /** - * Create a Test Suite - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - return new TestSuite(CustomValidatorResourcesTest.class); - } - /** * Set up. */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/DateTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/DateTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/DateTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/DateTest.java Mon Apr 18 21:17:40 2011 @@ -17,10 +17,7 @@ package org.apache.commons.validator; import java.io.IOException; -import java.util.*; - -import junit.framework.Test; -import junit.framework.TestSuite; +import java.util.Locale; import org.xml.sax.SAXException; @@ -48,15 +45,6 @@ public class DateTest extends AbstractCo } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[]{DateTest.class.getName()}); - } - - /** * Load <code>ValidatorResources</code> from * validator-numeric.xml. */ @@ -65,18 +53,6 @@ public class DateTest extends AbstractCo loadResources("DateTest-config.xml"); } - protected void tearDown() { - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(DateTest.class); - } - /** * Tests the date validation. */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/DoubleTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/DoubleTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/DoubleTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/DoubleTest.java Mon Apr 18 21:17:40 2011 @@ -16,8 +16,6 @@ */ package org.apache.commons.validator; -import junit.framework.Test; -import junit.framework.TestSuite; /** * Performs Validation Test for <code>double</code> validations. @@ -34,25 +32,6 @@ public class DoubleTest extends Abstract /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[]{DoubleTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(DoubleTest.class); - } - - - /** * Tests the double validation. */ public void testDouble() throws ValidatorException { Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EmailTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EmailTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EmailTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EmailTest.java Mon Apr 18 21:17:40 2011 @@ -48,24 +48,6 @@ public class EmailTest extends AbstractC } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[] {EmailTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(EmailTest.class); - } - - /** * Load <code>ValidatorResources</code> from * validator-regexp.xml. */ @@ -73,9 +55,6 @@ public class EmailTest extends AbstractC loadResources("EmailTest-config.xml"); } - protected void tearDown() { - } - /** * Tests the e-mail validation. */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EntityImportTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EntityImportTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EntityImportTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/EntityImportTest.java Mon Apr 18 21:17:40 2011 @@ -16,10 +16,8 @@ */ package org.apache.commons.validator; -import junit.framework.Test; -import junit.framework.TestSuite; -import java.util.Locale; import java.net.URL; +import java.util.Locale; /** @@ -34,24 +32,6 @@ public class EntityImportTest extends Ab } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[]{EntityImportTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(EntityImportTest.class); - } - - /** * Tests the entity import loading the <code>byteForm</code> form. */ public void testEntityImport() throws Exception { Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ExtensionTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ExtensionTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ExtensionTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ExtensionTest.java Mon Apr 18 21:17:40 2011 @@ -18,9 +18,7 @@ package org.apache.commons.validator; import java.io.InputStream; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * <p>Performs tests for extension in form definitions. Performs the same tests @@ -69,24 +67,6 @@ public class ExtensionTest extends TestC } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[] {RequiredNameTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(ExtensionTest.class); - } - - /** * Load <code>ValidatorResources</code> from * validator-extension.xml. */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/FloatTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/FloatTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/FloatTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/FloatTest.java Mon Apr 18 21:17:40 2011 @@ -16,9 +16,6 @@ */ package org.apache.commons.validator; -import junit.framework.Test; -import junit.framework.TestSuite; - /** * Performs Validation Test for <code>float</code> validations. @@ -34,25 +31,6 @@ public class FloatTest extends AbstractN } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[]{FloatTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(FloatTest.class); - } - - - /** * Tests the float validation. */ public void testFloat() throws ValidatorException { Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/GenericTypeValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -21,9 +21,6 @@ import java.util.Iterator; import java.util.Locale; import java.util.Map; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.xml.sax.SAXException; /** @@ -49,24 +46,6 @@ public class GenericTypeValidatorTest ex } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[] {GenericTypeValidatorTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(GenericTypeValidatorTest.class); - } - - /** * Load <code>ValidatorResources</code> from * validator-type.xml. */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/IntegerTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/IntegerTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/IntegerTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/IntegerTest.java Mon Apr 18 21:17:40 2011 @@ -17,8 +17,6 @@ package org.apache.commons.validator; -import junit.framework.Test; -import junit.framework.TestSuite; /** @@ -36,24 +34,6 @@ public class IntegerTest extends Abstrac } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[]{IntegerTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(IntegerTest.class); - } - - /** * Tests the int validation. */ public void testInt() throws ValidatorException { Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/LocaleTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/LocaleTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/LocaleTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/LocaleTest.java Mon Apr 18 21:17:40 2011 @@ -19,9 +19,6 @@ package org.apache.commons.validator; import java.io.IOException; import java.util.Locale; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.xml.sax.SAXException; /** @@ -49,24 +46,6 @@ public class LocaleTest extends Abstract } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[]{LocaleTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(LocaleTest.class); - } - - /** * Load <code>ValidatorResources</code> from validator-locale.xml. * * @exception IOException If something goes wrong Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/LongTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/LongTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/LongTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/LongTest.java Mon Apr 18 21:17:40 2011 @@ -16,8 +16,6 @@ */ package org.apache.commons.validator; -import junit.framework.Test; -import junit.framework.TestSuite; /** * Performs Validation Test for <code>long</code> validations. @@ -33,24 +31,6 @@ public class LongTest extends AbstractNu } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[]{LongTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(LongTest.class); - } - - /** * Tests the long validation. */ public void testLong() throws ValidatorException { Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/MultipleTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/MultipleTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/MultipleTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/MultipleTest.java Mon Apr 18 21:17:40 2011 @@ -18,9 +18,6 @@ package org.apache.commons.validator; import java.io.IOException; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.xml.sax.SAXException; /** @@ -48,24 +45,6 @@ public class MultipleTest extends Abstra } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[] {MultipleTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(MultipleTest.class); - } - - /** * Load <code>ValidatorResources</code> from * validator-multipletest.xml. */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ParameterTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ParameterTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ParameterTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ParameterTest.java Mon Apr 18 21:17:40 2011 @@ -19,9 +19,6 @@ package org.apache.commons.validator; import java.io.IOException; import java.util.Locale; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.xml.sax.SAXException; /** @@ -53,26 +50,6 @@ public class ParameterTest extends Abstr } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[] { - ParameterTest.class.getName() - }); - } - - /** - * Create a Test Suite - * @return a test suite (<code>TestSuite</code>) that includes all - * methods starting with "test" - */ - public static Test suite() { - return new TestSuite(ParameterTest.class); - } - - /** * Load <code>ValidatorResources</code> from * ValidatorResultsTest-config.xml. */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/RequiredIfTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/RequiredIfTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/RequiredIfTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/RequiredIfTest.java Mon Apr 18 21:17:40 2011 @@ -18,9 +18,6 @@ package org.apache.commons.validator; import java.io.IOException; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.xml.sax.SAXException; /** @@ -46,24 +43,6 @@ public class RequiredIfTest extends Abst } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[] {RequiredIfTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(RequiredIfTest.class); - } - - /** * Load <code>ValidatorResources</code> from * validator-requiredif.xml. */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/RequiredNameTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/RequiredNameTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/RequiredNameTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/RequiredNameTest.java Mon Apr 18 21:17:40 2011 @@ -18,9 +18,6 @@ package org.apache.commons.validator; import java.io.IOException; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.xml.sax.SAXException; @@ -47,24 +44,6 @@ public class RequiredNameTest extends Ab } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[] {RequiredNameTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(RequiredNameTest.class); - } - - /** * Load <code>ValidatorResources</code> from * validator-name-required.xml. */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ShortTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ShortTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ShortTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ShortTest.java Mon Apr 18 21:17:40 2011 @@ -16,8 +16,6 @@ */ package org.apache.commons.validator; -import junit.framework.Test; -import junit.framework.TestSuite; /** * Performs Validation Test for <code>short</code> validations. @@ -33,24 +31,6 @@ public class ShortTest extends AbstractN } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[] {ShortTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(ShortTest.class); - } - - /** * Tests the short validation. */ public void testShortMin() throws ValidatorException { Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/UrlTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/UrlTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/UrlTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/UrlTest.java Mon Apr 18 21:17:40 2011 @@ -16,9 +16,7 @@ */ package org.apache.commons.validator; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; /** * Performs Validation Test for url validations. @@ -34,19 +32,12 @@ public class UrlTest extends TestCase { super(testName); } - public static Test suite() { - return new TestSuite(UrlTest.class); - } - protected void setUp() { for (int index = 0; index < testPartsIndex.length - 1; index++) { testPartsIndex[index] = 0; } } - protected void tearDown() { - } - public void testIsValid() { testIsValid(testUrlParts, UrlValidator.ALLOW_ALL_SCHEMES); setUp(); Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorResourcesTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorResourcesTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorResourcesTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorResourcesTest.java Mon Apr 18 21:17:40 2011 @@ -36,34 +36,6 @@ public class ValidatorResourcesTest exte } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[] {ValidatorResourcesTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(ValidatorResourcesTest.class); - } - - /** - * Load <code>ValidatorResources</code> from - * ValidatorResultsTest-config.xml. - */ - protected void setUp() throws Exception { - } - - protected void tearDown() { - } - - /** * Test null Input Stream for Validator Resources. */ public void testNullInputStream() throws Exception { Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorResultsTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorResultsTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorResultsTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorResultsTest.java Mon Apr 18 21:17:40 2011 @@ -17,8 +17,6 @@ package org.apache.commons.validator; import java.io.IOException; -import junit.framework.Test; -import junit.framework.TestSuite; import org.xml.sax.SAXException; @@ -46,24 +44,6 @@ public class ValidatorResultsTest extend } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[] {ValidatorResultsTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(ValidatorResultsTest.class); - } - - /** * Load <code>ValidatorResources</code> from * ValidatorResultsTest-config.xml. */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/ValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -23,9 +23,7 @@ import java.util.Date; import java.util.List; import java.util.Locale; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.commons.validator.util.ValidatorUtils; @@ -41,30 +39,6 @@ public class ValidatorTest extends TestC } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[] {ValidatorTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(ValidatorTest.class); - } - - protected void setUp() { - } - - protected void tearDown() { - } - - /** * Verify that one value generates an error and the other passes. The validation * method being tested returns an object (<code>null</code> will be considered an error). */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/VarTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/VarTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/VarTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/VarTest.java Mon Apr 18 21:17:40 2011 @@ -16,10 +16,9 @@ */ package org.apache.commons.validator; -import junit.framework.Test; -import junit.framework.TestSuite; -import java.util.Locale; import java.io.IOException; +import java.util.Locale; + import org.xml.sax.SAXException; /** @@ -48,24 +47,6 @@ public class VarTest extends AbstractCom } /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[] {VarTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(VarTest.class); - } - - /** * Load <code>ValidatorResources</code> from * validator-multipletest.xml. */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/BigDecimalValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -27,14 +27,6 @@ import java.util.Locale; public class BigDecimalValidatorTest extends AbstractNumberValidatorTest { /** - * Main - * @param args arguments - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(BigDecimalValidatorTest.class); - } - - /** * Constructor * @param name test name */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/BigIntegerValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -27,14 +27,6 @@ import java.util.Locale; public class BigIntegerValidatorTest extends AbstractNumberValidatorTest { /** - * Main - * @param args arguments - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(BigIntegerValidatorTest.class); - } - - /** * Constructor * @param name test name */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/ByteValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -26,14 +26,6 @@ import java.util.Locale; public class ByteValidatorTest extends AbstractNumberValidatorTest { /** - * Main - * @param args arguments - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(ByteValidatorTest.class); - } - - /** * Constructor * @param name test name */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/CalendarValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -36,14 +36,6 @@ public class CalendarValidatorTest exten private CalendarValidator calValidator; /** - * Main - * @param args arguments - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(CalendarValidatorTest.class); - } - - /** * Constructor * @param name test name */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/CurrencyValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -35,14 +35,6 @@ public class CurrencyValidatorTest exten private String UK_POUND; /** - * Main - * @param args arguments - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(CurrencyValidatorTest.class); - } - - /** * Constructor * @param name test name */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DateValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -30,14 +30,6 @@ public class DateValidatorTest extends A private DateValidator dateValidator; /** - * Main - * @param args arguments - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(DateValidatorTest.class); - } - - /** * Constructor * @param name test name */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/DoubleValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -26,14 +26,6 @@ import java.util.Locale; public class DoubleValidatorTest extends AbstractNumberValidatorTest { /** - * Main - * @param args arguments - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(DoubleValidatorTest.class); - } - - /** * Constructor * @param name test name */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/EmailValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -16,9 +16,7 @@ */ package org.apache.commons.validator.routines; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.commons.validator.ResultPair; @@ -47,24 +45,6 @@ public class EmailValidatorTest extends super(name); } - /** - * Start the tests. - * - * @param theArgs the arguments. Not used - */ - public static void main(String[] theArgs) { - junit.awtui.TestRunner.main(new String[] {EmailValidatorTest.class.getName()}); - } - - /** - * @return a test suite (<code>TestSuite</code>) that includes all methods - * starting with "test" - */ - public static Test suite() { - // All methods starting with "test" will be executed in the test suite. - return new TestSuite(EmailValidatorTest.class); - } - protected void setUp() { validator = EmailValidator.getInstance(); } Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/FloatValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -27,14 +27,6 @@ import java.util.Locale; public class FloatValidatorTest extends AbstractNumberValidatorTest { /** - * Main - * @param args arguments - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(FloatValidatorTest.class); - } - - /** * Constructor * @param name test name */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/InetAddressValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/InetAddressValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/InetAddressValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/InetAddressValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -29,14 +29,6 @@ public class InetAddressValidatorTest ex private InetAddressValidator validator; /** - * Command-line test method. - * @param args - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(InetAddressValidatorTest.class); - } - - /** * Constructor. * @param name */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/IntegerValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -26,14 +26,6 @@ import java.util.Locale; public class IntegerValidatorTest extends AbstractNumberValidatorTest { /** - * Main - * @param args arguments - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(IntegerValidatorTest.class); - } - - /** * Constructor * @param name test name */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/LongValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -26,14 +26,6 @@ import java.util.Locale; public class LongValidatorTest extends AbstractNumberValidatorTest { /** - * Main - * @param args arguments - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(LongValidatorTest.class); - } - - /** * Constructor * @param name test name */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/PercentValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/PercentValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/PercentValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/PercentValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -30,14 +30,6 @@ public class PercentValidatorTest extend protected PercentValidator validator; /** - * Main - * @param args arguments - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(PercentValidatorTest.class); - } - - /** * Constructor * @param name test name */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/ShortValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -26,14 +26,6 @@ import java.util.Locale; public class ShortValidatorTest extends AbstractNumberValidatorTest { /** - * Main - * @param args arguments - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(ShortValidatorTest.class); - } - - /** * Constructor * @param name test name */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/TimeValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/TimeValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/TimeValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/TimeValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -95,14 +95,6 @@ public class TimeValidatorTest extends T ,"10:1:"}; // invalid pattern /** - * Main - * @param args arguments - */ - public static void main(String[] args) { - junit.textui.TestRunner.run(TimeValidatorTest.class); - } - - /** * Constructor * @param name test name */ Modified: commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java URL: http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java?rev=1094751&r1=1094750&r2=1094751&view=diff ============================================================================== --- commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java (original) +++ commons/proper/validator/trunk/src/test/java/org/apache/commons/validator/routines/UrlValidatorTest.java Mon Apr 18 21:17:40 2011 @@ -16,9 +16,7 @@ */ package org.apache.commons.validator.routines; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.apache.commons.validator.ResultPair; @@ -36,19 +34,12 @@ public class UrlValidatorTest extends Te super(testName); } - public static Test suite() { - return new TestSuite(UrlValidatorTest.class); - } - protected void setUp() { for (int index = 0; index < testPartsIndex.length - 1; index++) { testPartsIndex[index] = 0; } } - protected void tearDown() { - } - public void testIsValid() { testIsValid(testUrlParts, UrlValidator.ALLOW_ALL_SCHEMES); setUp();