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 a9e8cc4b Remove JUnit 3 style suite() methods
a9e8cc4b is described below

commit a9e8cc4b672e7fbef2fafc7be70af2a1984f5acd
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Aug 30 22:10:59 2024 -0400

    Remove JUnit 3 style suite() methods
---
 .../org/apache/commons/beanutils2/BasicDynaBeanTestCase.java |  9 ---------
 .../apache/commons/beanutils2/BeanComparatorTestCase.java    |  8 --------
 .../java/org/apache/commons/beanutils2/BeanMapTestCase.java  |  7 -------
 .../apache/commons/beanutils2/BeanUtilsBean2TestCase.java    | 10 ----------
 .../org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java |  9 ---------
 .../org/apache/commons/beanutils2/BeanUtilsBenchCase.java    |  9 ---------
 .../org/apache/commons/beanutils2/BeanificationTestCase.java |  9 ---------
 .../apache/commons/beanutils2/ConstructorUtilsTestCase.java  |  9 ---------
 .../org/apache/commons/beanutils2/ConvertUtilsTestCase.java  |  9 ---------
 .../commons/beanutils2/DynaBeanMapDecoratorTestCase.java     |  8 --------
 .../org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java | 11 -----------
 .../org/apache/commons/beanutils2/DynaPropertyTestCase.java  | 12 ------------
 .../apache/commons/beanutils2/DynaPropertyUtilsTestCase.java |  9 ---------
 .../org/apache/commons/beanutils2/LazyDynaBeanTestCase.java  |  8 --------
 .../org/apache/commons/beanutils2/LazyDynaClassTestCase.java |  9 ---------
 .../org/apache/commons/beanutils2/LazyDynaListTestCase.java  |  8 --------
 .../org/apache/commons/beanutils2/LazyDynaMapTestCase.java   |  8 --------
 .../apache/commons/beanutils2/MappedPropertyTestCase.java    |  9 ---------
 .../org/apache/commons/beanutils2/MethodUtilsTestCase.java   |  9 ---------
 .../apache/commons/beanutils2/PropertyUtilsBenchCase.java    | 11 -----------
 .../org/apache/commons/beanutils2/PropertyUtilsTestCase.java | 11 -----------
 .../org/apache/commons/beanutils2/WrapDynaBeanTestCase.java  | 12 ------------
 .../org/apache/commons/beanutils2/bugs/Jira157TestCase.java  | 11 -----------
 .../org/apache/commons/beanutils2/bugs/Jira273TestCase.java  | 11 -----------
 .../org/apache/commons/beanutils2/bugs/Jira298TestCase.java  | 11 -----------
 .../org/apache/commons/beanutils2/bugs/Jira339TestCase.java  | 11 -----------
 .../org/apache/commons/beanutils2/bugs/Jira345TestCase.java  | 11 -----------
 .../org/apache/commons/beanutils2/bugs/Jira358TestCase.java  | 11 -----------
 .../org/apache/commons/beanutils2/bugs/Jira359TestCase.java  | 11 -----------
 .../org/apache/commons/beanutils2/bugs/Jira368TestCase.java  | 11 -----------
 .../org/apache/commons/beanutils2/bugs/Jira369TestCase.java  | 11 -----------
 .../beanutils2/converters/ArrayConverterTestCase.java        | 10 ----------
 .../beanutils2/converters/BigDecimalConverterTestCase.java   |  6 ------
 .../beanutils2/converters/BigIntegerConverterTestCase.java   |  6 ------
 .../commons/beanutils2/converters/ByteConverterTestCase.java |  6 ------
 .../beanutils2/converters/CalendarConverterTestCase.java     | 11 -----------
 .../beanutils2/converters/CharacterConverterTestCase.java    | 10 ----------
 .../beanutils2/converters/ClassConverterTestCase.java        | 10 ----------
 .../commons/beanutils2/converters/ClassReloaderTestCase.java |  5 -----
 .../commons/beanutils2/converters/DateConverterTestCase.java | 11 -----------
 .../beanutils2/converters/DoubleConverterTestCase.java       |  6 ------
 .../beanutils2/converters/DurationConverterTestCase.java     |  5 -----
 .../commons/beanutils2/converters/EnumConverterTestCase.java |  5 -----
 .../commons/beanutils2/converters/FileConverterTestCase.java |  5 -----
 .../beanutils2/converters/FloatConverterTestCase.java        |  6 ------
 .../beanutils2/converters/IntegerConverterTestCase.java      |  6 ------
 .../beanutils2/converters/LocalDateConverterTestCase.java    | 11 -----------
 .../converters/LocalDateTimeConverterTestCase.java           | 11 -----------
 .../beanutils2/converters/LocalTimeConverterTestCase.java    |  5 -----
 .../commons/beanutils2/converters/LongConverterTestCase.java |  6 ------
 .../beanutils2/converters/MonthDayConverterTestCase.java     |  5 -----
 .../converters/OffsetDateTimeConverterTestCase.java          | 11 -----------
 .../beanutils2/converters/OffsetTimeConverterTestCase.java   |  5 -----
 .../commons/beanutils2/converters/PathConverterTestCase.java |  5 -----
 .../beanutils2/converters/PeriodConverterTestCase.java       |  5 -----
 .../beanutils2/converters/ShortConverterTestCase.java        |  6 ------
 .../commons/beanutils2/converters/URIConverterTestCase.java  |  5 -----
 .../commons/beanutils2/converters/UUIDConverterTestCase.java |  5 -----
 .../commons/beanutils2/converters/YearConverterTestCase.java |  5 -----
 .../beanutils2/converters/YearMonthConverterTestCase.java    |  5 -----
 .../beanutils2/converters/ZoneIdConverterTestCase.java       |  5 -----
 .../beanutils2/converters/ZoneOffsetConverterTestCase.java   |  5 -----
 .../converters/ZonedDateTimeConverterTestCase.java           | 11 -----------
 .../beanutils2/expression/DefaultResolverTestCase.java       | 10 ----------
 .../beanutils2/locale/LocaleConvertUtilsTestCase.java        |  9 ---------
 .../apache/commons/beanutils2/sql/DynaResultSetTestCase.java | 11 -----------
 .../apache/commons/beanutils2/sql/DynaRowSetTestCase.java    | 11 -----------
 .../beanutils2/sql/converters/SqlDateConverterTestCase.java  | 11 -----------
 .../beanutils2/sql/converters/SqlTimeConverterTestCase.java  | 11 -----------
 .../sql/converters/SqlTimestampConverterTestCase.java        | 11 -----------
 70 files changed, 596 deletions(-)

