This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch 1.X in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
commit 4a3232dab4c6bd308cefa8f8086717d4f9976500 Author: Gary D. Gregory <[email protected]> AuthorDate: Wed Dec 25 18:05:06 2024 -0500 Sort imports Fix Javadoc warnings --- .../beanutils/BaseDynaBeanMapDecorator.java | 12 +++--- .../apache/commons/beanutils/BeanComparator.java | 45 ++++++++++++---------- .../org/apache/commons/beanutils/DynaProperty.java | 32 +++++++-------- .../beanutils/converters/AbstractConverter.java | 1 - .../apache/commons/beanutils/BeanMapTestCase.java | 6 +-- .../commons/beanutils/BeanPredicateTestCase.java | 4 +- .../commons/beanutils/BeanUtilsTestCase.java | 6 +-- .../commons/beanutils/BeanificationTestCase.java | 4 +- .../commons/beanutils/ConvertUtilsTestCase.java | 4 +- .../commons/beanutils/MethodUtilsTestCase.java | 6 +-- .../commons/beanutils/PropertyUtilsTestCase.java | 8 ++-- .../commons/beanutils/bugs/Jira157TestCase.java | 8 ++-- .../commons/beanutils/bugs/Jira18TestCase.java | 8 ++-- .../commons/beanutils/bugs/Jira273TestCase.java | 8 ++-- .../commons/beanutils/bugs/Jira298TestCase.java | 8 ++-- .../commons/beanutils/bugs/Jira339TestCase.java | 8 ++-- .../commons/beanutils/bugs/Jira345TestCase.java | 4 +- .../commons/beanutils/bugs/Jira347TestCase.java | 4 +- .../commons/beanutils/bugs/Jira349TestCase.java | 8 ++-- .../commons/beanutils/bugs/Jira357TestCase.java | 4 +- .../commons/beanutils/bugs/Jira358TestCase.java | 6 +-- .../commons/beanutils/bugs/Jira359TestCase.java | 8 ++-- .../commons/beanutils/bugs/Jira368TestCase.java | 4 +- .../commons/beanutils/bugs/Jira369TestCase.java | 4 +- .../commons/beanutils/bugs/Jira381TestCase.java | 4 +- .../commons/beanutils/bugs/Jira411TestCase.java | 4 +- .../commons/beanutils/bugs/Jira454TestCase.java | 4 +- .../commons/beanutils/bugs/Jira456TestCase.java | 4 +- .../commons/beanutils/bugs/Jira458TestCase.java | 4 +- .../commons/beanutils/bugs/Jira463TestCase.java | 4 +- .../commons/beanutils/bugs/Jira465TestCase.java | 4 +- .../commons/beanutils/bugs/Jira520TestCase.java | 4 +- .../commons/beanutils/bugs/Jira61TestCase.java | 8 ++-- .../commons/beanutils/bugs/Jira87TestCase.java | 8 ++-- .../commons/beanutils/bugs/Jira92TestCase.java | 4 +- .../converters/BigDecimalConverterTestCase.java | 4 +- .../converters/BigIntegerConverterTestCase.java | 4 +- .../converters/BooleanArrayConverterTestCase.java | 4 +- .../converters/BooleanConverterTestCase.java | 4 +- .../converters/ByteConverterTestCase.java | 4 +- .../converters/CharacterConverterTestCase.java | 6 +-- .../converters/ClassConverterTestCase.java | 6 +-- .../converters/DateConverterTestBase.java | 4 +- .../converters/DoubleConverterTestCase.java | 4 +- .../converters/FileConverterTestCase.java | 6 +-- .../converters/FloatConverterTestCase.java | 4 +- .../converters/IntegerConverterTestCase.java | 4 +- .../converters/LongConverterTestCase.java | 4 +- .../converters/NumberConverterTestBase.java | 4 +- .../converters/ShortConverterTestCase.java | 4 +- .../converters/StringConverterTestCase.java | 4 +- .../beanutils/converters/URLConverterTestCase.java | 6 +-- .../beanutils/locale/LocaleBeanUtilsTestCase.java | 8 ++-- .../locale/LocaleBeanificationTestCase.java | 8 ++-- .../beanutils/locale/LocaleConvertTestSuite.java | 6 +-- .../locale/LocaleConvertUtilsTestCase.java | 4 +- .../converters/BaseLocaleConverterTestCase.java | 4 +- 57 files changed, 184 insertions(+), 184 deletions(-) diff --git a/src/main/java/org/apache/commons/beanutils/BaseDynaBeanMapDecorator.java b/src/main/java/org/apache/commons/beanutils/BaseDynaBeanMapDecorator.java index 901b7620..4f6344a3 100644 --- a/src/main/java/org/apache/commons/beanutils/BaseDynaBeanMapDecorator.java +++ b/src/main/java/org/apache/commons/beanutils/BaseDynaBeanMapDecorator.java @@ -125,9 +125,9 @@ public abstract class BaseDynaBeanMapDecorator<K> implements Map<K, Object> { /** - * clear() operation is not supported. + * Always throws UnsupportedOperationException because this operation is unsupported. * - * @throws UnsupportedOperationException + * @throws UnsupportedOperationException Always thrown. */ @Override public void clear() { @@ -334,11 +334,11 @@ public abstract class BaseDynaBeanMapDecorator<K> implements Map<K, Object> { } /** - * remove() operation is not supported. + * Always throws UnsupportedOperationException because this operation is unsupported. * - * @param key The {@link DynaBean}'s property name - * @return the value removed - * @throws UnsupportedOperationException + * @param key The {@link DynaBean}'s property name. + * @return the value removed. + * @throws UnsupportedOperationException Always thrown. */ @Override public Object remove(final Object key) { diff --git a/src/main/java/org/apache/commons/beanutils/BeanComparator.java b/src/main/java/org/apache/commons/beanutils/BeanComparator.java index 37138d7b..5531d8ad 100644 --- a/src/main/java/org/apache/commons/beanutils/BeanComparator.java +++ b/src/main/java/org/apache/commons/beanutils/BeanComparator.java @@ -48,7 +48,16 @@ import org.apache.commons.collections.comparators.ComparableComparator; public class BeanComparator<T> implements Comparator<T>, Serializable { private static final long serialVersionUID = 1L; + + /** + * Method name to call to compare. + */ private String property; + + /** + * BeanComparator will pass the values of the specified bean property to this Comparator. If your bean property is not a comparable or contains null values, + * a suitable comparator may be supplied in this constructor. + */ private final Comparator<?> comparator; /** @@ -83,8 +92,8 @@ public class BeanComparator<T> implements Comparator<T>, Serializable { * property. See {@link PropertyUtilsBean} for property query language syntax. * If the property passed in is null then the actual objects will be compared */ - public BeanComparator( final String property ) { - this( property, ComparableComparator.getInstance() ); + public BeanComparator(final String property) { + this(property, ComparableComparator.getInstance()); } /** @@ -103,8 +112,8 @@ public class BeanComparator<T> implements Comparator<T>, Serializable { * contains null values, a suitable comparator * may be supplied in this constructor. */ - public BeanComparator( final String property, final Comparator<?> comparator ) { - setProperty( property ); + public BeanComparator(final String property, final Comparator<?> comparator) { + setProperty(property); if (comparator != null) { this.comparator = comparator; } else { @@ -121,30 +130,26 @@ public class BeanComparator<T> implements Comparator<T>, Serializable { * @return int negative or positive based on order */ @Override - public int compare( final T o1, final T o2 ) { + public int compare(final T o1, final T o2) { - if ( property == null ) { + if (property == null) { // compare the actual objects - return internalCompare( o1, o2 ); + return internalCompare(o1, o2); } try { - final Object value1 = PropertyUtils.getProperty( o1, property ); - final Object value2 = PropertyUtils.getProperty( o2, property ); - return internalCompare( value1, value2 ); - } - catch ( final IllegalAccessException iae ) { - throw new RuntimeException( "IllegalAccessException: " + iae.toString() ); - } - catch ( final InvocationTargetException ite ) { - throw new RuntimeException( "InvocationTargetException: " + ite.toString() ); - } - catch ( final NoSuchMethodException nsme ) { - throw new RuntimeException( "NoSuchMethodException: " + nsme.toString() ); + final Object value1 = PropertyUtils.getProperty(o1, property); + final Object value2 = PropertyUtils.getProperty(o2, property); + return internalCompare(value1, value2); + } catch (final IllegalAccessException iae) { + throw new RuntimeException("IllegalAccessException: " + iae.toString()); + } catch (final InvocationTargetException ite) { + throw new RuntimeException("InvocationTargetException: " + ite.toString()); + } catch (final NoSuchMethodException nsme) { + throw new RuntimeException("NoSuchMethodException: " + nsme.toString()); } } - /** * Two <code>BeanComparator</code>'s are equals if and only if * the wrapped comparators and the property names to be compared diff --git a/src/main/java/org/apache/commons/beanutils/DynaProperty.java b/src/main/java/org/apache/commons/beanutils/DynaProperty.java index d4f2bbc6..84f073a2 100644 --- a/src/main/java/org/apache/commons/beanutils/DynaProperty.java +++ b/src/main/java/org/apache/commons/beanutils/DynaProperty.java @@ -263,32 +263,29 @@ public class DynaProperty implements Serializable { /** - * Reads field values for this object safely. - * There are issues with serializing primitive class types on certain JVM versions - * (including java 1.3). - * This method provides a workaround. + * Reads field values for this object safely. There are issues with serializing primitive class types on certain JVM versions (including java 1.3). This + * method provides a workaround. * - * @throws StreamCorruptedException when the stream data values are outside expected range + * @param in the content source. + * @throws IOException when the stream data values are outside expected range + * @throws ClassNotFoundException Class of a serialized object cannot be found. */ private void readObject(final ObjectInputStream in) throws IOException, ClassNotFoundException { - this.type = readAnyClass(in); - if (isMapped() || isIndexed()) { this.contentType = readAnyClass(in); } - // read other values in.defaultReadObject(); } /** * Return a String representation of this Object. + * * @return a String representation of the dyna property */ @Override public String toString() { - final StringBuilder sb = new StringBuilder("DynaProperty[name="); sb.append(this.name); sb.append(",type="); @@ -302,7 +299,9 @@ public class DynaProperty implements Serializable { } /** - * Write a class using safe encoding to workaround java 1.3 serialization bug. + * Writes a class using safe encoding to workaround java 1.3 serialization bug. + * + * @throws IOException if I/O errors occur while writing to the underlying stream. */ private void writeAnyClass(final Class<?> clazz, final ObjectOutputStream out) throws IOException { // safely write out any class @@ -324,7 +323,6 @@ public class DynaProperty implements Serializable { } else if (Short.TYPE.equals(clazz)) { primitiveType = SHORT_TYPE; } - if (primitiveType == 0) { // then it's not a primitive type out.writeBoolean(false); @@ -338,19 +336,17 @@ public class DynaProperty implements Serializable { /** - * Writes this object safely. - * There are issues with serializing primitive class types on certain JVM versions - * (including java 1.3). - * This method provides a workaround. + * Writes this object safely. There are issues with serializing primitive class types on certain JVM versions (including java 1.3). This method provides a + * workaround. + * + * @param out Where to write. + * @throws IOException if I/O errors occur while writing to the underlying stream. */ private void writeObject(final ObjectOutputStream out) throws IOException { - writeAnyClass(this.type,out); - if (isMapped() || isIndexed()) { writeAnyClass(this.contentType,out); } - // write out other values out.defaultWriteObject(); } diff --git a/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java b/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java index c0199548..f01996fc 100644 --- a/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java +++ b/src/main/java/org/apache/commons/beanutils/converters/AbstractConverter.java @@ -19,7 +19,6 @@ package org.apache.commons.beanutils.converters; import java.lang.reflect.Array; import java.util.Collection; -import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.Converter; diff --git a/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java b/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java index 4c10d820..3a559df3 100644 --- a/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/BeanMapTestCase.java @@ -22,14 +22,14 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; -import junit.framework.Test; -import junit.textui.TestRunner; - import org.apache.commons.beanutils.bugs.other.Jira87BeanFactory; import org.apache.commons.collections.BulkTest; import org.apache.commons.collections.Transformer; import org.apache.commons.collections.map.AbstractTestMap; +import junit.framework.Test; +import junit.textui.TestRunner; + /** * Test cases for BeanMap * diff --git a/src/test/java/org/apache/commons/beanutils/BeanPredicateTestCase.java b/src/test/java/org/apache/commons/beanutils/BeanPredicateTestCase.java index bf96a790..7e294434 100644 --- a/src/test/java/org/apache/commons/beanutils/BeanPredicateTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/BeanPredicateTestCase.java @@ -17,13 +17,13 @@ package org.apache.commons.beanutils; -import junit.framework.TestCase; - import org.apache.commons.collections.functors.EqualPredicate; import org.apache.commons.collections.functors.InstanceofPredicate; import org.apache.commons.collections.functors.NotPredicate; import org.apache.commons.collections.functors.NullPredicate; +import junit.framework.TestCase; + /** */ public class BeanPredicateTestCase extends TestCase { diff --git a/src/test/java/org/apache/commons/beanutils/BeanUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/BeanUtilsTestCase.java index fab3a425..12bee02d 100644 --- a/src/test/java/org/apache/commons/beanutils/BeanUtilsTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/BeanUtilsTestCase.java @@ -24,13 +24,13 @@ import java.util.HashMap; import java.util.Locale; import java.util.Map; +import org.apache.commons.beanutils.converters.ArrayConverter; +import org.apache.commons.beanutils.converters.DateConverter; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.commons.beanutils.converters.ArrayConverter; -import org.apache.commons.beanutils.converters.DateConverter; - /** * <p> diff --git a/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java b/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java index 7e544e47..deebda5f 100644 --- a/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/BeanificationTestCase.java @@ -22,12 +22,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/beanutils/ConvertUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/ConvertUtilsTestCase.java index f17c7a9c..27745259 100644 --- a/src/test/java/org/apache/commons/beanutils/ConvertUtilsTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/ConvertUtilsTestCase.java @@ -25,12 +25,12 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Locale; +import org.apache.commons.beanutils.converters.DateConverter; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.commons.beanutils.converters.DateConverter; - /** * <p> diff --git a/src/test/java/org/apache/commons/beanutils/MethodUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/MethodUtilsTestCase.java index a28eb1af..679c5603 100644 --- a/src/test/java/org/apache/commons/beanutils/MethodUtilsTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/MethodUtilsTestCase.java @@ -21,13 +21,13 @@ import java.io.PrintStream; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import org.apache.commons.beanutils.priv.PrivateBeanFactory; +import org.apache.commons.beanutils.priv.PublicSubBean; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.commons.beanutils.priv.PrivateBeanFactory; -import org.apache.commons.beanutils.priv.PublicSubBean; - /** * <p> Test case for <code>MethodUtils</code> </p> * diff --git a/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java index 0aa711a1..a10b8345 100644 --- a/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/PropertyUtilsTestCase.java @@ -31,14 +31,14 @@ import java.util.List; import java.util.Map; import java.util.Set; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.priv.PrivateBeanFactory; import org.apache.commons.beanutils.priv.PrivateDirect; import org.apache.commons.beanutils.priv.PublicSubBean; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * <p>Test Case for the PropertyUtils class. The majority of these tests use diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira157TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira157TestCase.java index 1a1ed66c..4ba2342d 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira157TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira157TestCase.java @@ -19,16 +19,16 @@ package org.apache.commons.beanutils.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.beanutils.BeanUtils; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.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. diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira18TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira18TestCase.java index cef8c985..a59f66af 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira18TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira18TestCase.java @@ -16,15 +16,15 @@ */ package org.apache.commons.beanutils.bugs; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.beanutils.bugs.other.Jira18BeanFactory; 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 Jira issue# BEANUTILS-18. diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira273TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira273TestCase.java index a2b93af9..0010d182 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira273TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira273TestCase.java @@ -16,15 +16,15 @@ */ package org.apache.commons.beanutils.bugs; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.beanutils.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 overriden in anonymous or private subclasses * are not recognized by PropertyUtils - see issue# BEANUTILS-273. diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira298TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira298TestCase.java index 4174eace..53c133a9 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira298TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira298TestCase.java @@ -18,10 +18,6 @@ package org.apache.commons.beanutils.bugs; import java.lang.reflect.Method; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.MethodUtils; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.beanutils.bugs.other.Jira298BeanFactory; @@ -29,6 +25,10 @@ import org.apache.commons.beanutils.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> */ diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira339TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira339TestCase.java index 78853f4a..238db1e1 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira339TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/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.beanutils.BeanUtils; import org.apache.commons.beanutils.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> */ diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira345TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira345TestCase.java index 9410315b..ef71e947 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira345TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira345TestCase.java @@ -16,12 +16,12 @@ */ package org.apache.commons.beanutils.bugs; +import org.apache.commons.beanutils.BeanUtils; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.commons.beanutils.BeanUtils; - /** * @see <a href="https://issues.apache.org/jira/browse/BEANUTILS-345";>https://issues.apache.org/jira/browse/BEANUTILS-345</a> */ diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira347TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira347TestCase.java index dc0f6263..95db1466 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira347TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira347TestCase.java @@ -24,11 +24,11 @@ import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; -import junit.framework.TestCase; - import org.apache.commons.beanutils.MappedPropertyDescriptor; import org.apache.commons.beanutils.memoryleaktests.MemoryLeakTestCase; +import junit.framework.TestCase; + /** * Test case for Jira issue# BEANUTILS-347. * diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira349TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira349TestCase.java index 1bad9272..e29c2fdf 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira349TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira349TestCase.java @@ -16,14 +16,14 @@ */ package org.apache.commons.beanutils.bugs; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.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-349";>https://issues.apache.org/jira/browse/BEANUTILS-349</a> */ diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira357TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira357TestCase.java index 55c8d0f2..c2d667ea 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira357TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira357TestCase.java @@ -18,12 +18,12 @@ package org.apache.commons.beanutils.bugs; import java.beans.PropertyDescriptor; +import org.apache.commons.beanutils.PropertyUtils; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.commons.beanutils.PropertyUtils; - /** * @see <a href="https://issues.apache.org/jira/browse/BEANUTILS-357";>https://issues.apache.org/jira/browse/BEANUTILS-357</a> */ diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira358TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira358TestCase.java index fdb88a9d..a65c202f 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira358TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira358TestCase.java @@ -16,13 +16,13 @@ */ package org.apache.commons.beanutils.bugs; +import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.beanutils.TestBean; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.commons.beanutils.PropertyUtils; -import org.apache.commons.beanutils.TestBean; - /** * @see <a href="https://issues.apache.org/jira/browse/BEANUTILS-358";>https://issues.apache.org/jira/browse/BEANUTILS-358</a> */ diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira359TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira359TestCase.java index 6203889f..87c5a0a7 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira359TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira359TestCase.java @@ -16,15 +16,15 @@ */ package org.apache.commons.beanutils.bugs; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.converters.ArrayConverter; import org.apache.commons.beanutils.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> */ diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira368TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira368TestCase.java index 71b72f1c..d469be56 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira368TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira368TestCase.java @@ -16,12 +16,12 @@ */ package org.apache.commons.beanutils.bugs; +import org.apache.commons.beanutils.BeanUtils; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.commons.beanutils.BeanUtils; - /** * @see <a href="https://issues.apache.org/jira/browse/BEANUTILS-368";>https://issues.apache.org/jira/browse/BEANUTILS-368</a> */ diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira369TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira369TestCase.java index bac6feed..d62faf9d 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira369TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira369TestCase.java @@ -16,12 +16,12 @@ */ package org.apache.commons.beanutils.bugs; +import org.apache.commons.beanutils.BeanUtils; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.commons.beanutils.BeanUtils; - /** * @see <a href="https://issues.apache.org/jira/browse/BEANUTILS-369";>https://issues.apache.org/jira/browse/BEANUTILS-369</a> */ diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira381TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira381TestCase.java index 03cc5657..b017986b 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira381TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira381TestCase.java @@ -18,10 +18,10 @@ package org.apache.commons.beanutils.bugs; import java.lang.reflect.Method; -import junit.framework.TestCase; - import org.apache.commons.beanutils.MethodUtils; +import junit.framework.TestCase; + /** * MethodUtils's getMatchingAccessibleMethod() does not correctly * handle inheritance and method overloading. diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira411TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira411TestCase.java index 03e4f450..96be0f58 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira411TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira411TestCase.java @@ -16,10 +16,10 @@ */ package org.apache.commons.beanutils.bugs; -import junit.framework.TestCase; - import org.apache.commons.beanutils.BeanUtilsBean; +import junit.framework.TestCase; + /** * BeanUtilsBean.setProperty throws IllegalArgumentException if getter of nested * property returns null diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira454TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira454TestCase.java index 8d7cbcb0..31ca995f 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira454TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira454TestCase.java @@ -18,10 +18,10 @@ package org.apache.commons.beanutils.bugs; import java.util.Date; -import junit.framework.TestCase; - import org.apache.commons.beanutils.BeanUtils; +import junit.framework.TestCase; + /** * 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/beanutils/bugs/Jira456TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira456TestCase.java index f903d9b5..de72cdd8 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira456TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira456TestCase.java @@ -18,12 +18,12 @@ package org.apache.commons.beanutils.bugs; import java.beans.PropertyDescriptor; -import junit.framework.TestCase; - import org.apache.commons.beanutils.FluentIntrospectionTestBean; import org.apache.commons.beanutils.FluentPropertyBeanIntrospector; import org.apache.commons.beanutils.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 diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira458TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira458TestCase.java index f82956ff..dbcc6678 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira458TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira458TestCase.java @@ -18,11 +18,11 @@ package org.apache.commons.beanutils.bugs; import java.util.Locale; -import junit.framework.TestCase; - import org.apache.commons.beanutils.Converter; import org.apache.commons.beanutils.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/beanutils/bugs/Jira463TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira463TestCase.java index e82a5486..759713dc 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira463TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira463TestCase.java @@ -16,12 +16,12 @@ */ package org.apache.commons.beanutils.bugs; -import junit.framework.TestCase; - import org.apache.commons.beanutils.AlphaBean; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.SuppressPropertiesBeanIntrospector; +import junit.framework.TestCase; + /** * Class loader vulnerability in DefaultResolver * diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira465TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira465TestCase.java index 3a51b9d7..f1c27053 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira465TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira465TestCase.java @@ -20,10 +20,10 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import junit.framework.TestCase; - import org.apache.commons.beanutils.BeanUtils; +import junit.framework.TestCase; + /** * Indexed List Setters no longer work. * diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira520TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira520TestCase.java index fc1ac77d..597b56df 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira520TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira520TestCase.java @@ -16,12 +16,12 @@ */ package org.apache.commons.beanutils.bugs; -import junit.framework.TestCase; - import org.apache.commons.beanutils.AlphaBean; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.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/beanutils/bugs/Jira61TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira61TestCase.java index 0633b252..76b78771 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira61TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira61TestCase.java @@ -19,10 +19,6 @@ package org.apache.commons.beanutils.bugs; import java.util.HashMap; import java.util.Map; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.beanutils.WrapDynaBean; @@ -31,6 +27,10 @@ import org.apache.commons.beanutils.bugs.other.Jira61BeanFactory.TestBean; 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 Jira issue# BEANUTILS-61. * diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java index effea75c..222de9cc 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira87TestCase.java @@ -16,15 +16,15 @@ */ package org.apache.commons.beanutils.bugs; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.beanutils.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. * diff --git a/src/test/java/org/apache/commons/beanutils/bugs/Jira92TestCase.java b/src/test/java/org/apache/commons/beanutils/bugs/Jira92TestCase.java index 0a04a4db..df6ad7c0 100644 --- a/src/test/java/org/apache/commons/beanutils/bugs/Jira92TestCase.java +++ b/src/test/java/org/apache/commons/beanutils/bugs/Jira92TestCase.java @@ -16,11 +16,11 @@ */ package org.apache.commons.beanutils.bugs; -import junit.framework.TestCase; - import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.beanutils.TestBean; +import junit.framework.TestCase; + /** * Test case for Jira issue# BEANUTILS-92. * diff --git a/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java index 9701be0c..b1de35b3 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/BigDecimalConverterTestCase.java @@ -19,10 +19,10 @@ package org.apache.commons.beanutils.converters; import java.math.BigDecimal; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.Converter; +import junit.framework.TestSuite; + /** * Test Case for the DoubleConverter class. diff --git a/src/test/java/org/apache/commons/beanutils/converters/BigIntegerConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/converters/BigIntegerConverterTestCase.java index c8d5653f..c833ea74 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/BigIntegerConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/BigIntegerConverterTestCase.java @@ -19,10 +19,10 @@ package org.apache.commons.beanutils.converters; import java.math.BigInteger; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.Converter; +import junit.framework.TestSuite; + /** * Test Case for the BigInteger class. diff --git a/src/test/java/org/apache/commons/beanutils/converters/BooleanArrayConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/converters/BooleanArrayConverterTestCase.java index bfc73ec4..2af8999d 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/BooleanArrayConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/BooleanArrayConverterTestCase.java @@ -17,11 +17,11 @@ package org.apache.commons.beanutils.converters; -import junit.framework.TestCase; - import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.ConvertUtils; +import junit.framework.TestCase; + /** * Test conversions of String[]->boolean[] and String->boolean[]. * diff --git a/src/test/java/org/apache/commons/beanutils/converters/BooleanConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/converters/BooleanConverterTestCase.java index 8405f810..1d8b417b 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/BooleanConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/BooleanConverterTestCase.java @@ -17,10 +17,10 @@ package org.apache.commons.beanutils.converters; -import junit.framework.TestCase; - import org.apache.commons.beanutils.ConversionException; +import junit.framework.TestCase; + /** */ public class BooleanConverterTestCase extends TestCase { diff --git a/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java index c79b8d9c..36cfac2b 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/ByteConverterTestCase.java @@ -17,10 +17,10 @@ package org.apache.commons.beanutils.converters; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.Converter; +import junit.framework.TestSuite; + /** * Test Case for the ByteConverter class. diff --git a/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTestCase.java index 150dfb40..43e6fcdb 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/CharacterConverterTestCase.java @@ -16,12 +16,12 @@ */ package org.apache.commons.beanutils.converters; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * Test Case for the CharacterConverter class. * diff --git a/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTestCase.java index e4b6244f..c0bdb5a4 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/ClassConverterTestCase.java @@ -16,12 +16,12 @@ */ package org.apache.commons.beanutils.converters; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * Test Case for the ClassConverter class. * diff --git a/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestBase.java b/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestBase.java index e0539285..510f37ee 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestBase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/DateConverterTestBase.java @@ -24,11 +24,11 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.Locale; -import junit.framework.TestCase; - import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; +import junit.framework.TestCase; + /** * Abstract base for <Date>Converter classes. * diff --git a/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTestCase.java index 7c2293c0..e0acb5cb 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/DoubleConverterTestCase.java @@ -17,10 +17,10 @@ package org.apache.commons.beanutils.converters; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.Converter; +import junit.framework.TestSuite; + /** * Test Case for the DoubleConverter class. diff --git a/src/test/java/org/apache/commons/beanutils/converters/FileConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/converters/FileConverterTestCase.java index 63eb8a44..570aae2d 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/FileConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/FileConverterTestCase.java @@ -19,12 +19,12 @@ package org.apache.commons.beanutils.converters; import java.io.File; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * Test Case for the FileConverter class. diff --git a/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTestCase.java index 42fbf9f7..94a94c89 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/FloatConverterTestCase.java @@ -17,10 +17,10 @@ package org.apache.commons.beanutils.converters; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.Converter; +import junit.framework.TestSuite; + /** * Test Case for the FloatConverter class. diff --git a/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java index 87d8db95..df5d3f38 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java @@ -17,11 +17,11 @@ package org.apache.commons.beanutils.converters; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; +import junit.framework.TestSuite; + /** * Test Case for the IntegerConverter class. diff --git a/src/test/java/org/apache/commons/beanutils/converters/LongConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/converters/LongConverterTestCase.java index 1fc91f4b..3367567d 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/LongConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/LongConverterTestCase.java @@ -17,10 +17,10 @@ package org.apache.commons.beanutils.converters; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.Converter; +import junit.framework.TestSuite; + /** * Test Case for the LongConverter class. diff --git a/src/test/java/org/apache/commons/beanutils/converters/NumberConverterTestBase.java b/src/test/java/org/apache/commons/beanutils/converters/NumberConverterTestBase.java index 8a246fe7..b93bd317 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/NumberConverterTestBase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/NumberConverterTestBase.java @@ -23,10 +23,10 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; -import junit.framework.TestCase; - import org.apache.commons.beanutils.ConversionException; +import junit.framework.TestCase; + /** * Abstract base for <Number>Converter classes. diff --git a/src/test/java/org/apache/commons/beanutils/converters/ShortConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/converters/ShortConverterTestCase.java index a405f18a..348806a2 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/ShortConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/ShortConverterTestCase.java @@ -17,10 +17,10 @@ package org.apache.commons.beanutils.converters; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.Converter; +import junit.framework.TestSuite; + /** * Test Case for the ShortConverter class. diff --git a/src/test/java/org/apache/commons/beanutils/converters/StringConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/converters/StringConverterTestCase.java index 9527a94f..6c3b49bd 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/StringConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/StringConverterTestCase.java @@ -16,10 +16,10 @@ */ package org.apache.commons.beanutils.converters; -import junit.framework.TestCase; - import org.apache.commons.beanutils.ConversionException; +import junit.framework.TestCase; + /** * Test case for {@code StringConverter}. * diff --git a/src/test/java/org/apache/commons/beanutils/converters/URLConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/converters/URLConverterTestCase.java index ba77e48c..142cc3c9 100644 --- a/src/test/java/org/apache/commons/beanutils/converters/URLConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/converters/URLConverterTestCase.java @@ -19,12 +19,12 @@ package org.apache.commons.beanutils.converters; import java.net.URL; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * Test Case for the URLConverter class. diff --git a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java index 15b9ec73..10246240 100644 --- a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanUtilsTestCase.java @@ -16,14 +16,14 @@ */ package org.apache.commons.beanutils.locale; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.TestBean; 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 {@link LocaleBeanUtils}. * diff --git a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java index 275ce92a..3522cc41 100644 --- a/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java @@ -23,10 +23,6 @@ import java.util.Locale; import java.util.Map; import java.util.WeakHashMap; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.ContextClassLoaderLocal; import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.ConvertUtils; @@ -34,6 +30,10 @@ import org.apache.commons.beanutils.PrimitiveBean; import org.apache.commons.beanutils.locale.converters.LongLocaleConverter; import org.apache.commons.logging.LogFactory; +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + /** * <p> * Test Case for changes made during LocaleBeanutils Beanification. diff --git a/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java b/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java index 15a27562..90e7c029 100644 --- a/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java +++ b/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertTestSuite.java @@ -17,9 +17,6 @@ package org.apache.commons.beanutils.locale; -import junit.framework.Test; -import junit.framework.TestSuite; - import org.apache.commons.beanutils.locale.converters.BigDecimalLocaleConverterTestCase; import org.apache.commons.beanutils.locale.converters.BigIntegerLocaleConverterTestCase; import org.apache.commons.beanutils.locale.converters.ByteLocaleConverterTestCase; @@ -30,6 +27,9 @@ import org.apache.commons.beanutils.locale.converters.IntegerLocaleConverterTest import org.apache.commons.beanutils.locale.converters.LongLocaleConverterTestCase; import org.apache.commons.beanutils.locale.converters.ShortLocaleConverterTestCase; +import junit.framework.Test; +import junit.framework.TestSuite; + /** * <p> * Created a test suite so that new test cases can be added here without having to diff --git a/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java index 2cb1f0b7..7b9b44e6 100644 --- a/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/locale/LocaleConvertUtilsTestCase.java @@ -25,12 +25,12 @@ import java.text.DecimalFormat; import java.text.NumberFormat; import java.util.Locale; +import org.apache.commons.beanutils.ConversionException; + import junit.framework.Test; import junit.framework.TestCase; import junit.framework.TestSuite; -import org.apache.commons.beanutils.ConversionException; - /** * <p> diff --git a/src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTestCase.java b/src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTestCase.java index 1fae32e4..8ed28ebd 100644 --- a/src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTestCase.java +++ b/src/test/java/org/apache/commons/beanutils/locale/converters/BaseLocaleConverterTestCase.java @@ -19,10 +19,10 @@ package org.apache.commons.beanutils.locale.converters; import java.util.Locale; -import junit.framework.TestCase; - import org.apache.commons.beanutils.locale.BaseLocaleConverter; +import junit.framework.TestCase; + /** * Base Test Case for the DecimalLocaleConverter classes. This class doesn't * define any real tests; it just provides useful methods for the real
