This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
The following commit(s) were added to refs/heads/master by this push: new 753b73ec Remove JUnit 3 style main() methods 753b73ec is described below commit 753b73ec8e10a337f4f6bf09b15d33c44f9994c2 Author: Gary Gregory <garydgreg...@gmail.com> AuthorDate: Fri Aug 30 21:53:18 2024 -0400 Remove JUnit 3 style main() methods --- pom.xml | 1 + src/conf/checkstyle.xml | 2 +- .../apache/commons/beanutils2/BeanMapTestCase.java | 9 ++------ .../commons/beanutils2/BeanUtilsBeanTestCase.java | 6 +++--- .../commons/beanutils2/BeanificationTestCase.java | 4 ++-- .../commons/beanutils2/ConvertUtilsTestCase.java | 6 +++--- .../beanutils2/DynaBeanMapDecoratorTestCase.java | 7 ------- .../commons/beanutils2/LazyDynaBeanTestCase.java | 6 ------ .../commons/beanutils2/LazyDynaClassTestCase.java | 6 ------ .../commons/beanutils2/LazyDynaListTestCase.java | 7 ------- .../commons/beanutils2/LazyDynaMapTestCase.java | 6 ------ .../commons/beanutils2/MappedPropertyTestCase.java | 7 ------- .../commons/beanutils2/MethodUtilsTestCase.java | 6 +++--- .../commons/beanutils2/PropertyUtilsTestCase.java | 8 ++++---- .../commons/beanutils2/bugs/Jira157TestCase.java | 17 ++++----------- .../commons/beanutils2/bugs/Jira273TestCase.java | 17 ++++----------- .../commons/beanutils2/bugs/Jira298TestCase.java | 17 ++++----------- .../commons/beanutils2/bugs/Jira339TestCase.java | 17 ++++----------- .../commons/beanutils2/bugs/Jira345TestCase.java | 13 ++---------- .../commons/beanutils2/bugs/Jira347TestCase.java | 4 ++-- .../commons/beanutils2/bugs/Jira349TestCase.java | 17 ++++----------- .../commons/beanutils2/bugs/Jira357TestCase.java | 13 ++---------- .../commons/beanutils2/bugs/Jira358TestCase.java | 15 +++----------- .../commons/beanutils2/bugs/Jira359TestCase.java | 17 ++++----------- .../commons/beanutils2/bugs/Jira368TestCase.java | 13 ++---------- .../commons/beanutils2/bugs/Jira369TestCase.java | 13 ++---------- .../commons/beanutils2/bugs/Jira381TestCase.java | 4 ++-- .../commons/beanutils2/bugs/Jira411TestCase.java | 4 ++-- .../commons/beanutils2/bugs/Jira454TestCase.java | 4 ++-- .../commons/beanutils2/bugs/Jira456TestCase.java | 4 ++-- .../commons/beanutils2/bugs/Jira458TestCase.java | 4 ++-- .../commons/beanutils2/bugs/Jira463TestCase.java | 4 ++-- .../commons/beanutils2/bugs/Jira465TestCase.java | 4 ++-- .../commons/beanutils2/bugs/Jira520TestCase.java | 4 ++-- .../commons/beanutils2/bugs/Jira87TestCase.java | 24 ++-------------------- .../commons/beanutils2/bugs/Jira92TestCase.java | 4 ++-- .../converters/AbstractDateConverterTest.java | 4 ++-- .../converters/AbstractNumberConverterTest.java | 4 ++-- .../converters/BaseLocaleConverterTestCase.java | 4 ++-- .../converters/BigDecimalConverterTestCase.java | 4 ++-- .../converters/BigIntegerConverterTestCase.java | 4 ++-- .../converters/BooleanConverterTestCase.java | 4 ++-- .../converters/ByteConverterTestCase.java | 4 ++-- .../converters/CharacterConverterTestCase.java | 6 +++--- .../converters/ClassConverterTestCase.java | 6 +++--- .../converters/DoubleConverterTestCase.java | 4 ++-- .../converters/DurationConverterTestCase.java | 6 +++--- .../converters/EnumConverterTestCase.java | 6 +++--- .../converters/FileConverterTestCase.java | 6 +++--- .../converters/FloatConverterTestCase.java | 4 ++-- .../converters/IntegerConverterTestCase.java | 4 ++-- .../converters/LocalTimeConverterTestCase.java | 6 +++--- .../converters/LongConverterTestCase.java | 4 ++-- .../converters/MonthDayConverterTestCase.java | 6 +++--- .../converters/OffsetTimeConverterTestCase.java | 6 +++--- .../converters/PathConverterTestCase.java | 6 +++--- .../converters/PeriodConverterTestCase.java | 6 +++--- .../converters/ShortConverterTestCase.java | 4 ++-- .../converters/URIConverterTestCase.java | 6 +++--- .../converters/UUIDConverterTestCase.java | 6 +++--- .../converters/YearConverterTestCase.java | 6 +++--- .../converters/YearMonthConverterTestCase.java | 6 +++--- .../converters/ZoneIdConverterTestCase.java | 6 +++--- .../converters/ZoneOffsetConverterTestCase.java | 6 +++--- .../locale/LocaleConvertUtilsTestCase.java | 4 ++-- .../beanutils2/sql/DynaResultSetTestCase.java | 6 +++--- .../commons/beanutils2/sql/DynaRowSetTestCase.java | 6 +++--- .../sql/converters/SqlDateConverterTestCase.java | 4 ++-- .../sql/converters/SqlTimeConverterTestCase.java | 4 ++-- .../converters/SqlTimestampConverterTestCase.java | 4 ++-- 70 files changed, 162 insertions(+), 324 deletions(-) diff --git a/pom.xml b/pom.xml index 06e7e32b..2f6e3359 100644 --- a/pom.xml +++ b/pom.xml @@ -65,6 +65,7 @@ <commons.jacoco.complexityRatio>0.61</commons.jacoco.complexityRatio> <commons.jacoco.lineRatio>0.73</commons.jacoco.lineRatio> <!-- Dependencies --> +<!-- <commons.collections.version>4.5.0-M3-SNAPSHOT</commons.collections.version>--> <commons.collections.version>4.4</commons.collections.version> </properties> diff --git a/src/conf/checkstyle.xml b/src/conf/checkstyle.xml index 9245c01c..25c19303 100644 --- a/src/conf/checkstyle.xml +++ b/src/conf/checkstyle.xml @@ -51,7 +51,7 @@ limitations under the License. </module> <module name="ImportOrder"> <property name="option" value="top"/> - <property name="groups" value="java,javax,org"/> + <property name="groups" value="java,javax,junit,org"/> <property name="ordered" value="true"/> <property name="separated" value="true"/> </module> diff --git a/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java index dc4704cf..2cdba79c 100644 --- a/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java @@ -21,13 +21,12 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.Map; +import junit.framework.Test; + import org.apache.commons.beanutils2.bugs.other.Jira87BeanFactory; import org.apache.commons.collections4.BulkTest; import org.apache.commons.collections4.map.AbstractMapTest; -import junit.framework.Test; -import junit.textui.TestRunner; - /** * Test cases for BeanMap */ @@ -154,10 +153,6 @@ public class BeanMapTestCase extends AbstractMapTest<String, Object> { * Also note: The sample keys and mappings were generated manually. */ - public static void main(final String[] args) { - TestRunner.run(suite()); - } - public static Test suite() { return BulkTest.makeSuite(BeanMapTestCase.class); } diff --git a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java index 4374fc35..96f3d576 100644 --- a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java @@ -25,13 +25,13 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; -import org.apache.commons.beanutils2.converters.ArrayConverter; -import org.apache.commons.beanutils2.converters.DateConverter; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.converters.ArrayConverter; +import org.apache.commons.beanutils2.converters.DateConverter; + /** * <p> * Test Case for the BeanUtils class. The majority of these tests use instances of the TestBean class, so be sure to update the tests if you change the diff --git a/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java b/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java index b97f4386..a003e7a3 100644 --- a/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java @@ -24,12 +24,12 @@ import java.lang.ref.WeakReference; import java.util.Map; import java.util.WeakHashMap; -import org.apache.commons.logging.LogFactory; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.logging.LogFactory; + /** * <p> * Test Case for changes made during Beanutils Beanification diff --git a/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java index 5ed06d44..8829881b 100644 --- a/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java @@ -24,13 +24,13 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Locale; -import org.apache.commons.beanutils2.converters.DateConverter; -import org.apache.commons.lang3.ArrayUtils; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.converters.DateConverter; +import org.apache.commons.lang3.ArrayUtils; + /** * <p> * Test Case for the ConvertUtils class. diff --git a/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java b/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java index 303186eb..0e7ac3e9 100644 --- a/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java @@ -51,13 +51,6 @@ public class DynaBeanMapDecoratorTestCase extends TestCase { private static final Date dateVal = new Date(); private static final Map<String, Object> emptyMap = new DynaBeanPropertyMapDecorator(new BasicDynaBean(new BasicDynaClass())); - /** - * Run thus Test - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } - /** * Creates the tests included in this test suite. */ diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaBeanTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaBeanTestCase.java index 4449cff1..67fe3e45 100644 --- a/src/test/java/org/apache/commons/beanutils2/LazyDynaBeanTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaBeanTestCase.java @@ -33,12 +33,6 @@ import junit.framework.TestSuite; */ public class LazyDynaBeanTestCase extends TestCase { - /** - * Run thus Test - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } /** * Creates the tests included in this test suite. */ diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaClassTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaClassTestCase.java index c52a4ea4..2f4a108d 100644 --- a/src/test/java/org/apache/commons/beanutils2/LazyDynaClassTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaClassTestCase.java @@ -29,12 +29,6 @@ import junit.framework.TestSuite; */ public class LazyDynaClassTestCase extends TestCase { - /** - * Run this Test - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } /** * Creates the tests included in this test suite. */ diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java index 8c3e3067..e11a7425 100644 --- a/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java @@ -40,13 +40,6 @@ public class LazyDynaListTestCase extends TestCase { private static final String BASIC_PROP1 = "BasicDynaClass_Property1"; private static final String BASIC_PROP2 = "BasicDynaClass_Property2"; - /** - * Run thus Test - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } - /** * Creates the tests included in this test suite. */ diff --git a/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java b/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java index f57f2d9e..514d80ce 100644 --- a/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java @@ -35,12 +35,6 @@ import junit.framework.TestSuite; */ public class LazyDynaMapTestCase extends TestCase { - /** - * Run thus Test - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } /** * Creates the tests included in this test suite. */ diff --git a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestCase.java b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestCase.java index bf56a3cf..91274023 100644 --- a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestCase.java @@ -27,13 +27,6 @@ import junit.framework.TestSuite; */ public class MappedPropertyTestCase extends TestCase { - /** - * Run this Test - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } - /** * Creates the tests included in this test suite. */ diff --git a/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java index 55880c2d..cfd37a6d 100644 --- a/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java @@ -21,13 +21,13 @@ import static org.junit.jupiter.api.Assertions.assertAll; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import org.apache.commons.beanutils2.priv.PrivateBeanFactory; -import org.apache.commons.beanutils2.priv.PublicSubBean; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.priv.PrivateBeanFactory; +import org.apache.commons.beanutils2.priv.PublicSubBean; + /** * <p> * Test case for {@code MethodUtils} diff --git a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java index 55407c50..c4ec8391 100644 --- a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java @@ -31,14 +31,14 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.beanutils2.priv.PrivateBeanFactory; -import org.apache.commons.beanutils2.priv.PrivateDirect; -import org.apache.commons.beanutils2.priv.PublicSubBean; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.priv.PrivateBeanFactory; +import org.apache.commons.beanutils2.priv.PrivateDirect; +import org.apache.commons.beanutils2.priv.PublicSubBean; + /** * <p> * Test Case for the PropertyUtils class. The majority of these tests use instances of the TestBean class, so be sure to update the tests if you change the diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java index f6ebd8c0..f786f46f 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java @@ -19,16 +19,16 @@ package org.apache.commons.beanutils2.bugs; import java.io.Serializable; import java.util.Map; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + import org.apache.commons.beanutils2.BeanUtils; import org.apache.commons.beanutils2.BeanUtilsBean; import org.apache.commons.beanutils2.SuppressPropertiesBeanIntrospector; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - /** * Beanutils's describe() method cannot determine reader methods for anonymous class - see Jira issue# BEANUTILS-157. * @@ -63,15 +63,6 @@ public class Jira157TestCase extends TestCase { private static final Log LOG = LogFactory.getLog(Jira157TestCase.class); - /** - * Run the Test. - * - * @param args Arguments - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } - /** * Create a test suite for this test. * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java index 8306270d..d45b4dd5 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java @@ -16,15 +16,15 @@ */ package org.apache.commons.beanutils2.bugs; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + import org.apache.commons.beanutils2.PropertyUtils; import org.apache.commons.beanutils2.bugs.other.Jira273BeanFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - /** * Public methods overridden in anonymous or private subclasses are not recognized by PropertyUtils - see issue# BEANUTILS-273. * @@ -34,15 +34,6 @@ public class Jira273TestCase extends TestCase { private static final Log LOG = LogFactory.getLog(Jira273TestCase.class); - /** - * Run the Test. - * - * @param args Arguments - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } - /** * Create a test suite for this test. * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira298TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira298TestCase.java index 275e66ed..5ebe362e 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira298TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira298TestCase.java @@ -18,6 +18,10 @@ package org.apache.commons.beanutils2.bugs; import java.lang.reflect.Method; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + import org.apache.commons.beanutils2.MethodUtils; import org.apache.commons.beanutils2.PropertyUtils; import org.apache.commons.beanutils2.bugs.other.Jira298BeanFactory; @@ -25,10 +29,6 @@ import org.apache.commons.beanutils2.bugs.other.Jira298BeanFactory.IX; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - /** * @see <a href="https://issues.apache.org/jira/browse/BEANUTILS-298">https://issues.apache.org/jira/browse/BEANUTILS-298</a> */ @@ -36,15 +36,6 @@ public class Jira298TestCase extends TestCase { private static final Log LOG = LogFactory.getLog(Jira298TestCase.class); - /** - * Run the Test. - * - * @param args Arguments - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } - /** * Create a test suite for this test. * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira339TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira339TestCase.java index 1c588fac..87308313 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira339TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira339TestCase.java @@ -20,15 +20,15 @@ import java.util.Comparator; import java.util.HashMap; import java.util.Map; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + import org.apache.commons.beanutils2.BeanUtils; import org.apache.commons.beanutils2.PropertyUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - /** * @see <a href="https://issues.apache.org/jira/browse/BEANUTILS-339">https://issues.apache.org/jira/browse/BEANUTILS-339</a> */ @@ -62,15 +62,6 @@ public class Jira339TestCase extends TestCase { private static final Log LOG = LogFactory.getLog(Jira339TestCase.class); - /** - * Run the Test. - * - * @param args Arguments - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } - /** * Create a test suite for this test. * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira345TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira345TestCase.java index 4883b28b..3ebff927 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira345TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira345TestCase.java @@ -16,12 +16,12 @@ */ package org.apache.commons.beanutils2.bugs; -import org.apache.commons.beanutils2.BeanUtils; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.BeanUtils; + /** * @see <a href="https://issues.apache.org/jira/browse/BEANUTILS-345">https://issues.apache.org/jira/browse/BEANUTILS-345</a> */ @@ -51,15 +51,6 @@ public class Jira345TestCase extends TestCase { } } - /** - * Run the Test. - * - * @param args Arguments - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } - /** * Create a test suite for this test. * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java index 2cefd0e1..4e71e7f2 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira347TestCase.java @@ -25,11 +25,11 @@ import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Objects; +import junit.framework.TestCase; + import org.apache.commons.beanutils2.MappedPropertyDescriptor; import org.apache.commons.beanutils2.memoryleaktests.MemoryLeakTestCase; -import junit.framework.TestCase; - /** * Test case for Jira issue# BEANUTILS-347. * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira349TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira349TestCase.java index 61cc7900..361f8904 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira349TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira349TestCase.java @@ -16,14 +16,14 @@ */ package org.apache.commons.beanutils2.bugs; -import org.apache.commons.beanutils2.PropertyUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.PropertyUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * @see <a href="https://issues.apache.org/jira/browse/BEANUTILS-349">https://issues.apache.org/jira/browse/BEANUTILS-349</a> */ @@ -61,15 +61,6 @@ public class Jira349TestCase extends TestCase { private static final Log LOG = LogFactory.getLog(Jira349TestCase.class); - /** - * Run the Test. - * - * @param args Arguments - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } - /** * Create a test suite for this test. * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira357TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira357TestCase.java index f722e591..659bc42a 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira357TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira357TestCase.java @@ -18,12 +18,12 @@ package org.apache.commons.beanutils2.bugs; import java.beans.PropertyDescriptor; -import org.apache.commons.beanutils2.PropertyUtils; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.PropertyUtils; + /** * @see <a href="https://issues.apache.org/jira/browse/BEANUTILS-357">https://issues.apache.org/jira/browse/BEANUTILS-357</a> */ @@ -97,15 +97,6 @@ public class Jira357TestCase extends TestCase { } } - /** - * Run the Test. - * - * @param args Arguments - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } - /** * Create a test suite for this test. * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira358TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira358TestCase.java index 05fd4689..35f818b8 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira358TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira358TestCase.java @@ -16,27 +16,18 @@ */ package org.apache.commons.beanutils2.bugs; -import org.apache.commons.beanutils2.PropertyUtils; -import org.apache.commons.beanutils2.TestBean; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.PropertyUtils; +import org.apache.commons.beanutils2.TestBean; + /** * @see <a href="https://issues.apache.org/jira/browse/BEANUTILS-358">https://issues.apache.org/jira/browse/BEANUTILS-358</a> */ public class Jira358TestCase extends TestCase { - /** - * Run the Test. - * - * @param args Arguments - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } - /** * Create a test suite for this test. * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira359TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira359TestCase.java index 3396fc52..7f7f99d4 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira359TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira359TestCase.java @@ -16,15 +16,15 @@ */ package org.apache.commons.beanutils2.bugs; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + import org.apache.commons.beanutils2.BeanUtils; import org.apache.commons.beanutils2.BeanUtilsBean; import org.apache.commons.beanutils2.converters.ArrayConverter; import org.apache.commons.beanutils2.converters.StringConverter; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - /** * @see <a href="https://issues.apache.org/jira/browse/BEANUTILS-359">https://issues.apache.org/jira/browse/BEANUTILS-359</a> */ @@ -45,15 +45,6 @@ public class Jira359TestCase extends TestCase { } } - /** - * Run the Test. - * - * @param args Arguments - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } - /** * Create a test suite for this test. * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira368TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira368TestCase.java index 46e3e575..c6dcc5d4 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira368TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira368TestCase.java @@ -18,26 +18,17 @@ package org.apache.commons.beanutils2.bugs; import static org.junit.jupiter.api.Assertions.assertThrows; -import org.apache.commons.beanutils2.BeanUtils; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.BeanUtils; + /** * @see <a href="https://issues.apache.org/jira/browse/BEANUTILS-368">https://issues.apache.org/jira/browse/BEANUTILS-368</a> */ public class Jira368TestCase extends TestCase { - /** - * Run the Test. - * - * @param args Arguments - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } - /** * Create a test suite for this test. * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira369TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira369TestCase.java index 02df6972..1f8bfc9c 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira369TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira369TestCase.java @@ -16,12 +16,12 @@ */ package org.apache.commons.beanutils2.bugs; -import org.apache.commons.beanutils2.BeanUtils; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.BeanUtils; + /** * @see <a href="https://issues.apache.org/jira/browse/BEANUTILS-369">https://issues.apache.org/jira/browse/BEANUTILS-369</a> */ @@ -51,15 +51,6 @@ public class Jira369TestCase extends TestCase { } } - /** - * Run the Test. - * - * @param args Arguments - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } - /** * Create a test suite for this test. * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira381TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira381TestCase.java index 33cec1a3..a9c89b29 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira381TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira381TestCase.java @@ -18,10 +18,10 @@ package org.apache.commons.beanutils2.bugs; import java.lang.reflect.Method; -import org.apache.commons.beanutils2.MethodUtils; - import junit.framework.TestCase; +import org.apache.commons.beanutils2.MethodUtils; + /** * MethodUtils's getMatchingAccessibleMethod() does not correctly handle inheritance and method overloading. * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira411TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira411TestCase.java index a3041dfc..b7bcd961 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira411TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira411TestCase.java @@ -16,10 +16,10 @@ */ package org.apache.commons.beanutils2.bugs; -import org.apache.commons.beanutils2.BeanUtilsBean; - import junit.framework.TestCase; +import org.apache.commons.beanutils2.BeanUtilsBean; + /** * BeanUtilsBean.setProperty throws IllegalArgumentException if getter of nested property returns null * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira454TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira454TestCase.java index 8042e592..c5b0bd6b 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira454TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira454TestCase.java @@ -18,10 +18,10 @@ package org.apache.commons.beanutils2.bugs; import java.util.Date; -import org.apache.commons.beanutils2.BeanUtils; - import junit.framework.TestCase; +import org.apache.commons.beanutils2.BeanUtils; + /** * copyProperties() throws a ConversionException : No value specified for 'Date' when the field is a java.util.Date with a null value */ diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira456TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira456TestCase.java index c1222910..1e44582d 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira456TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira456TestCase.java @@ -18,12 +18,12 @@ package org.apache.commons.beanutils2.bugs; import java.beans.PropertyDescriptor; +import junit.framework.TestCase; + import org.apache.commons.beanutils2.FluentIntrospectionTestBean; import org.apache.commons.beanutils2.FluentPropertyBeanIntrospector; import org.apache.commons.beanutils2.PropertyUtilsBean; -import junit.framework.TestCase; - /** * Write methods for PropertyDescriptors created during custom introspection are lost. See <a href="https://issues.apache.org/jira/browse/BEANUTILS-456">JIRA * issue BEANUTILS-456</a>. diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira458TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira458TestCase.java index c6a3ebfc..3f035485 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira458TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira458TestCase.java @@ -18,11 +18,11 @@ package org.apache.commons.beanutils2.bugs; import java.util.Locale; +import junit.framework.TestCase; + import org.apache.commons.beanutils2.Converter; import org.apache.commons.beanutils2.locale.converters.IntegerLocaleConverter; -import junit.framework.TestCase; - /** * BaseLocaleConverter.checkConversionResult() fails with ConversionException when result is null when it should not. * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira463TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira463TestCase.java index 07e2d969..255559df 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira463TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira463TestCase.java @@ -16,12 +16,12 @@ */ package org.apache.commons.beanutils2.bugs; +import junit.framework.TestCase; + import org.apache.commons.beanutils2.AlphaBean; import org.apache.commons.beanutils2.BeanUtilsBean; import org.apache.commons.beanutils2.SuppressPropertiesBeanIntrospector; -import junit.framework.TestCase; - /** * Class loader vulnerability in DefaultResolver * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira465TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira465TestCase.java index f24ca0d3..df671481 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira465TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira465TestCase.java @@ -20,10 +20,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.commons.beanutils2.BeanUtils; - import junit.framework.TestCase; +import org.apache.commons.beanutils2.BeanUtils; + /** * Indexed List Setters no longer work. * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira520TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira520TestCase.java index 9b4760f7..0d54864b 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira520TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira520TestCase.java @@ -16,12 +16,12 @@ */ package org.apache.commons.beanutils2.bugs; +import junit.framework.TestCase; + import org.apache.commons.beanutils2.AlphaBean; import org.apache.commons.beanutils2.BeanUtilsBean; import org.apache.commons.beanutils2.SuppressPropertiesBeanIntrospector; -import junit.framework.TestCase; - /** * Fix CVE: https://nvd.nist.gov/vuln/detail/CVE-2014-0114 * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira87TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira87TestCase.java index 2821fb3f..9f876bec 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira87TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira87TestCase.java @@ -16,15 +16,13 @@ */ package org.apache.commons.beanutils2.bugs; +import junit.framework.TestCase; + import org.apache.commons.beanutils2.PropertyUtils; import org.apache.commons.beanutils2.bugs.other.Jira87BeanFactory; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - /** * Test case for Jiar issue# BEANUTILS-87. * @@ -41,24 +39,6 @@ public class Jira87TestCase extends TestCase { private static final Log LOG = LogFactory.getLog(Jira87TestCase.class); - /** - * Run the Test. - * - * @param args Arguments - */ - public static void main(final String[] args) { - junit.textui.TestRunner.run(suite()); - } - - /** - * Create a test suite for this test. - * - * @return a test suite - */ - public static Test suite() { - return new TestSuite(Jira87TestCase.class); - } - /** * Create a test case with the specified name. * diff --git a/src/test/java/org/apache/commons/beanutils2/bugs/Jira92TestCase.java b/src/test/java/org/apache/commons/beanutils2/bugs/Jira92TestCase.java index c341a248..4a25edd4 100644 --- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira92TestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira92TestCase.java @@ -16,11 +16,11 @@ */ package org.apache.commons.beanutils2.bugs; +import junit.framework.TestCase; + import org.apache.commons.beanutils2.PropertyUtils; import org.apache.commons.beanutils2.TestBean; -import junit.framework.TestCase; - /** * Test case for Jira issue# BEANUTILS-92. * diff --git a/src/test/java/org/apache/commons/beanutils2/converters/AbstractDateConverterTest.java b/src/test/java/org/apache/commons/beanutils2/converters/AbstractDateConverterTest.java index c6425f66..a1f37aa3 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/AbstractDateConverterTest.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/AbstractDateConverterTest.java @@ -31,11 +31,11 @@ import java.util.GregorianCalendar; import java.util.Locale; import java.util.Objects; +import junit.framework.TestCase; + import org.apache.commons.beanutils2.ConversionException; import org.apache.commons.beanutils2.Converter; -import junit.framework.TestCase; - /** * Abstract base for <Date>Converter classes. * diff --git a/src/test/java/org/apache/commons/beanutils2/converters/AbstractNumberConverterTest.java b/src/test/java/org/apache/commons/beanutils2/converters/AbstractNumberConverterTest.java index 1d6b1cf5..a7292e35 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/AbstractNumberConverterTest.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/AbstractNumberConverterTest.java @@ -23,10 +23,10 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; -import org.apache.commons.beanutils2.ConversionException; - import junit.framework.TestCase; +import org.apache.commons.beanutils2.ConversionException; + /** * Abstract base for <Number>Converter classes. * @param <T> Number type. diff --git a/src/test/java/org/apache/commons/beanutils2/converters/BaseLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/BaseLocaleConverterTestCase.java index 4f8804c1..647e37ef 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/BaseLocaleConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/BaseLocaleConverterTestCase.java @@ -19,10 +19,10 @@ package org.apache.commons.beanutils2.converters; import java.util.Locale; -import org.apache.commons.beanutils2.locale.BaseLocaleConverter; - import junit.framework.TestCase; +import org.apache.commons.beanutils2.locale.BaseLocaleConverter; + /** * Base Test Case for the DecimalLocaleConverter classes. This class doesn't define any real tests; it just provides useful methods for the real test case * classes to inherit. diff --git a/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java index 94318f65..8ba9c309 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java @@ -19,10 +19,10 @@ package org.apache.commons.beanutils2.converters; import java.math.BigDecimal; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestSuite; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the DoubleConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java index 9af3d25d..04e3291e 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java @@ -19,10 +19,10 @@ package org.apache.commons.beanutils2.converters; import java.math.BigInteger; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestSuite; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the BigInteger class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/BooleanConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/BooleanConverterTestCase.java index b8a035dc..f9cffaeb 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/BooleanConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/BooleanConverterTestCase.java @@ -17,10 +17,10 @@ package org.apache.commons.beanutils2.converters; -import org.apache.commons.beanutils2.ConversionException; - import junit.framework.TestCase; +import org.apache.commons.beanutils2.ConversionException; + /** */ public class BooleanConverterTestCase extends TestCase { diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java index 90753c50..0016b87c 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java @@ -17,10 +17,10 @@ package org.apache.commons.beanutils2.converters; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestSuite; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the ByteConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java index fa5934f8..3bb0da8a 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java @@ -16,12 +16,12 @@ */ package org.apache.commons.beanutils2.converters; -import org.apache.commons.beanutils2.ConversionException; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.ConversionException; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the CharacterConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java index 8e6bd32c..77afd7b0 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java @@ -16,12 +16,12 @@ */ package org.apache.commons.beanutils2.converters; -import org.apache.commons.beanutils2.ConversionException; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.ConversionException; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the ClassConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java index f098546a..48b2280a 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java @@ -17,10 +17,10 @@ package org.apache.commons.beanutils2.converters; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestSuite; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the DoubleConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/DurationConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/DurationConverterTestCase.java index 63aeede9..baf57edd 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/DurationConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/DurationConverterTestCase.java @@ -19,12 +19,12 @@ package org.apache.commons.beanutils2.converters; import java.time.Duration; -import org.apache.commons.beanutils2.ConversionException; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.ConversionException; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the DurationConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/EnumConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/EnumConverterTestCase.java index 8929140b..28d876eb 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/EnumConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/EnumConverterTestCase.java @@ -17,12 +17,12 @@ package org.apache.commons.beanutils2.converters; -import org.apache.commons.beanutils2.ConversionException; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.ConversionException; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the EnumConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/FileConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/FileConverterTestCase.java index b6b97de5..a89e7425 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/FileConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/FileConverterTestCase.java @@ -19,12 +19,12 @@ package org.apache.commons.beanutils2.converters; import java.io.File; -import org.apache.commons.beanutils2.ConversionException; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.ConversionException; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the FileConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java index 93806a35..172e832e 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java @@ -17,10 +17,10 @@ package org.apache.commons.beanutils2.converters; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestSuite; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the FloatConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java index bd2b61e7..4f67162a 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java @@ -19,11 +19,11 @@ package org.apache.commons.beanutils2.converters; import static org.junit.jupiter.api.Assertions.assertThrows; +import junit.framework.TestSuite; + import org.apache.commons.beanutils2.ConversionException; import org.apache.commons.beanutils2.Converter; -import junit.framework.TestSuite; - /** * Test Case for the IntegerConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/LocalTimeConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/LocalTimeConverterTestCase.java index 0066c6a6..f6e58ff8 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/LocalTimeConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/LocalTimeConverterTestCase.java @@ -19,12 +19,12 @@ package org.apache.commons.beanutils2.converters; import java.time.LocalTime; -import org.apache.commons.beanutils2.ConversionException; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.ConversionException; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the LocalTimeConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java index 44322b46..26ded733 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java @@ -17,10 +17,10 @@ package org.apache.commons.beanutils2.converters; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestSuite; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the LongConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/MonthDayConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/MonthDayConverterTestCase.java index 24530b46..377399b6 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/MonthDayConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/MonthDayConverterTestCase.java @@ -19,12 +19,12 @@ package org.apache.commons.beanutils2.converters; import java.time.MonthDay; -import org.apache.commons.beanutils2.ConversionException; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.ConversionException; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the MonthDayConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/OffsetTimeConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/OffsetTimeConverterTestCase.java index 1a8e1e9c..db992aea 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/OffsetTimeConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/OffsetTimeConverterTestCase.java @@ -19,12 +19,12 @@ package org.apache.commons.beanutils2.converters; import java.time.OffsetTime; -import org.apache.commons.beanutils2.ConversionException; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.ConversionException; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the OffsetTimeConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/PathConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/PathConverterTestCase.java index 7b4a629a..3501cbfe 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/PathConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/PathConverterTestCase.java @@ -21,12 +21,12 @@ import java.io.File; import java.nio.file.Path; import java.nio.file.Paths; -import org.apache.commons.beanutils2.ConversionException; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.ConversionException; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the UUIDConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/PeriodConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/PeriodConverterTestCase.java index b39ae470..bc45af0e 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/PeriodConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/PeriodConverterTestCase.java @@ -19,12 +19,12 @@ package org.apache.commons.beanutils2.converters; import java.time.Period; -import org.apache.commons.beanutils2.ConversionException; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.ConversionException; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the PeriodConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java index a5aaf0b1..f2580f0a 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java @@ -17,10 +17,10 @@ package org.apache.commons.beanutils2.converters; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestSuite; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the ShortConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/URIConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/URIConverterTestCase.java index d7cbf496..6b3f17d5 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/URIConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/URIConverterTestCase.java @@ -19,12 +19,12 @@ package org.apache.commons.beanutils2.converters; import java.net.URI; -import org.apache.commons.beanutils2.ConversionException; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.ConversionException; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the URIConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/UUIDConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/UUIDConverterTestCase.java index aad15b23..ee96ed74 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/UUIDConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/UUIDConverterTestCase.java @@ -19,12 +19,12 @@ package org.apache.commons.beanutils2.converters; import java.util.UUID; -import org.apache.commons.beanutils2.ConversionException; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.ConversionException; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the UUIDConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/YearConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/YearConverterTestCase.java index 2fd5bc14..26f7d452 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/YearConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/YearConverterTestCase.java @@ -19,12 +19,12 @@ package org.apache.commons.beanutils2.converters; import java.time.Year; -import org.apache.commons.beanutils2.ConversionException; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.ConversionException; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the YearConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/YearMonthConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/YearMonthConverterTestCase.java index 87583b9f..018754ed 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/YearMonthConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/YearMonthConverterTestCase.java @@ -19,12 +19,12 @@ package org.apache.commons.beanutils2.converters; import java.time.YearMonth; -import org.apache.commons.beanutils2.ConversionException; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.ConversionException; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the YearMonthConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ZoneIdConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ZoneIdConverterTestCase.java index c3e6c619..f7f107bd 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/ZoneIdConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/ZoneIdConverterTestCase.java @@ -19,12 +19,12 @@ package org.apache.commons.beanutils2.converters; import java.time.ZoneId; -import org.apache.commons.beanutils2.ConversionException; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.ConversionException; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the ZoneIdConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/converters/ZoneOffsetConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/converters/ZoneOffsetConverterTestCase.java index dc97714d..5cbf4ce3 100644 --- a/src/test/java/org/apache/commons/beanutils2/converters/ZoneOffsetConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/converters/ZoneOffsetConverterTestCase.java @@ -19,12 +19,12 @@ package org.apache.commons.beanutils2.converters; import java.time.ZoneOffset; -import org.apache.commons.beanutils2.ConversionException; -import org.apache.commons.beanutils2.Converter; - import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.ConversionException; +import org.apache.commons.beanutils2.Converter; + /** * Test Case for the ZoneOffsetConverter class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java index a48f693d..2be7616b 100644 --- a/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java @@ -22,12 +22,12 @@ import java.sql.Time; import java.sql.Timestamp; import java.text.NumberFormat; -import org.apache.commons.beanutils2.ConversionException; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.ConversionException; + /** * <p> * Test Case for the LocaleConvertUtils class. See unimplemented functionality of the convert utils in the method begining with fixme diff --git a/src/test/java/org/apache/commons/beanutils2/sql/DynaResultSetTestCase.java b/src/test/java/org/apache/commons/beanutils2/sql/DynaResultSetTestCase.java index ae3f9f71..ea2e5424 100644 --- a/src/test/java/org/apache/commons/beanutils2/sql/DynaResultSetTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/sql/DynaResultSetTestCase.java @@ -22,13 +22,13 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import java.math.BigDecimal; import java.util.Iterator; -import org.apache.commons.beanutils2.DynaBean; -import org.apache.commons.beanutils2.DynaProperty; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.DynaBean; +import org.apache.commons.beanutils2.DynaProperty; + /** * Test accessing ResultSets via DynaBeans. */ diff --git a/src/test/java/org/apache/commons/beanutils2/sql/DynaRowSetTestCase.java b/src/test/java/org/apache/commons/beanutils2/sql/DynaRowSetTestCase.java index 9feba296..95467c0a 100644 --- a/src/test/java/org/apache/commons/beanutils2/sql/DynaRowSetTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/sql/DynaRowSetTestCase.java @@ -25,13 +25,13 @@ import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.util.List; -import org.apache.commons.beanutils2.DynaBean; -import org.apache.commons.beanutils2.DynaProperty; - import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; +import org.apache.commons.beanutils2.DynaBean; +import org.apache.commons.beanutils2.DynaProperty; + /** * Test accessing RowSets via DynaBeans. */ diff --git a/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlDateConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlDateConverterTestCase.java index 8813a52b..fa22b630 100644 --- a/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlDateConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlDateConverterTestCase.java @@ -20,11 +20,11 @@ package org.apache.commons.beanutils2.sql.converters; import java.sql.Date; import java.util.Calendar; +import junit.framework.TestSuite; + import org.apache.commons.beanutils2.converters.AbstractDateConverterTest; import org.apache.commons.beanutils2.converters.DateTimeConverter; -import junit.framework.TestSuite; - /** * Test Case for the {@link SqlDateConverter} class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlTimeConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlTimeConverterTestCase.java index ecbf6784..4b2cd7a8 100644 --- a/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlTimeConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlTimeConverterTestCase.java @@ -21,10 +21,10 @@ import java.sql.Time; import java.util.Calendar; import java.util.Locale; -import org.apache.commons.beanutils2.converters.AbstractDateConverterTest; - import junit.framework.TestSuite; +import org.apache.commons.beanutils2.converters.AbstractDateConverterTest; + /** * Test Case for the {@link SqlTimeConverter} class. */ diff --git a/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlTimestampConverterTestCase.java b/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlTimestampConverterTestCase.java index c177f69e..92138e3b 100644 --- a/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlTimestampConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils2/sql/converters/SqlTimestampConverterTestCase.java @@ -23,10 +23,10 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; -import org.apache.commons.beanutils2.converters.AbstractDateConverterTest; - import junit.framework.TestSuite; +import org.apache.commons.beanutils2.converters.AbstractDateConverterTest; + /** * Test Case for the {@link SqlTimestampConverter} class. */