diff --git 
a/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
index afb82fd3..a1f75089 100644
--- a/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BasicDynaBeanTestCase.java
@@ -29,9 +29,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * <p>
@@ -49,13 +47,6 @@ public class BasicDynaBeanTestCase extends TestCase {
             "intProperty", "listIndexed", "longProperty", "mappedProperty", 
"mappedIntProperty", "nullProperty", "shortProperty", "stringArray",
             "stringIndexed", "stringProperty", };
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(BasicDynaBeanTestCase.class);
-    }
-
     /**
      * The basic test bean for each test.
      */
diff --git 
a/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java
index d67b7f47..1815113d 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanComparatorTestCase.java
@@ -17,21 +17,13 @@
 
 package org.apache.commons.beanutils2;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Test Case for the BeanComparator class.
  */
 public class BeanComparatorTestCase extends TestCase {
 
-    /**
-     * Returns the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(BeanComparatorTestCase.class);
-    }
     /**
      * The test beans for each test.
      */
diff --git a/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
index 2cdba79c..615ad7e4 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanMapTestCase.java
@@ -21,10 +21,7 @@ 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;
 
 /**
@@ -153,10 +150,6 @@ public class BeanMapTestCase extends 
AbstractMapTest<String, Object> {
      * Also note: The sample keys and mappings were generated manually.
      */
 
-    public static Test suite() {
-        return BulkTest.makeSuite(BeanMapTestCase.class);
-    }
-
     /**
      * An object value that will be stored in the bean map as a value. Need to 
save this externally so that we can make sure the object instances are 
equivalent
      * since getSampleValues() would otherwise construct a new and different 
Object each time.
diff --git 
a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBean2TestCase.java 
b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBean2TestCase.java
index 6ab032aa..9d97ba3d 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBean2TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBean2TestCase.java
@@ -16,21 +16,11 @@
  */
 package org.apache.commons.beanutils2;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * Test Case for the {@link BeanUtilsBean2}.
  */
 public class BeanUtilsBean2TestCase extends BeanUtilsBeanTestCase {
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(BeanUtilsBean2TestCase.class);
-    }
-
     /**
      * Constructs a new instance of this test case.
      *
diff --git 
a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java
index 96f3d576..a2faab43 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBeanTestCase.java
@@ -25,9 +25,7 @@ import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-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;
@@ -63,13 +61,6 @@ public class BeanUtilsBeanTestCase extends TestCase {
         return false;
     }
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(BeanUtilsBeanTestCase.class);
-    }
-
     /**
      * The test bean for each test.
      */
diff --git 
a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java 
b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
index 205be035..8cd27a9e 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanUtilsBenchCase.java
@@ -21,22 +21,13 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * JUnit Test Case containing microbenchmarks for BeanUtils.
  */
 public class BeanUtilsBenchCase extends TestCase {
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(BeanUtilsBenchCase.class);
-    }
-
     // Basic loop counter
     private long counter = 100000;
 
diff --git 
a/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java
index a003e7a3..97311b7a 100644
--- a/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/BeanificationTestCase.java
@@ -24,9 +24,7 @@ import java.lang.ref.WeakReference;
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.logging.LogFactory;
 
@@ -104,13 +102,6 @@ public class BeanificationTestCase extends TestCase {
     /** Maximum number of iterations before our test fails */
     public static final int MAX_GC_ITERATIONS = 50;
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(BeanificationTestCase.class);
-    }
-
     /**
      * Constructs a new instance of this test case.
      *
diff --git 
a/src/test/java/org/apache/commons/beanutils2/ConstructorUtilsTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/ConstructorUtilsTestCase.java
index ff19ba7f..0f578f94 100644
--- a/src/test/java/org/apache/commons/beanutils2/ConstructorUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/ConstructorUtilsTestCase.java
@@ -20,9 +20,7 @@ package org.apache.commons.beanutils2;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * <p>
@@ -31,13 +29,6 @@ import junit.framework.TestSuite;
  */
 public class ConstructorUtilsTestCase extends TestCase {
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(ConstructorUtilsTestCase.class);
-    }
-
     /**
      * Constructs a new instance of this test case.
      *
diff --git 
a/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java
index 8829881b..738c2d92 100644
--- a/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/ConvertUtilsTestCase.java
@@ -24,9 +24,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Locale;
 
-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;
@@ -39,13 +37,6 @@ import org.apache.commons.lang3.ArrayUtils;
 
 public class ConvertUtilsTestCase extends TestCase {
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(ConvertUtilsTestCase.class);
-    }
-
     /**
      * Constructs a new instance of this test case.
      *
diff --git 
a/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java
index 0e7ac3e9..e5ce4851 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/DynaBeanMapDecoratorTestCase.java
@@ -26,9 +26,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * <p>
@@ -51,12 +49,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()));
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(DynaBeanMapDecoratorTestCase.class);
-    }
     private final Map<Object, Object> mapVal = new HashMap<>();
     private final Object[] values = { stringVal, null, intVal, dateVal, mapVal 
};
     private BasicDynaBean dynaBean;
diff --git 
a/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
index b7bce59d..4305b163 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaBeanUtilsTestCase.java
@@ -23,9 +23,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Test case for BeanUtils when the underlying bean is actually a DynaBean.
@@ -54,15 +52,6 @@ public class DynaBeanUtilsTestCase extends TestCase {
 
     }
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-
-        return new TestSuite(DynaBeanUtilsTestCase.class);
-
-    }
-
     /**
      * The basic test bean for each test.
      */
diff --git 
a/src/test/java/org/apache/commons/beanutils2/DynaPropertyTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/DynaPropertyTestCase.java
index f16a7bd1..9a257228 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaPropertyTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaPropertyTestCase.java
@@ -18,25 +18,13 @@ package org.apache.commons.beanutils2;
 
 import java.util.Collection;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Test case for {@link DynaProperty}.
  */
 public class DynaPropertyTestCase extends TestCase {
 
-    /**
-     * Creates the tests included in this test suite.
-     *
-     * @return a test suite
-     */
-    public static Test suite() {
-
-        return new TestSuite(DynaPropertyTestCase.class);
-
-    }
     private DynaProperty testPropertyWithName;
     private DynaProperty testProperty1Duplicate;
     private DynaProperty testPropertyWithNameAndType;
diff --git 
a/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
index e9c12d2b..331f043e 100644
--- a/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/DynaPropertyUtilsTestCase.java
@@ -25,22 +25,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Test accessing DynaBeans transparently via PropertyUtils.
  */
 public class DynaPropertyUtilsTestCase extends TestCase {
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(DynaPropertyUtilsTestCase.class);
-    }
-
     /**
      * The basic test bean for each test.
      */
diff --git 
a/src/test/java/org/apache/commons/beanutils2/LazyDynaBeanTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/LazyDynaBeanTestCase.java
index 67fe3e45..b6f8ca0e 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaBeanTestCase.java
@@ -22,9 +22,7 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.TreeMap;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * <p>
@@ -33,12 +31,6 @@ import junit.framework.TestSuite;
  */
 public class LazyDynaBeanTestCase extends TestCase {
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(LazyDynaBeanTestCase.class);
-    }
     protected LazyDynaBean bean;
     protected LazyDynaClass dynaClass;
     protected String testProperty = "myProperty";
diff --git 
a/src/test/java/org/apache/commons/beanutils2/LazyDynaClassTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/LazyDynaClassTestCase.java
index 2f4a108d..86462e17 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaClassTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaClassTestCase.java
@@ -18,9 +18,7 @@ package org.apache.commons.beanutils2;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * <p>
@@ -29,13 +27,6 @@ import junit.framework.TestSuite;
  */
 public class LazyDynaClassTestCase extends TestCase {
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(LazyDynaClassTestCase.class);
-    }
-
     protected LazyDynaClass dynaClass;
 
     protected String testProperty = "myProperty";
diff --git 
a/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
index e11a7425..9bf257a7 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaListTestCase.java
@@ -26,9 +26,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * <p>
@@ -40,12 +38,6 @@ public class LazyDynaListTestCase extends TestCase {
     private static final String BASIC_PROP1 = "BasicDynaClass_Property1";
     private static final String BASIC_PROP2 = "BasicDynaClass_Property2";
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(LazyDynaListTestCase.class);
-    }
     protected DynaProperty[] properties = { new DynaProperty(BASIC_PROP1, 
String.class), new DynaProperty(BASIC_PROP2, HashMap.class) };
     protected DynaClass treeMapDynaClass = new LazyDynaMap(new TreeMap<>());
     protected DynaClass hashMapDynaClass = new LazyDynaMap(new HashMap<>());
diff --git 
a/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java
index 514d80ce..513c8105 100644
--- a/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/LazyDynaMapTestCase.java
@@ -24,9 +24,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * <p>
@@ -35,12 +33,6 @@ import junit.framework.TestSuite;
  */
 public class LazyDynaMapTestCase extends TestCase {
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(LazyDynaMapTestCase.class);
-    }
     protected LazyDynaMap dynaMap;
     protected String testProperty = "myProperty";
     protected String testPropertyA = "myProperty-A";
diff --git 
a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestCase.java
index 91274023..8527a5c5 100644
--- a/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/MappedPropertyTestCase.java
@@ -16,9 +16,7 @@
  */
 package org.apache.commons.beanutils2;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * <p>
@@ -27,13 +25,6 @@ import junit.framework.TestSuite;
  */
 public class MappedPropertyTestCase extends TestCase {
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(MappedPropertyTestCase.class);
-    }
-
     /**
      * Constructs a new instance of this test case.
      *
diff --git 
a/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java
index cfd37a6d..daa03394 100644
--- a/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/MethodUtilsTestCase.java
@@ -21,9 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertAll;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
-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;
@@ -41,13 +39,6 @@ public class MethodUtilsTestCase extends TestCase {
         assertTrue("Method is not public", 
Modifier.isPublic(method.getModifiers()));
     }
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(MethodUtilsTestCase.class);
-    }
-
     /**
      * Constructs a new instance of this test case.
      *
diff --git 
a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java 
b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
index b2543d32..9267cc15 100644
--- a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsBenchCase.java
@@ -20,9 +20,7 @@ package org.apache.commons.beanutils2;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * JUnit Test Case containing microbenchmarks for PropertyUtils.
@@ -30,15 +28,6 @@ import junit.framework.TestSuite;
 
 public class PropertyUtilsBenchCase extends TestCase {
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-
-        return new TestSuite(PropertyUtilsBenchCase.class);
-
-    }
-
     // Basic loop counter
     private long counter = 100000;
 
diff --git 
a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
index c4ec8391..083bddd5 100644
--- a/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/PropertyUtilsTestCase.java
@@ -31,9 +31,7 @@ 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.beanutils2.priv.PrivateBeanFactory;
 import org.apache.commons.beanutils2.priv.PrivateDirect;
@@ -107,15 +105,6 @@ public class PropertyUtilsTestCase extends TestCase {
         return null;
     }
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-
-        return new TestSuite(PropertyUtilsTestCase.class);
-
-    }
-
     /**
      * The basic test bean for each test.
      */
diff --git 
a/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java 
b/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java
index aae629c5..80229200 100644
--- a/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/WrapDynaBeanTestCase.java
@@ -22,9 +22,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 /**
  * <p>
  * Test Case for the {@code WrapDynaBean} implementation class. These tests 
were based on the ones in {@code PropertyUtilsTestCase} because the two classes
@@ -34,15 +31,6 @@ import junit.framework.TestSuite;
 
 public class WrapDynaBeanTestCase extends BasicDynaBeanTestCase {
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-
-        return new TestSuite(WrapDynaBeanTestCase.class);
-
-    }
-
     /**
      * Constructs a new instance of this test case.
      *
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 f786f46f..b028088a 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira157TestCase.java
@@ -19,9 +19,7 @@ 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;
@@ -63,15 +61,6 @@ public class Jira157TestCase extends TestCase {
 
     private static final Log LOG = LogFactory.getLog(Jira157TestCase.class);
 
-    /**
-     * Create a test suite for this test.
-     *
-     * @return a test suite
-     */
-    public static Test suite() {
-        return new TestSuite(Jira157TestCase.class);
-    }
-
     /**
      * Create a test case with the specified name.
      *
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 d45b4dd5..497fb50f 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira273TestCase.java
@@ -16,9 +16,7 @@
  */
 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;
@@ -34,15 +32,6 @@ public class Jira273TestCase extends TestCase {
 
     private static final Log LOG = LogFactory.getLog(Jira273TestCase.class);
 
-    /**
-     * Create a test suite for this test.
-     *
-     * @return a test suite
-     */
-    public static Test suite() {
-        return new TestSuite(Jira273TestCase.class);
-    }
-
     /**
      * Create a test case with the specified name.
      *
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 5ebe362e..fcbc90ff 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira298TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira298TestCase.java
@@ -18,9 +18,7 @@ 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;
@@ -36,15 +34,6 @@ public class Jira298TestCase extends TestCase {
 
     private static final Log LOG = LogFactory.getLog(Jira298TestCase.class);
 
-    /**
-     * Create a test suite for this test.
-     *
-     * @return a test suite
-     */
-    public static Test suite() {
-        return new TestSuite(Jira298TestCase.class);
-    }
-
     /**
      * Create a test case with the specified name.
      *
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 87308313..d929b1c4 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira339TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira339TestCase.java
@@ -20,9 +20,7 @@ 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;
@@ -62,15 +60,6 @@ public class Jira339TestCase extends TestCase {
 
     private static final Log LOG = LogFactory.getLog(Jira339TestCase.class);
 
-    /**
-     * Create a test suite for this test.
-     *
-     * @return a test suite
-     */
-    public static Test suite() {
-        return new TestSuite(Jira339TestCase.class);
-    }
-
     /**
      * Create a test case with the specified name.
      *
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 3ebff927..ec229b32 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira345TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira345TestCase.java
@@ -16,9 +16,7 @@
  */
 package org.apache.commons.beanutils2.bugs;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.BeanUtils;
 
@@ -51,15 +49,6 @@ public class Jira345TestCase extends TestCase {
         }
     }
 
-    /**
-     * Create a test suite for this test.
-     *
-     * @return a test suite
-     */
-    public static Test suite() {
-        return new TestSuite(Jira345TestCase.class);
-    }
-
     /**
      * Create a test case with the specified name.
      *
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 35f818b8..fcfee28d 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira358TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira358TestCase.java
@@ -16,9 +16,7 @@
  */
 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.TestBean;
@@ -28,15 +26,6 @@ import org.apache.commons.beanutils2.TestBean;
  */
 public class Jira358TestCase extends TestCase {
 
-    /**
-     * Create a test suite for this test.
-     *
-     * @return a test suite
-     */
-    public static Test suite() {
-        return new TestSuite(Jira358TestCase.class);
-    }
-
     /**
      * Create a test case with the specified name.
      *
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 7f7f99d4..b2b7227f 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira359TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira359TestCase.java
@@ -16,9 +16,7 @@
  */
 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;
@@ -45,15 +43,6 @@ public class Jira359TestCase extends TestCase {
         }
     }
 
-    /**
-     * Create a test suite for this test.
-     *
-     * @return a test suite
-     */
-    public static Test suite() {
-        return new TestSuite(Jira359TestCase.class);
-    }
-
     /**
      * Create a test case with the specified name.
      *
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 c6dcc5d4..f2ba9160 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira368TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira368TestCase.java
@@ -18,9 +18,7 @@ package org.apache.commons.beanutils2.bugs;
 
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.BeanUtils;
 
@@ -29,15 +27,6 @@ import org.apache.commons.beanutils2.BeanUtils;
  */
 public class Jira368TestCase extends TestCase {
 
-    /**
-     * Create a test suite for this test.
-     *
-     * @return a test suite
-     */
-    public static Test suite() {
-        return new TestSuite(Jira368TestCase.class);
-    }
-
     /**
      * Create a test case with the specified name.
      *
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 1f8bfc9c..8a433d42 100644
--- a/src/test/java/org/apache/commons/beanutils2/bugs/Jira369TestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/bugs/Jira369TestCase.java
@@ -16,9 +16,7 @@
  */
 package org.apache.commons.beanutils2.bugs;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.BeanUtils;
 
@@ -51,15 +49,6 @@ public class Jira369TestCase extends TestCase {
         }
     }
 
-    /**
-     * Create a test suite for this test.
-     *
-     * @return a test suite
-     */
-    public static Test suite() {
-        return new TestSuite(Jira369TestCase.class);
-    }
-
     /**
      * Create a test case with the specified name.
      *
diff --git 
a/src/test/java/org/apache/commons/beanutils2/converters/ArrayConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils2/converters/ArrayConverterTestCase.java
index 7e5b0e73..c3b4ae22 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/ArrayConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/ArrayConverterTestCase.java
@@ -24,22 +24,12 @@ import java.util.Collections;
 import java.util.Locale;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Test Case for the ArrayConverter class.
  */
 public class ArrayConverterTestCase extends TestCase {
 
-    /**
-     * Create Test Suite
-     *
-     * @return test suite
-     */
-    public static TestSuite suite() {
-        return new TestSuite(ArrayConverterTestCase.class);
-    }
-
     /**
      * Constructs a new Array Converter test case.
      *
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 8ba9c309..2b6d9958 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/BigDecimalConverterTestCase.java
@@ -19,8 +19,6 @@ package org.apache.commons.beanutils2.converters;
 
 import java.math.BigDecimal;
 
-import junit.framework.TestSuite;
-
 import org.apache.commons.beanutils2.Converter;
 
 /**
@@ -39,10 +37,6 @@ public class BigDecimalConverterTestCase extends 
AbstractNumberConverterTest<Big
         }
     }
 
-    public static TestSuite suite() {
-        return new TestSuite(BigDecimalConverterTestCase.class);
-    }
-
     private Converter<BigDecimal> converter;
 
     public BigDecimalConverterTestCase(final String name) {
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 04e3291e..7a5f9351 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/BigIntegerConverterTestCase.java
@@ -19,8 +19,6 @@ package org.apache.commons.beanutils2.converters;
 
 import java.math.BigInteger;
 
-import junit.framework.TestSuite;
-
 import org.apache.commons.beanutils2.Converter;
 
 /**
@@ -28,10 +26,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class BigIntegerConverterTestCase extends 
AbstractNumberConverterTest<BigInteger> {
 
-    public static TestSuite suite() {
-        return new TestSuite(BigIntegerConverterTestCase.class);
-    }
-
     private Converter<BigInteger> converter;
 
     public BigIntegerConverterTestCase(final String name) {
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 0016b87c..81fee172 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/ByteConverterTestCase.java
@@ -17,8 +17,6 @@
 
 package org.apache.commons.beanutils2.converters;
 
-import junit.framework.TestSuite;
-
 import org.apache.commons.beanutils2.Converter;
 
 /**
@@ -26,10 +24,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class ByteConverterTestCase extends AbstractNumberConverterTest<Byte> {
 
-    public static TestSuite suite() {
-        return new TestSuite(ByteConverterTestCase.class);
-    }
-
     private Converter<Byte> converter;
 
     public ByteConverterTestCase(final String name) {
diff --git 
a/src/test/java/org/apache/commons/beanutils2/converters/CalendarConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils2/converters/CalendarConverterTestCase.java
index 2e7a0395..20f855e0 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/CalendarConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/CalendarConverterTestCase.java
@@ -18,22 +18,11 @@ package org.apache.commons.beanutils2.converters;
 
 import java.util.Calendar;
 
-import junit.framework.TestSuite;
-
 /**
  * Test Case for the CalendarConverter class.
  */
 public class CalendarConverterTestCase extends 
AbstractDateConverterTest<Calendar> {
 
-    /**
-     * Create Test Suite
-     *
-     * @return test suite
-     */
-    public static TestSuite suite() {
-        return new TestSuite(CalendarConverterTestCase.class);
-    }
-
     /**
      * Constructs a new Calendar test case.
      *
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 3bb0da8a..ca85c632 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/CharacterConverterTestCase.java
@@ -17,7 +17,6 @@
 package org.apache.commons.beanutils2.converters;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.ConversionException;
 import org.apache.commons.beanutils2.Converter;
@@ -27,15 +26,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class CharacterConverterTestCase extends TestCase {
 
-    /**
-     * Create Test Suite
-     *
-     * @return test suite
-     */
-    public static TestSuite suite() {
-        return new TestSuite(CharacterConverterTestCase.class);
-    }
-
     /**
      * Constructs a new Character Converter test case.
      *
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 77afd7b0..9de383c9 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/ClassConverterTestCase.java
@@ -17,7 +17,6 @@
 package org.apache.commons.beanutils2.converters;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.ConversionException;
 import org.apache.commons.beanutils2.Converter;
@@ -27,15 +26,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class ClassConverterTestCase extends TestCase {
 
-    /**
-     * Create Test Suite
-     *
-     * @return test suite
-     */
-    public static TestSuite suite() {
-        return new TestSuite(ClassConverterTestCase.class);
-    }
-
     /**
      * Constructs a new Class Converter test case.
      *
diff --git 
a/src/test/java/org/apache/commons/beanutils2/converters/ClassReloaderTestCase.java
 
b/src/test/java/org/apache/commons/beanutils2/converters/ClassReloaderTestCase.java
index ab5e7a8a..074f6c1d 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/ClassReloaderTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/ClassReloaderTestCase.java
@@ -18,7 +18,6 @@
 package org.apache.commons.beanutils2.converters;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Tests for the ClassReloader utility class.
@@ -28,10 +27,6 @@ public class ClassReloaderTestCase extends TestCase {
     public static class DummyClass {
     }
 
-    public static TestSuite suite() {
-        return new TestSuite(ClassReloaderTestCase.class);
-    }
-
     public ClassReloaderTestCase(final String name) {
         super(name);
     }
diff --git 
a/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestCase.java
index 7773c659..783ecefa 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/DateConverterTestCase.java
@@ -19,22 +19,11 @@ package org.apache.commons.beanutils2.converters;
 import java.util.Calendar;
 import java.util.Date;
 
-import junit.framework.TestSuite;
-
 /**
  * Test Case for the DateConverter class.
  */
 public class DateConverterTestCase extends AbstractDateConverterTest<Date> {
 
-    /**
-     * Create Test Suite
-     *
-     * @return test suite
-     */
-    public static TestSuite suite() {
-        return new TestSuite(DateConverterTestCase.class);
-    }
-
     /**
      * Constructs a new Date test case.
      *
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 48b2280a..31c8256f 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/DoubleConverterTestCase.java
@@ -17,8 +17,6 @@
 
 package org.apache.commons.beanutils2.converters;
 
-import junit.framework.TestSuite;
-
 import org.apache.commons.beanutils2.Converter;
 
 /**
@@ -26,10 +24,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class DoubleConverterTestCase extends 
AbstractNumberConverterTest<Double> {
 
-    public static TestSuite suite() {
-        return new TestSuite(DoubleConverterTestCase.class);
-    }
-
     private Converter<Double> converter;
 
     public DoubleConverterTestCase(final String name) {
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 baf57edd..f393e14c 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/DurationConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/DurationConverterTestCase.java
@@ -20,7 +20,6 @@ package org.apache.commons.beanutils2.converters;
 import java.time.Duration;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.ConversionException;
 import org.apache.commons.beanutils2.Converter;
@@ -30,10 +29,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class DurationConverterTestCase extends TestCase {
 
-    public static TestSuite suite() {
-        return new TestSuite(DurationConverterTestCase.class);
-    }
-
     private Converter<Duration> converter;
 
     public DurationConverterTestCase(final String name) {
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 28d876eb..067e71d1 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/EnumConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/EnumConverterTestCase.java
@@ -18,7 +18,6 @@
 package org.apache.commons.beanutils2.converters;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.ConversionException;
 import org.apache.commons.beanutils2.Converter;
@@ -32,10 +31,6 @@ public class EnumConverterTestCase extends TestCase {
         ORDERED, READY, DELIVERED;
     }
 
-    public static TestSuite suite() {
-        return new TestSuite(EnumConverterTestCase.class);
-    }
-
     private Converter<Enum<PizzaStatus>> converter;
 
     public EnumConverterTestCase(final String name) {
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 a89e7425..8fe628cf 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/FileConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/FileConverterTestCase.java
@@ -20,7 +20,6 @@ package org.apache.commons.beanutils2.converters;
 import java.io.File;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.ConversionException;
 import org.apache.commons.beanutils2.Converter;
@@ -30,10 +29,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class FileConverterTestCase extends TestCase {
 
-    public static TestSuite suite() {
-        return new TestSuite(FileConverterTestCase.class);
-    }
-
     private Converter<File> converter;
 
     public FileConverterTestCase(final String name) {
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 172e832e..5b832b94 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/FloatConverterTestCase.java
@@ -17,8 +17,6 @@
 
 package org.apache.commons.beanutils2.converters;
 
-import junit.framework.TestSuite;
-
 import org.apache.commons.beanutils2.Converter;
 
 /**
@@ -26,10 +24,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class FloatConverterTestCase extends AbstractNumberConverterTest<Float> 
{
 
-    public static TestSuite suite() {
-        return new TestSuite(FloatConverterTestCase.class);
-    }
-
     private Converter<Float> converter;
 
     public FloatConverterTestCase(final String name) {
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 4f67162a..edaec2e7 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/IntegerConverterTestCase.java
@@ -19,8 +19,6 @@ 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;
 
@@ -29,10 +27,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class IntegerConverterTestCase extends 
AbstractNumberConverterTest<Integer> {
 
-    public static TestSuite suite() {
-        return new TestSuite(IntegerConverterTestCase.class);
-    }
-
     private Converter<Integer> converter;
 
     public IntegerConverterTestCase(final String name) {
diff --git 
a/src/test/java/org/apache/commons/beanutils2/converters/LocalDateConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils2/converters/LocalDateConverterTestCase.java
index 866d1ba9..0ec13394 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/LocalDateConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/LocalDateConverterTestCase.java
@@ -21,22 +21,11 @@ import java.time.LocalDate;
 import java.time.ZoneId;
 import java.util.Calendar;
 
-import junit.framework.TestSuite;
-
 /**
  * Test Case for the LocalDateConverter class.
  */
 public class LocalDateConverterTestCase extends 
AbstractDateConverterTest<LocalDate> {
 
-    /**
-     * Create Test Suite
-     *
-     * @return test suite
-     */
-    public static TestSuite suite() {
-        return new TestSuite(LocalDateConverterTestCase.class);
-    }
-
     /**
      * Constructs a new Date test case.
      *
diff --git 
a/src/test/java/org/apache/commons/beanutils2/converters/LocalDateTimeConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils2/converters/LocalDateTimeConverterTestCase.java
index 1b508588..45c908d4 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/LocalDateTimeConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/LocalDateTimeConverterTestCase.java
@@ -21,22 +21,11 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Calendar;
 
-import junit.framework.TestSuite;
-
 /**
  * Test Case for the LocalDateTimeConverter class.
  */
 public class LocalDateTimeConverterTestCase extends 
AbstractDateConverterTest<LocalDateTime> {
 
-    /**
-     * Create Test Suite
-     *
-     * @return test suite
-     */
-    public static TestSuite suite() {
-        return new TestSuite(LocalDateTimeConverterTestCase.class);
-    }
-
     /**
      * Constructs a new Date test case.
      *
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 f6e58ff8..09c5dd7b 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/LocalTimeConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/LocalTimeConverterTestCase.java
@@ -20,7 +20,6 @@ package org.apache.commons.beanutils2.converters;
 import java.time.LocalTime;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.ConversionException;
 import org.apache.commons.beanutils2.Converter;
@@ -30,10 +29,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class LocalTimeConverterTestCase extends TestCase {
 
-    public static TestSuite suite() {
-        return new TestSuite(LocalTimeConverterTestCase.class);
-    }
-
     private Converter<LocalTime> converter;
 
     public LocalTimeConverterTestCase(final String name) {
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 26ded733..31bd1b82 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/LongConverterTestCase.java
@@ -17,8 +17,6 @@
 
 package org.apache.commons.beanutils2.converters;
 
-import junit.framework.TestSuite;
-
 import org.apache.commons.beanutils2.Converter;
 
 /**
@@ -26,10 +24,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class LongConverterTestCase extends AbstractNumberConverterTest<Long> {
 
-    public static TestSuite suite() {
-        return new TestSuite(LongConverterTestCase.class);
-    }
-
     private Converter<Long> converter;
 
     public LongConverterTestCase(final String name) {
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 377399b6..7f8f60be 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/MonthDayConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/MonthDayConverterTestCase.java
@@ -20,7 +20,6 @@ package org.apache.commons.beanutils2.converters;
 import java.time.MonthDay;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.ConversionException;
 import org.apache.commons.beanutils2.Converter;
@@ -30,10 +29,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class MonthDayConverterTestCase extends TestCase {
 
-    public static TestSuite suite() {
-        return new TestSuite(MonthDayConverterTestCase.class);
-    }
-
     private Converter<MonthDay> converter;
 
     public MonthDayConverterTestCase(final String name) {
diff --git 
a/src/test/java/org/apache/commons/beanutils2/converters/OffsetDateTimeConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils2/converters/OffsetDateTimeConverterTestCase.java
index 8f044ee6..58a788b0 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/OffsetDateTimeConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/OffsetDateTimeConverterTestCase.java
@@ -21,22 +21,11 @@ import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.util.Calendar;
 
-import junit.framework.TestSuite;
-
 /**
  * Test Case for the OffsetDateTimeConverter class.
  */
 public class OffsetDateTimeConverterTestCase extends 
AbstractDateConverterTest<OffsetDateTime> {
 
-    /**
-     * Create Test Suite
-     *
-     * @return test suite
-     */
-    public static TestSuite suite() {
-        return new TestSuite(OffsetDateTimeConverterTestCase.class);
-    }
-
     /**
      * Constructs a new Date test case.
      *
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 db992aea..64194b57 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/OffsetTimeConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/OffsetTimeConverterTestCase.java
@@ -20,7 +20,6 @@ package org.apache.commons.beanutils2.converters;
 import java.time.OffsetTime;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.ConversionException;
 import org.apache.commons.beanutils2.Converter;
@@ -30,10 +29,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class OffsetTimeConverterTestCase extends TestCase {
 
-    public static TestSuite suite() {
-        return new TestSuite(OffsetTimeConverterTestCase.class);
-    }
-
     private Converter<OffsetTime> converter;
 
     public OffsetTimeConverterTestCase(final String name) {
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 3501cbfe..04c205b3 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/PathConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/PathConverterTestCase.java
@@ -22,7 +22,6 @@ import java.nio.file.Path;
 import java.nio.file.Paths;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.ConversionException;
 import org.apache.commons.beanutils2.Converter;
@@ -32,10 +31,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class PathConverterTestCase extends TestCase {
 
-    public static TestSuite suite() {
-        return new TestSuite(PathConverterTestCase.class);
-    }
-
     private Converter<Path> converter;
 
     public PathConverterTestCase(final String name) {
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 bc45af0e..d91a7386 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/PeriodConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/PeriodConverterTestCase.java
@@ -20,7 +20,6 @@ package org.apache.commons.beanutils2.converters;
 import java.time.Period;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.ConversionException;
 import org.apache.commons.beanutils2.Converter;
@@ -30,10 +29,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class PeriodConverterTestCase extends TestCase {
 
-    public static TestSuite suite() {
-        return new TestSuite(PeriodConverterTestCase.class);
-    }
-
     private Converter<Period> converter;
 
     public PeriodConverterTestCase(final String name) {
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 f2580f0a..933888e4 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/ShortConverterTestCase.java
@@ -17,8 +17,6 @@
 
 package org.apache.commons.beanutils2.converters;
 
-import junit.framework.TestSuite;
-
 import org.apache.commons.beanutils2.Converter;
 
 /**
@@ -26,10 +24,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class ShortConverterTestCase extends AbstractNumberConverterTest<Short> 
{
 
-    public static TestSuite suite() {
-        return new TestSuite(ShortConverterTestCase.class);
-    }
-
     private ShortConverter converter;
 
     public ShortConverterTestCase(final String name) {
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 6b3f17d5..c1238f83 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/URIConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/URIConverterTestCase.java
@@ -20,7 +20,6 @@ package org.apache.commons.beanutils2.converters;
 import java.net.URI;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.ConversionException;
 import org.apache.commons.beanutils2.Converter;
@@ -30,10 +29,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class URIConverterTestCase extends TestCase {
 
-    public static TestSuite suite() {
-        return new TestSuite(URIConverterTestCase.class);
-    }
-
     private Converter<URI> converter;
 
     public URIConverterTestCase(final String name) {
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 ee96ed74..ea84e89b 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/UUIDConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/UUIDConverterTestCase.java
@@ -20,7 +20,6 @@ package org.apache.commons.beanutils2.converters;
 import java.util.UUID;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.ConversionException;
 import org.apache.commons.beanutils2.Converter;
@@ -30,10 +29,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class UUIDConverterTestCase extends TestCase {
 
-    public static TestSuite suite() {
-        return new TestSuite(UUIDConverterTestCase.class);
-    }
-
     private Converter<UUID> converter;
 
     public UUIDConverterTestCase(final String name) {
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 26f7d452..cfa789f5 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/YearConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/YearConverterTestCase.java
@@ -20,7 +20,6 @@ package org.apache.commons.beanutils2.converters;
 import java.time.Year;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.ConversionException;
 import org.apache.commons.beanutils2.Converter;
@@ -30,10 +29,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class YearConverterTestCase extends TestCase {
 
-    public static TestSuite suite() {
-        return new TestSuite(YearConverterTestCase.class);
-    }
-
     private Converter<Year> converter;
 
     public YearConverterTestCase(final String name) {
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 018754ed..f8f91eaa 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/YearMonthConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/YearMonthConverterTestCase.java
@@ -20,7 +20,6 @@ package org.apache.commons.beanutils2.converters;
 import java.time.YearMonth;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.ConversionException;
 import org.apache.commons.beanutils2.Converter;
@@ -30,10 +29,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class YearMonthConverterTestCase extends TestCase {
 
-    public static TestSuite suite() {
-        return new TestSuite(YearMonthConverterTestCase.class);
-    }
-
     private Converter<YearMonth> converter;
 
     public YearMonthConverterTestCase(final String name) {
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 f7f107bd..9b28b697 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/ZoneIdConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/ZoneIdConverterTestCase.java
@@ -20,7 +20,6 @@ package org.apache.commons.beanutils2.converters;
 import java.time.ZoneId;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.ConversionException;
 import org.apache.commons.beanutils2.Converter;
@@ -30,10 +29,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class ZoneIdConverterTestCase extends TestCase {
 
-    public static TestSuite suite() {
-        return new TestSuite(ZoneIdConverterTestCase.class);
-    }
-
     private Converter<ZoneId> converter;
 
     public ZoneIdConverterTestCase(final String name) {
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 5cbf4ce3..498576f8 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/ZoneOffsetConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/ZoneOffsetConverterTestCase.java
@@ -20,7 +20,6 @@ package org.apache.commons.beanutils2.converters;
 import java.time.ZoneOffset;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.ConversionException;
 import org.apache.commons.beanutils2.Converter;
@@ -30,10 +29,6 @@ import org.apache.commons.beanutils2.Converter;
  */
 public class ZoneOffsetConverterTestCase extends TestCase {
 
-    public static TestSuite suite() {
-        return new TestSuite(ZoneOffsetConverterTestCase.class);
-    }
-
     private Converter<ZoneOffset> converter;
 
     public ZoneOffsetConverterTestCase(final String name) {
diff --git 
a/src/test/java/org/apache/commons/beanutils2/converters/ZonedDateTimeConverterTestCase.java
 
b/src/test/java/org/apache/commons/beanutils2/converters/ZonedDateTimeConverterTestCase.java
index 759a7394..d41601ba 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/ZonedDateTimeConverterTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/ZonedDateTimeConverterTestCase.java
@@ -21,22 +21,11 @@ import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.Calendar;
 
-import junit.framework.TestSuite;
-
 /**
  * Test Case for the ZonedDateTimeConverter class.
  */
 public class ZonedDateTimeConverterTestCase extends 
AbstractDateConverterTest<ZonedDateTime> {
 
-    /**
-     * Create Test Suite
-     *
-     * @return test suite
-     */
-    public static TestSuite suite() {
-        return new TestSuite(ZonedDateTimeConverterTestCase.class);
-    }
-
     /**
      * Constructs a new Date test case.
      *
diff --git 
a/src/test/java/org/apache/commons/beanutils2/expression/DefaultResolverTestCase.java
 
b/src/test/java/org/apache/commons/beanutils2/expression/DefaultResolverTestCase.java
index 75904a51..ca3dfa0b 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/expression/DefaultResolverTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/expression/DefaultResolverTestCase.java
@@ -17,22 +17,12 @@
 package org.apache.commons.beanutils2.expression;
 
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 /**
  * Junit Test for BasicResolver.
  */
 public class DefaultResolverTestCase extends TestCase {
 
-    /**
-     * Create Test Suite
-     *
-     * @return test suite
-     */
-    public static TestSuite suite() {
-        return new TestSuite(DefaultResolverTestCase.class);
-    }
-
     private final DefaultResolver resolver = new DefaultResolver();
     // Simple Properties Test Data
     private final String[] validProperties = { null, "", "a", "bc", "def", 
"g.h", "ij.k", "lm.no", "pqr.stu" };
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 2be7616b..c91faeb9 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/locale/LocaleConvertUtilsTestCase.java
@@ -22,9 +22,7 @@ import java.sql.Time;
 import java.sql.Timestamp;
 import java.text.NumberFormat;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.ConversionException;
 
@@ -36,13 +34,6 @@ import org.apache.commons.beanutils2.ConversionException;
 
 public class LocaleConvertUtilsTestCase extends TestCase {
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-        return new TestSuite(LocaleConvertUtilsTestCase.class);
-    }
-
     private char decimalSeparator;
 
     /**
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 ea2e5424..59b5b232 100644
--- a/src/test/java/org/apache/commons/beanutils2/sql/DynaResultSetTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/sql/DynaResultSetTestCase.java
@@ -22,9 +22,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
 import java.math.BigDecimal;
 import java.util.Iterator;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.DynaBean;
 import org.apache.commons.beanutils2.DynaProperty;
@@ -35,15 +33,6 @@ import org.apache.commons.beanutils2.DynaProperty;
 
 public class DynaResultSetTestCase extends TestCase {
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-
-        return new TestSuite(DynaResultSetTestCase.class);
-
-    }
-
     /**
      * The mock result set DynaClass to be tested.
      */
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 95467c0a..e69ca98a 100644
--- a/src/test/java/org/apache/commons/beanutils2/sql/DynaRowSetTestCase.java
+++ b/src/test/java/org/apache/commons/beanutils2/sql/DynaRowSetTestCase.java
@@ -25,9 +25,7 @@ import java.sql.ResultSetMetaData;
 import java.sql.SQLException;
 import java.util.List;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import org.apache.commons.beanutils2.DynaBean;
 import org.apache.commons.beanutils2.DynaProperty;
@@ -102,15 +100,6 @@ public class DynaRowSetTestCase extends TestCase {
         }
     }
 
-    /**
-     * Creates the tests included in this test suite.
-     */
-    public static Test suite() {
-
-        return new TestSuite(DynaRowSetTestCase.class);
-
-    }
-
     /**
      * The mock result set DynaClass to be tested.
      */
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 fa22b630..765baf3f 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,8 +20,6 @@ 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;
 
@@ -30,15 +28,6 @@ import 
org.apache.commons.beanutils2.converters.DateTimeConverter;
  */
 public class SqlDateConverterTestCase extends AbstractDateConverterTest<Date> {
 
-    /**
-     * Create Test Suite
-     *
-     * @return test suite
-     */
-    public static TestSuite suite() {
-        return new TestSuite(SqlDateConverterTestCase.class);
-    }
-
     /**
      * Constructs a new Date test case.
      *
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 4b2cd7a8..c8ac1823 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,8 +21,6 @@ import java.sql.Time;
 import java.util.Calendar;
 import java.util.Locale;
 
-import junit.framework.TestSuite;
-
 import org.apache.commons.beanutils2.converters.AbstractDateConverterTest;
 
 /**
@@ -30,15 +28,6 @@ import 
org.apache.commons.beanutils2.converters.AbstractDateConverterTest;
  */
 public class SqlTimeConverterTestCase extends AbstractDateConverterTest<Time> {
 
-    /**
-     * Create Test Suite
-     *
-     * @return test suite
-     */
-    public static TestSuite suite() {
-        return new TestSuite(SqlTimeConverterTestCase.class);
-    }
-
     /**
      * Constructs a new Date test case.
      *
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 92138e3b..a950be83 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,8 +23,6 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
 
-import junit.framework.TestSuite;
-
 import org.apache.commons.beanutils2.converters.AbstractDateConverterTest;
 
 /**
@@ -32,15 +30,6 @@ import 
org.apache.commons.beanutils2.converters.AbstractDateConverterTest;
  */
 public class SqlTimestampConverterTestCase extends 
AbstractDateConverterTest<Timestamp> {
 
-    /**
-     * Create Test Suite
-     *
-     * @return test suite
-     */
-    public static TestSuite suite() {
-        return new TestSuite(SqlTimestampConverterTestCase.class);
-    }
-
     /**
      * Constructs a new Date test case.
      *

Reply via email to